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

Sprint/2020-05

See merge request coscine/cs/database!57

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.16.0")]
-[assembly: AssemblyFileVersion("1.16.0")]
-[assembly: AssemblyInformationalVersion("1.16.0-topic-670-apiref0017")]
+[assembly: AssemblyVersion("1.17.0")]
+[assembly: AssemblyFileVersion("1.17.0")]
+[assembly: AssemblyInformationalVersion("1.17.0-topic-671-readab0003")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 

src/Database/Database.csproj

@@ -77,6 +77,7 @@
   <ItemGroup>
     <Compile Include="Models\ExternalAuthenticatorModel.cs" />
     <Compile Include="Models\ExternalIdModel.cs" />
+    <Compile Include="Models\LogModel.cs" />
     <Compile Include="ReturnObjects\DisciplineObject.cs" />
     <Compile Include="ReturnObjects\GitlabResourceTypeObject.cs" />
     <Compile Include="ReturnObjects\InstituteObject.cs" />

src/Database/Models/LogModel.cs

+using Coscine.Database.DataModel;
+using LinqToDB;
+using System;
+using System.Linq.Expressions;
+
+
+namespace Coscine.Database.Models
+{
+    public class LogModel : DatabaseModel<Log>
+    {
+        public override Expression<Func<Log, Guid>> GetIdFromObject()
+        {
+            return log => log.Id;
+        }
+
+        public override LinqToDB.ITable<Log> GetITableFromDatabase(CoscineDB db)
+        {
+            return db.Logs;
+        }
+
+        public override void SetObjectId(Log databaseObject, Guid id)
+        {
+            databaseObject.Id = id;
+        }
+    }
+}

src/Database/Models/ProjectResourceModel.cs

 using System;
 using System.Linq.Expressions;
 using Coscine.Database.DataModel;
+using Coscine.Database.Util;
 using LinqToDB;
+using System.Linq;
 
 namespace Coscine.Database.Models
 {
@@ -21,5 +23,11 @@ namespace Coscine.Database.Models
         {
             databaseObject.RelationId = id;
         }
+
+        public Guid? GetProjectForResource(Guid resourceId)
+        {
+            return GetAllWhere((projectResource) => projectResource.ResourceId == resourceId)
+                    .Select((projectResource) => projectResource.ProjectId).First();
+        }
     }
 }
\ No newline at end of file

src/Database/Models/ProjectRoleModel.cs

@@ -4,6 +4,7 @@ using LinqToDB;
 using System;
 using System.Linq;
 using System.Linq.Expressions;
+using Coscine.Database.Util;
 
 namespace Coscine.Database.Models
 {
@@ -64,5 +65,11 @@ namespace Coscine.Database.Models
         {
             databaseObject.RelationId = id;
         }
+
+        public Guid? GetGetUserRoleForProject(Guid projectId, Guid userId)
+        {
+            return GetAllWhere((projectRole) => projectRole.ProjectId == projectId && projectRole.UserId == userId)
+                    .Select((projectRole) => projectRole.RoleId).First();
+        }
     }
 }

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.16.0")]
-[assembly: AssemblyFileVersion("1.16.0")]
-[assembly: AssemblyInformationalVersion("1.16.0-topic-670-apiref0017")]
+[assembly: AssemblyVersion("1.17.0")]
+[assembly: AssemblyFileVersion("1.17.0")]
+[assembly: AssemblyInformationalVersion("1.17.0-topic-671-readab0003")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]