Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target after source was created

Commits on Source 5

Update: Added max quota and adapt Quota handling · 97a35e5a
L. Ellenbeck authored Jul 15, 2021 and Benedikt Heinrichs committed Jul 15, 2021

97a35e5a
Merge branch 'Topic/1568-quotaApiAdjustments' into 'Product/1600-rdsS3QuotaManagement' · cbf714f7
Benedikt Heinrichs authored Jul 15, 2021
```
Update: Added max quota and adapt Quota handling

See merge request !157
```
cbf714f7
Merge branch 'Product/1600-rdsS3QuotaManagement' into 'Sprint/2021-13' · 51522bc7
Petar Hristov authored Jul 15, 2021
```
Product/1600 rdsS3QuotaManagement

See merge request !161
```
51522bc7
Merge branch 'Sprint/2021-13' into 'master' · 824ba189
Petar Hristov authored Jul 19, 2021
```
Sprint/2021 13

See merge request !160
```
824ba189

Chore: 2.4.0 · ea98e35b

CoscineBot authored Jul 19, 2021

# [2.4.0](v2.3.0...v2.4.0) (2021-07-19)

## Update
* Added max quota and adapt Quota handling
* Added max quota and adapt Quota handling

ea98e35b

src/Project/Controllers/ProjectController.cs

+23
−10

Original line number
Diff line number
Diff line

@@ -44,9 +44,6 @@ namespace Coscine.Api.Project.Controllers

        private readonly InvitationModel _invitationModel;

        private readonly RoleModel _roleModel;

        private readonly UserModel _userModel;

        private readonly int _maxAvailable = 100;

        private readonly string _userUrlPrefix = "https://purl.org/coscine/users";

        private readonly Uri _orgPrefixUrl = new Uri("http://www.w3.org/ns/org#");

        private readonly RdfStoreConnector _rdfStoreConnector;

        /// <summary>

@@ -213,10 +210,16 @@ namespace Coscine.Api.Project.Controllers

                Id = x.Id,

                Name = x.DisplayName,

                Used = CalculateUsed(x, projectGuid),

                Allocated = projectQuota == null ? 0 : projectQuota.Quota

                Allocated = projectQuota == null ? 0 : projectQuota.Quota,

                Maximum = projectQuota.MaxQuota

            };

        }

        private int GetMaxQuota(Guid projectId, Guid resourceTypeId)

        {

            return _projectQuotaModel.GetWhere(x => x.ProjectId == projectId && x.ResourceTypeId == resourceTypeId).MaxQuota;

        }

        private int CalculateUsed(ResourceType resourceType, Guid projectId)

        {

            var resourceTypeDefinition = ResourceTypeFactory.CreateResourceTypeObject(resourceType.DisplayName, _configuration);

@@ -281,7 +284,8 @@ namespace Coscine.Api.Project.Controllers

                Id = resourceTypeGuid,

                Name = resourceType.DisplayName,

                Used = CalculateUsed(resourceType, projectGuid),

                Allocated = projectQuota.Quota

                Allocated = projectQuota.Quota,

                Maximum = projectQuota.MaxQuota

            };

            return Json(projectQuotaReturnObject);

@@ -327,7 +331,7 @@ namespace Coscine.Api.Project.Controllers

                return NotFound($"Could not find resourceType with id: {resourceTypeId}");

            }

            return Json(new MaxProjectQuota { Id = resourceTypeGuid, Available = _maxAvailable });

            return Json(new MaxProjectQuota { Id = resourceTypeGuid, Available = GetMaxQuota(projectGuid, resourceTypeGuid) });

        }

        /// <summary>

@@ -371,9 +375,16 @@ namespace Coscine.Api.Project.Controllers

                return NotFound($"Could not find resourceType with id: {resourceTypeId}");

            }

            if (resourceType.DisplayName.Equals("rdss3"))

            var resourceTypeDefinition = ResourceTypeFactory.CreateResourceTypeObject(resourceType.DisplayName, _configuration);

            if (resourceTypeDefinition == null)

            {

                return BadRequest($"Cannot adjust quota for rdss3.");

                return BadRequest($"No provider for: \"{resourceType.DisplayName}\".");

            }

            if (!resourceTypeDefinition.GetResourceTypeInformation().Result.IsQuotaAdjustable)

            {

                return BadRequest($"Cannot adjust quota for {resourceType.DisplayName}.");

            }

            if (updateProjectQuotaObject.Allocated < 0)

@@ -389,9 +400,11 @@ namespace Coscine.Api.Project.Controllers

                return BadRequest($"Cannot set quota ({updateProjectQuotaObject.Allocated}) below the used value ({used}).");

            }

            if (updateProjectQuotaObject.Allocated > _maxAvailable)

            var maxAvailabe = GetMaxQuota(projectGuid, resourceTypeGuid);

            if (updateProjectQuotaObject.Allocated > maxAvailabe)

            {

                return BadRequest($"Cannot set quota to {updateProjectQuotaObject.Allocated}. It would exceed the limit of {_maxAvailable}");

                return BadRequest($"Cannot set quota to {updateProjectQuotaObject.Allocated}. It would exceed the limit of {maxAvailabe}");

            }

            projectQuotaForCurrent.Quota = updateProjectQuotaObject.Allocated;

src/Project/Project.csproj

+2
−1

Original line number
Diff line number
Diff line

@@ -5,7 +5,7 @@

		<AssemblyName>Coscine.Api.Project</AssemblyName>

		<GenerateDocumentationFile>true</GenerateDocumentationFile>

		<TargetFramework>net5.0</TargetFramework>

		<Version>2.3.0</Version>

		<Version>2.4.0</Version>

	</PropertyGroup>

	<PropertyGroup>

		<Authors>RWTH Aachen University</Authors>

@@ -23,5 +23,6 @@

		<PackageReference Include="Coscine.Logging" Version="2.*-*" />

		<PackageReference Include="Coscine.Metadata" Version="2.*-*" />

		<PackageReference Include="Coscine.ResourceLoader" Version="2.*-*" />

		<PackageReference Include="Coscine.ResourceTypeBase" Version="2.*-*" />

	</ItemGroup>

</Project>

 No newline at end of file

src/Project/ReturnObjects/ProjectQuotaReturnObject.cs

+5
−0

Original line number
Diff line number
Diff line

@@ -23,5 +23,10 @@ namespace Coscine.Api.Project.ReturnObjects

        /// How much space is availabe to be taken by resources (in gb).

        /// </summary>

        public int Allocated { get; set; }

        /// <summary>

        /// Maximum amount of quota (in gb).

        /// </summary>

        public int Maximum { get; set; }

    }

}

Source

Target

Files