Merge branch 'Product/883-userManagement' into 'master'

New: Access to all projectRoles

See merge request coscine/cs/database!93

src/Database/Database.nuspec

@@ -12,4 +12,7 @@
     <description>$description$</description>
     <copyright>$copyright$</copyright>
   </metadata>
+  <files>
+	<file src="bin\Release\Coscine.Database.T4.dll" target="lib\net461" />
+  </files>
 </package>
\ No newline at end of file

src/Database/Models/ProjectModel.cs

@@ -287,28 +287,36 @@ namespace Coscine.Database.Models
             return projectRoles.Count() > 0;
         }
 
-        public IEnumerable<Project> GetWithAccess(User user, params string[] allowedAccess)
+        private IEnumerable<Project> GetWithAccess(User user, string[] allowedAccess, Func<IEnumerable<Guid>, IEnumerable<Project>> filter)
         {
             ProjectRoleModel projectRoleModel = new ProjectRoleModel();
-            ProjectModel projectModel = new ProjectModel();
 
             allowedAccess = allowedAccess.Select(x => x.ToLower().Trim()).ToArray();
             var allUserProjectRoles = projectRoleModel.GetAllWhere((projectRoleRelation) => projectRoleRelation.UserId == user.Id &&
                                                                                             allowedAccess.Contains(projectRoleRelation.Role.DisplayName.ToLower()));
             var allowedProjectIds = allUserProjectRoles.Select((projectRole) => projectRole.ProjectId);
-            var allowedProjects = projectModel.GetAllWhere((project) => allowedProjectIds.Contains(project.Id)
-                                                                        && ((!project.SubProjectsSubProjectIdIds.Any()) // get top level projects not having any parent projects
-                                                                            || !(from subProject in project.SubProjectsSubProjectIdIds // check if the direct parent project is accessible to the current user
-                                                                                 where (from parentProjectRole in subProject.Project.ProjectRolesProjectIdIds
-                                                                                        where parentProjectRole.UserId == user.Id
-                                                                                        && allowedAccess.Contains(parentProjectRole.Role.DisplayName.ToLower())
-                                                                                        select parentProjectRole).Any()
-                                                                                 select subProject).Any())
-                                                            );
+            var allowedProjects = filter.Invoke(allowedProjectIds);
 
             return allowedProjects.ToList();
         }
 
+        public IEnumerable<Project> GetWithAccess(User user, params string[] allowedAccess)
+        {
+            return GetWithAccess(user, allowedAccess, (allowedProjectIds) => GetAllWhere((project) => allowedProjectIds.Contains(project.Id)));
+        }
+
+        public IEnumerable<Project> GetTopLevelWithAccess(User user, params string[] allowedAccess)
+        {
+            return GetWithAccess(user, allowedAccess, (allowedProjectIds) => GetAllWhere((project) => allowedProjectIds.Contains(project.Id) &&
+                    ((!project.SubProjectsSubProjectIdIds.Any()) // get top level projects not having any parent projects
+                        || !(from subProject in project.SubProjectsSubProjectIdIds // check if the direct parent project is accessible to the current user
+                             where (from parentProjectRole in subProject.Project.ProjectRolesProjectIdIds
+                                    where parentProjectRole.UserId == user.Id
+                                    && allowedAccess.Contains(parentProjectRole.Role.DisplayName.ToLower())
+                                    select parentProjectRole).Any()
+                             select subProject).Any())));
+        }
+
         public void AddResource(Project project, Resource resource)
         {
             ProjectResourceModel projectResourceModel = new ProjectResourceModel();