src/Database/Database.csproj

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

src/Database/Models/ProjectModel.cs

@@ -327,14 +327,20 @@ namespace Coscine.Database.Models
 
         public IEnumerable<Project> GetTopLevelWithAccess(User user, params string[] allowedAccess)
         {
-            return GetWithAccess(user, allowedAccess, (allowedProjectIds) => GetAllWhere((project) => allowedProjectIds.Contains(project.Id) &&
-                    ((!project.SubProjectProjects.Any()) // get top level projects not having any parent projects
-                        || !(from subProject in project.SubProjectProjects // check if the direct parent project is accessible to the current user
-                             where (from parentProjectRole in subProject.Project.ProjectRoles
-                                    where parentProjectRole.UserId == user.Id
-                                    && allowedAccess.Contains(parentProjectRole.Role.DisplayName.ToLower())
-                                    select parentProjectRole).Any()
-                             select subProject).Any())));
+            return GetWithAccess(user, allowedAccess, (allowedProjectIds) => GetAllWhere((project) =>
+                (
+                       // all accessable projects that have no parents
+                        (!project.SubProjectSubProjectNavigations.Any())
+                    || // all accessable projects that have no accessable parents
+                        (
+                            project.SubProjectSubProjectNavigations.All(
+                                   (parentProjects) =>
+                                        parentProjects.Project.ProjectRoles.All((projectRole) => projectRole.UserId != user.Id)
+                            )
+                        )
+                )
+                && project.ProjectRoles.Any((projectRole) => projectRole.UserId == user.Id))
+            );
         }
 
         public void AddResource(Project project, Resource resource)