Sprint/2021 13

src/Quota/Controllers/QuotaController.cs

@@ -119,7 +119,7 @@ namespace Coscine.Api.Quota.Controllers
 
             var resources = _projectResourceModel.GetAllWhere(x => x.ProjectId == projectGuid).Select(x => _resourceModel.GetById(x.ResourceId)).Where(x => x.TypeId == resourceTypeGuid);
 
-            if (resources.Count() == 0)
+            if (!resources.Any())
             {
                 return Json(new List<ProjectQuotaReturnObject>());
             }
@@ -211,25 +211,23 @@ namespace Coscine.Api.Quota.Controllers
                 return NotFound($"Could not find resourceType with id: {resource.TypeId}");
             }
 
-            if (resourceType.DisplayName.Equals("rdss3"))
+            var resourceTypeDefinition = ResourceTypeFactory.CreateResourceTypeObject(resourceType.DisplayName, _configuration);
+
+            if (resourceTypeDefinition == null)
             {
-                return BadRequest($"Cannot adjust quota for rdss3 resources.");
+                return BadRequest($"No provider for: \"{resource.Type.DisplayName}\".");
             }
 
-            if (updateResourceObject.Allocated < 1)
+            if (!resourceTypeDefinition.GetResourceTypeInformation().Result.IsQuotaAdjustable)
             {
-                return BadRequest($"Allocated {updateResourceObject.Allocated}. Cannot be less than 1.");
+                return BadRequest($"Cannot adjust quota for {resourceType.DisplayName} resources.");
             }
 
-            var resourceTypeDefinition = ResourceTypeFactory.CreateResourceTypeObject(resourceType.DisplayName, _configuration);
-
-            if (resourceTypeDefinition == null)
+            if (updateResourceObject.Allocated < 1)
             {
-                return BadRequest($"No provider for: \"{resource.Type.DisplayName}\".");
+                return BadRequest($"Allocated {updateResourceObject.Allocated}. Cannot be less than 1.");
             }
 
-            var resourceTypeOptions = _resourceModel.GetResourceTypeOptions(resource.Id);
-
             var projectQuota =
                 _projectQuotaModel.GetWhere((x) =>
                     x.ProjectId == projectId &&
@@ -237,6 +235,8 @@ namespace Coscine.Api.Quota.Controllers
 
             var allocatedForAll = CalculateAllocatedForAll(resourceType, projectId);
 
+            var resourceTypeOptions = _resourceModel.GetResourceTypeOptions(resource.Id);
+
             var allocatedForCurrent = resourceTypeDefinition.GetResourceQuotaAvailable(resource.Id.ToString(), resourceTypeOptions).Result;
 
             if (allocatedForAll - allocatedForCurrent + updateResourceObject.Allocated > projectQuota.Quota)