Merge branch 'devel' into DEV-192-fixDeletePm

szymonpoltorak · May 7, 2024 · faff092 · faff092
2 parents d4aa4e2 + cef35a4
commit faff092
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/corn-backend/src/main/java/dev/corn/cornbackend/api/project/ProjectServiceImpl.java b/corn-backend/src/main/java/dev/corn/cornbackend/api/project/ProjectServiceImpl.java
@@ -68,7 +68,7 @@ public final List<ProjectInfoResponse> getProjectsOnPage(int page, User user) {
         log.info("Getting projects on page: {} for user: {}", page, user);
 
         Pageable pageable = PageRequest.of(page, PROJECTS_PER_PAGE);
-        Page<Project> projects = projectRepository.findAllByOwnerOrderByName(user, pageable);
+        Page<Project> projects = projectRepository.findAllByProjectMember(user, pageable);
 
         log.info("Projects found on page : {}", projects.getTotalElements());
 

diff --git a/...end/src/main/java/dev/corn/cornbackend/entities/project/interfaces/ProjectRepository.java b/...end/src/main/java/dev/corn/cornbackend/entities/project/interfaces/ProjectRepository.java
@@ -25,6 +25,20 @@ public interface ProjectRepository extends JpaRepository<Project, Long> {
      */
     Page<Project> findAllByOwnerOrderByName(User owner, Pageable pageable);
 
+    /**
+     * Finds all Projects by owner or project member
+     *
+     * @param user user requesting access
+     * @param pageable pagination information
+     * @return a Page of Projects
+     */
+    @Query("""
+            SELECT p FROM Project p
+            WHERE p.owner = :user or :user IN (SELECT pm.user FROM ProjectMember pm where pm.project = p)
+            ORDER BY p.name
+            """)
+    Page<Project> findAllByProjectMember(User user, Pageable pageable);
+
     /**
      * Finds a Project by id and checks if the user is a assignee or the owner of given project
      *

diff --git a/corn-backend/src/test/java/dev/corn/cornbackend/api/project/ProjectServiceTest.java b/corn-backend/src/test/java/dev/corn/cornbackend/api/project/ProjectServiceTest.java
@@ -90,7 +90,7 @@ final void test_getProjectsOnPage_shouldGetOneElementListOfProjects() {
         List<ProjectInfoResponse> expected = List.of(response);
 
         // when
-        when(projectRepository.findAllByOwnerOrderByName(ADD_PROJECT_DATA.owner(), pageable))
+        when(projectRepository.findAllByProjectMember(ADD_PROJECT_DATA.owner(), pageable))
                 .thenReturn(new PageImpl<>(List.of(ADD_PROJECT_DATA.project())));
         when(projectMemberService.getTotalNumberOfMembers(ADD_PROJECT_DATA.project().getProjectId()))
                 .thenReturn(totalNumberOfMembers);