.gitlab-ci.yml

@@ -21,8 +21,11 @@ migrate:
   script: 
     - dotnet tool install dotnet-ef; echo "1"
     - dotnet tool update dotnet-ef
+    # List dependencies that will be used during build
+    - dotnet restore src --no-cache
+    - dotnet list src package
     # Create new database and migrate to latest state
-    - dotnet run -p .\src\Database.Actions -- --action-create --name $DB_NAME --source $DB_DATA_SOURCE --user $DB_USER_ID --pw $DB_PASSWORD
+    - dotnet run --project .\src\Database.Actions -- --action-create --name $DB_NAME --source $DB_DATA_SOURCE --user $DB_USER_ID --pw $DB_PASSWORD
     # Scaffold created database
     - dotnet ef dbcontext scaffold "Data Source=$DB_DATA_SOURCE;Integrated Security=False;User ID=$DB_USER_ID;Password=$DB_PASSWORD;Database=$DB_NAME" Microsoft.EntityFrameworkCore.SqlServer -o DataModel -c "Model" -f --no-onconfiguring --project "src\Scaffolding"
     # Remove the hardcoded Connection String inside \DataModel\Model.cs

src/Database.Actions/Database.Actions.csproj

@@ -5,7 +5,7 @@
 	  <RootNamespace>Coscine.Database.Actions</RootNamespace>
 	  <AssemblyName>Coscine.Database.Actions</AssemblyName>
 	  <TargetFramework>net6.0</TargetFramework>
- 	  <Version>2.11.1</Version>
+ 	  <Version>2.12.0</Version>
   </PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Coscine.Database.Helpers" Version="2.*-*" />

src/Database.Tests/Database.Tests.csproj

@@ -5,7 +5,7 @@
 		<AssemblyName>Coscine.Database.Tests</AssemblyName>
 		<TargetFrameworks>net6.0;net461</TargetFrameworks>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-		<Version>2.11.1</Version>
+		<Version>2.12.0</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Database\Database.csproj" />

src/Database/Database.csproj

@@ -4,7 +4,7 @@
 		<RootNamespace>Coscine.Database</RootNamespace>
 		<AssemblyName>Coscine.Database</AssemblyName>
 		<TargetFrameworks>net6.0;net461</TargetFrameworks>
-		<Version>2.11.1</Version>
+		<Version>2.12.0</Version>
 	</PropertyGroup>
 	<PropertyGroup>
 		<Authors>RWTH Aachen University</Authors>

src/Database/Models/GitlabResourceTypeModel.cs

@@ -25,11 +25,14 @@ namespace Coscine.Database.Models
 
         public Dictionary<string, string> GetResourceTypeOptions(Guid id)
         {
-            var dictionary = new Dictionary<string, string>();
             var resourceType = GetById(id);
-            dictionary.Add("token", resourceType.Token);
-            dictionary.Add("repositoryUrl", resourceType.RepositoryUrl);
-            dictionary.Add("repositoryNumber", resourceType.RepositoryNumber.ToString());
+            var dictionary = new Dictionary<string, string>
+            {
+                { "branchName", resourceType.Branch },
+                { "projectId", resourceType.GitlabProjectId.ToString() },
+                { "repositoryUrl", resourceType.RepoUrl },
+                { "accessToken", resourceType.ProjectAccessToken }
+            };
             return dictionary;
         }
     }

src/Database/Models/RDSResourceTypeModel.cs

@@ -31,8 +31,7 @@ namespace Coscine.Database.Models
                 { "accessKey", resourceType.AccessKey },
                 { "secretKey", resourceType.SecretKey },
                 { "bucketname", resourceType.BucketName },
-                { "endpoint", resourceType.Endpoint },
-                { "size", $"{resourceType.Size}" }
+                { "endpoint", resourceType.Endpoint }
             };
             return dictionary;
         }

src/Database/Models/RdsS3ResourceTypeModel.cs

@@ -34,8 +34,7 @@ namespace Coscine.Database.Models
                 { "accessKeyWrite", resourceType.AccessKeyWrite },
                 { "secretKeyWrite", resourceType.SecretKeyWrite },
                 { "bucketname", resourceType.BucketName },
-                { "endpoint", resourceType.Endpoint },
-                { "size", $"{resourceType.Size}" }
+                { "endpoint", resourceType.Endpoint }
             };
             return dictionary;
         }

src/Database/Models/RdsS3WormResourceTypeModel.cs

@@ -34,8 +34,7 @@ namespace Coscine.Database.Models
                 { "accessKeyWrite", resourceType.AccessKeyWrite },
                 { "secretKeyWrite", resourceType.SecretKeyWrite },
                 { "bucketname", resourceType.BucketName },
-                { "endpoint", resourceType.Endpoint },
-                { "size", $"{resourceType.Size}" }
+                { "endpoint", resourceType.Endpoint }
             };
             return dictionary;
         }

src/Database/Models/ResourceModel.cs

@@ -283,7 +283,7 @@ namespace Coscine.Database.Models
             {
                 RDSResourceTypeModel rdsResourceTypeModel = new RDSResourceTypeModel();
                 var rdsResourceType = rdsResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value);
-                resourceTypeOptionObject = new RDSResourceTypeObject(rdsResourceType.Id, rdsResourceType.BucketName, (int)rdsResourceType.Size);
+                resourceTypeOptionObject = new RDSResourceTypeObject(rdsResourceType.Id, rdsResourceType.BucketName, null);
             }
             else if (resource.Type.Type == "s3" && resource.ResourceTypeOptionId != null)
             {
@@ -295,7 +295,7 @@ namespace Coscine.Database.Models
             {
                 GitlabResourceTypeModel gitlabResourceTypeModel = new GitlabResourceTypeModel();
                 var gitlabResourceType = gitlabResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value);
-                resourceTypeOptionObject = new GitlabResourceTypeObject(gitlabResourceType.Id, gitlabResourceType.RepositoryNumber, gitlabResourceType.RepositoryUrl, null);
+                resourceTypeOptionObject = new GitlabResourceTypeObject(gitlabResourceType.Id, gitlabResourceType.Branch, gitlabResourceType.GitlabProjectId, gitlabResourceType.RepoUrl, gitlabResourceType.ProjectAccessToken);
             }
             else if (resource.Type.Type == "linked" && resource.ResourceTypeOptionId != null)
             {
@@ -314,9 +314,9 @@ namespace Coscine.Database.Models
                     Endpoint = rdsS3ResourceType.Endpoint,
                     ReadAccessKey = rdsS3ResourceType.AccessKeyRead,
                     ReadSecretKey = rdsS3ResourceType.SecretKeyRead,
-                    Size = rdsS3ResourceType.Size,
                     WriteAccessKey = rdsS3ResourceType.AccessKeyWrite,
                     WriteSecretKey = rdsS3ResourceType.SecretKeyWrite,
+                    Size = null
                 };
             }
             else if (resource.Type.Type == "rdss3worm" && resource.ResourceTypeOptionId != null)
@@ -330,9 +330,9 @@ namespace Coscine.Database.Models
                     Endpoint = rdsS3WormResourceType.Endpoint,
                     ReadAccessKey = rdsS3WormResourceType.AccessKeyRead,
                     ReadSecretKey = rdsS3WormResourceType.SecretKeyRead,
-                    Size = rdsS3WormResourceType.Size,
                     WriteAccessKey = rdsS3WormResourceType.AccessKeyWrite,
                     WriteSecretKey = rdsS3WormResourceType.SecretKeyWrite,
+                    Size = null
                 };
             }
 

src/Database/ReturnObjects/GitlabResourceTypeObject.cs

@@ -6,17 +6,18 @@ namespace Coscine.Database.ReturnObjects
     public class GitlabResourceTypeObject : ResourceTypeOptionObject
     {
         public Guid Id { get; set; }
+        public string BranchName { get; set; }
+        public int ProjectId { get; set; }
+        public Uri RepositoryUrl { get; set; }
+        public string AccessToken { get; set; }
 
-        public int RepositoryNumber { get; set; }
-        public string RepositoryUrl { get; set; }
-        public string Token { get; set; }
-
-        public GitlabResourceTypeObject(Guid id, int repositoryNumber, string repositoryUrl, string token)
+        public GitlabResourceTypeObject(Guid id, string branchName, int projectId, string repoUrl, string accessToken)
         {
             Id = id;
-            RepositoryNumber = repositoryNumber;
-            RepositoryUrl = repositoryUrl;
-            Token = token;
+            BranchName = branchName;
+            ProjectId = projectId;
+            RepositoryUrl = new Uri(repoUrl);
+            AccessToken = accessToken;
         }
     }
 }

src/Database/ReturnObjects/InvitationReturnObject.cs

+using System;
+
+namespace Coscine.Database.ReturnObjects;
+
+/// <summary>
+/// Return object for a project invitation.
+/// </summary>
+public class InvitationReturnObject
+{
+    /// <summary>
+    /// The invitation id.
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// When the invite will expire.
+    /// </summary>
+    public DateTime Expiration { get; set; }
+
+    /// <summary>
+    /// Email of the invitee.
+    /// </summary>
+    public string UserMail { get; set; }
+
+    /// <summary>
+    /// Id of the issuer.
+    /// </summary>
+    public Guid Issuer { get; set; }
+
+    /// <summary>
+    /// Id of the project.
+    /// </summary>
+    public Guid ProjectId { get; set; }
+
+    /// <summary>
+    /// Id of the target Role.
+    /// </summary>
+    public Guid RoleId { get; set; }
+}
\ No newline at end of file

src/Database/ReturnObjects/ProjectQuotaExtendedReturnObject.cs

+using System;
+using System.Collections.Generic;
+
+namespace Coscine.Database.ReturnObjects;
+
+/// <summary>
+/// Contains information about the quota of a project by resource type.
+/// </summary>
+public class ProjectQuotaExtendedReturnObject
+{
+    /// <summary>
+    /// Id of the resoure type.
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// Display name of the resource type.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// How much space is reserved by resources in total [GiB]. Is equal to the sum of all resource quota reserved values.
+    /// </summary>
+    public QuotaDimObject TotalReserved { get; set; }
+
+    /// <summary>
+    /// How much space is currently allocated and is available to be taken by resources [GiB] (See Database, Table 'ProjectQuotas', Column 'Quota').
+    /// </summary>
+    public QuotaDimObject Allocated { get; set; }
+
+    /// <summary>
+    /// How much maximum space is possible to be taken by resources [GiB] (See Database, Table 'ProjectQuotas', Column 'MaxQuota').
+    /// </summary>
+    public QuotaDimObject Maximum { get; set; }
+
+    /// <summary>
+    /// Resources quota for all individual resources of a resource type in a selected project.
+    /// </summary>
+    public IEnumerable<ResourceQuotaReturnObject> ResourcesQuota { get; set; }
+}
\ No newline at end of file

src/Database/ReturnObjects/ProjectQuotaReturnObject.cs

+using System;
+using System.Collections.Generic;
+
+namespace Coscine.Database.ReturnObjects;
+
+/// <summary>
+/// Contains information about the quota of a project by resource type.
+/// </summary>
+public class ProjectQuotaReturnObject
+{
+    /// <summary>
+    /// Id of the resoure type.
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// Display name of the resource type.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// How much space is reserved by resources in total [GiB]. Is equal to the sum of all resource quota reserved values.
+    /// </summary>
+    public QuotaDimObject TotalReserved { get; set; }
+
+    /// <summary>
+    /// How much space is currently allocated and is available to be taken by resources [GiB] (See Database, Table 'ProjectQuotas', Column 'Quota').
+    /// </summary>
+    public QuotaDimObject Allocated { get; set; }
+
+    /// <summary>
+    /// How much maximum space is possible to be taken by resources [GiB] (See Database, Table 'ProjectQuotas', Column 'MaxQuota').
+    /// </summary>
+    public QuotaDimObject Maximum { get; set; }
+}
\ No newline at end of file

src/Database/ReturnObjects/QuotaDimObject.cs

+namespace Coscine.Database.ReturnObjects;
+
+public class QuotaDimObject
+{
+    public float Value { get; set; }
+    public QuotaUnit Unit { get; set; }
+}
+

src/Database/ReturnObjects/QuotaUnit.cs

+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel;
+using System.Runtime.Serialization;
+
+namespace Coscine.Database.ReturnObjects;
+
+[JsonConverter(typeof(StringEnumConverter))]
+public enum QuotaUnit
+{
+    [Description("The byte is a unit of digital information in computing and telecommunications that most commonly consists of eight bits.")]
+    [EnumMember(Value = "https://qudt.org/vocab/unit/BYTE")]
+    BYTE,
+
+    [Description("The kibibyte is a multiple of the unit byte for digital information equivalent to 1024 bytes.")]
+    [EnumMember(Value = "https://qudt.org/vocab/unit/KibiBYTE")]
+    KibiBYTE,
+
+    [Description("The mebibyte is a multiple of the unit byte for digital information equivalent to 1024^2 or 2^20 bytes.")]
+    [EnumMember(Value = "https://qudt.org/vocab/unit/MebiBYTE")]
+    MebiBYTE,
+
+    [Description("The gibibyte is a multiple of the unit byte for digital information storage. The prefix gibi means 1024^3.")]
+    [EnumMember(Value = "https://qudt.org/vocab/unit/GibiBYTE")]
+    GibiBYTE,
+
+    [Description("The tebibyte is a multiple of the unit byte for digital information. The prefix tebi means 1024^4.")]
+    [EnumMember(Value = "https://qudt.org/vocab/unit/TebiBYTE")]
+    TebiBYTE,
+
+    [Description("The tebibyte is a multiple of the unit byte for digital information. The prefix tebi means 1024^5.")]
+    [EnumMember(Value = "https://qudt.org/vocab/unit/PebiBYTE")]
+    PebiBYTE,
+}
\ No newline at end of file

src/Database/ReturnObjects/RDSResourceTypeObject.cs

@@ -7,9 +7,9 @@ namespace Coscine.Database.ReturnObjects
     {
         public Guid Id { get; set; }
         public string BucketName { get; set; }
-        public int Size { get; set; }
+        public int? Size { get; set; }
 
-        public RDSResourceTypeObject(Guid id, string bucketName, int size)
+        public RDSResourceTypeObject(Guid id, string bucketName, int? size)
         {
             Id = id;
             BucketName = bucketName;

src/Database/ReturnObjects/RdsS3ResourceTypeObject.cs

@@ -12,6 +12,6 @@ namespace Coscine.Database.ReturnObjects
 		public string WriteAccessKey { get; set; }
 		public string WriteSecretKey { get; set; }
 		public string Endpoint { get; set; }
-		public int Size { get; set; }
+		public int? Size { get; set; }
 	}
 }
\ No newline at end of file

src/Database/ReturnObjects/ResourceQuotaReturnObject.cs

+using System;
+
+namespace Coscine.Database.ReturnObjects;
+
+/// <summary>
+/// Contains information about the quota of a resource.
+/// </summary>    
+public class ResourceQuotaReturnObject
+{
+    /// <summary>
+    /// Id of the resoure.
+    /// </summary>
+    public Guid Id { get; set; }
+    /// <summary>
+    /// Display name of the resource.
+    /// </summary>
+    public string Name { get; set; }
+    /// <summary>
+    /// How much space is used by all files in a resource [Bytes].
+    /// </summary>
+    public QuotaDimObject Used { get; set; }
+    /// <summary>
+    /// How much space is used by all files in a resource [%].
+    /// </summary>
+    public float UsedPercentage { get; set; }
+    /// <summary>
+    /// How much space is reserved and is available to be taken by the resource [GiB]. This number represents its capacity.
+    /// </summary>
+    public QuotaDimObject Reserved { get; set; }
+}

src/Scaffolding/DataModel/GitlabResourceType.cs

@@ -10,8 +10,9 @@ namespace Coscine.Database.DataModel
     public partial class GitlabResourceType
     {
         public Guid Id { get; set; }
-        public int RepositoryNumber { get; set; }
-        public string RepositoryUrl { get; set; }
-        public string Token { get; set; }
+        public string Branch { get; set; }
+        public int GitlabProjectId { get; set; }
+        public string RepoUrl { get; set; }
+        public string ProjectAccessToken { get; set; }
     }
 }

src/Scaffolding/DataModel/Model.cs

@@ -196,13 +196,17 @@ namespace Coscine.Database.DataModel
 
                 entity.Property(e => e.Id).HasDefaultValueSql("(newid())");
 
-                entity.Property(e => e.RepositoryUrl)
+                entity.Property(e => e.Branch)
                     .IsRequired()
-                    .HasMaxLength(500);
+                    .HasMaxLength(200);
+
+                entity.Property(e => e.ProjectAccessToken)
+                    .IsRequired()
+                    .HasMaxLength(200);
 
-                entity.Property(e => e.Token)
+                entity.Property(e => e.RepoUrl)
                     .IsRequired()
-                    .HasMaxLength(100);
+                    .HasMaxLength(200);
             });
 
             modelBuilder.Entity<Group>(entity =>
@@ -476,7 +480,6 @@ namespace Coscine.Database.DataModel
                 entity.HasOne(d => d.Resource)
                     .WithMany(p => p.ProjectResources)
                     .HasForeignKey(d => d.ResourceId)
-                    .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_ProjectResource_ResourceId_Resources_Id");
             });
 
@@ -659,7 +662,6 @@ namespace Coscine.Database.DataModel
                 entity.HasOne(d => d.Resource)
                     .WithMany(p => p.ResourceDisciplines)
                     .HasForeignKey(d => d.ResourceId)
-                    .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_ResourceDiscipline_ResourceId_Resources_Id");
             });