Merge branch 'Sprint/2020-18' into 'master'

Sprint/2020 18

See merge request coscine/cs/database!96

src/Database.T4/Properties/AssemblyInfo.cs

@@ -9,8 +9,8 @@ using System.Reflection;
 [assembly: AssemblyDescription("Database.T4 is a part of the CoScInE group.")]
 [assembly: AssemblyCompany("IT Center, RWTH Aachen University")]
 [assembly: AssemblyProduct("Database.T4")]
-[assembly: AssemblyVersion("1.23.0")]
-[assembly: AssemblyFileVersion("1.23.0")]
-[assembly: AssemblyInformationalVersion("1.23.0-topic-894-automa0013")]
+[assembly: AssemblyVersion("1.25.0")]
+[assembly: AssemblyFileVersion("1.25.0")]
+[assembly: AssemblyInformationalVersion("1.25.0-topic-1060-affil0001")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 

src/Database.Tests/Properties/AssemblyInfo.cs

@@ -9,8 +9,8 @@ using System.Reflection;
 [assembly: AssemblyDescription("Database.Tests is a part of the CoScInE group.")]
 [assembly: AssemblyCompany("IT Center, RWTH Aachen University")]
 [assembly: AssemblyProduct("Database.Tests")]
-[assembly: AssemblyVersion("1.23.0")]
-[assembly: AssemblyFileVersion("1.23.0")]
-[assembly: AssemblyInformationalVersion("1.23.0-topic-894-automa0013")]
+[assembly: AssemblyVersion("1.25.0")]
+[assembly: AssemblyFileVersion("1.25.0")]
+[assembly: AssemblyInformationalVersion("1.25.0-topic-1060-affil0001")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 

src/Database/Models/ProjectModel.cs

@@ -132,7 +132,7 @@ namespace Coscine.Database.Models
             });
         }
 
-        public Project StoreFromObject(ProjectObject projectObject, User user)
+        public Project StoreFromObject(ProjectObject projectObject, User user, bool isRWTHMember = false)
         {
             if (projectObject.Disciplines.Count() == 0 || projectObject.Organizations.Count() == 0)
             {
@@ -159,7 +159,7 @@ namespace Coscine.Database.Models
             {
                 SetDisciplines(project, projectObject.Disciplines);
                 SetOrganizations(project, projectObject.Organizations);
-                SetQuotas(project);
+                SetQuotas(project, isRWTHMember);
             }
             catch (Exception e)
             {
@@ -239,17 +239,22 @@ namespace Coscine.Database.Models
             }
         }
 
-        private void SetQuotas(Project project)
+        private void SetQuotas(Project project, bool IsRWTHMember = false)
         {
             ProjectQuotaModel projectQuotaModel = new ProjectQuotaModel();
             ResourceTypeModel resourceTypeModel = new ResourceTypeModel();
             foreach (var resourceType in resourceTypeModel.GetAll())
             {
+                var quota = 25;
+                if (resourceType.DisplayName.Equals("rds") && !IsRWTHMember)
+                {
+                    quota = 0;
+                }
                 projectQuotaModel.Insert(new ProjectQuota
                 {
                     ProjectId = project.Id,
                     ResourceTypeId = resourceType.Id,
-                    Quota = 25
+                    Quota = quota
                 });
             }
         }

src/Database/Properties/AssemblyInfo.cs

@@ -9,8 +9,8 @@ using System.Reflection;
 [assembly: AssemblyDescription("Database is a part of the CoScInE group.")]
 [assembly: AssemblyCompany("IT Center, RWTH Aachen University")]
 [assembly: AssemblyProduct("Database")]
-[assembly: AssemblyVersion("1.23.0")]
-[assembly: AssemblyFileVersion("1.23.0")]
-[assembly: AssemblyInformationalVersion("1.23.0-topic-894-automa0013")]
+[assembly: AssemblyVersion("1.25.0")]
+[assembly: AssemblyFileVersion("1.25.0")]
+[assembly: AssemblyInformationalVersion("1.25.0-topic-1060-affil0001")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]