Merge pull request #111 from szymonpoltorak/DEV-174-User-permissions-…

…frontend

Dev 174 user permissions frontend

corn-backend/src/main/java/dev/corn/cornbackend/api/backlog/comment/BacklogItemCommentServiceImpl.java

@@ -65,7 +65,7 @@ public final BacklogItemCommentResponse addNewComment(BacklogItemCommentRequest
 
         log.info(RETURNING_RESPONSE_FOR, savedComment);
 
-        return backLogItemCommentMapper.toBacklogItemCommentResponse(savedComment);
+        return backLogItemCommentMapper.toBacklogItemCommentResponse(savedComment, user);
     }
 
     @Override
@@ -82,7 +82,7 @@ public final BacklogItemCommentResponse updateComment(long commentId, String com
 
         log.info(RETURNING_RESPONSE_FOR, savedComment);
 
-        return backLogItemCommentMapper.toBacklogItemCommentResponse(savedComment);
+        return backLogItemCommentMapper.toBacklogItemCommentResponse(savedComment, user);
     }
 
     @Override
@@ -98,7 +98,7 @@ public final BacklogItemCommentResponse deleteComment(long commentId, User user)
 
         log.info(RETURNING_RESPONSE_FOR, backlogItemComment);
 
-        return backLogItemCommentMapper.toBacklogItemCommentResponse(backlogItemComment);
+        return backLogItemCommentMapper.toBacklogItemCommentResponse(backlogItemComment, user);
     }
 
     @Override
@@ -110,7 +110,7 @@ public final BacklogItemCommentResponse getComment(long commentId, User user) {
 
         log.info(RETURNING_RESPONSE_FOR, backlogItemComment);
 
-        return backLogItemCommentMapper.toBacklogItemCommentResponse(backlogItemComment);
+        return backLogItemCommentMapper.toBacklogItemCommentResponse(backlogItemComment, user);
     }
 
     @Override
@@ -137,7 +137,7 @@ public BacklogItemCommentResponseList getCommentsForBacklogItem(long backlogItem
 
         return BacklogItemCommentResponseList.builder()
                 .comments(comments.stream()
-                        .map(backLogItemCommentMapper::toBacklogItemCommentResponse)
+                        .map((comment) -> backLogItemCommentMapper.toBacklogItemCommentResponse(comment, user))
                         .toList())
                 .totalNumber(comments.getTotalElements())
                 .build();

corn-backend/src/main/java/dev/corn/cornbackend/api/backlog/comment/data/BacklogItemCommentResponse.java

@@ -10,5 +10,6 @@ public record BacklogItemCommentResponse(String comment,
                                          UserResponse user,
                                          LocalDateTime commentTime,
                                          LocalDateTime lastEditTime,
-                                         long backlogItemCommentId) {
+                                         long backlogItemCommentId,
+                                         boolean canEdit) {
 }

corn-backend/src/main/java/dev/corn/cornbackend/api/backlog/item/BacklogItemServiceImpl.java

@@ -191,7 +191,7 @@ public BacklogItemDetails getDetailsById(long id, User user) {
 
         log.info(RETURNING_RESPONSE_OF, backlogItem);
 
-        return backlogItemMapper.backlogItemToBacklogItemDetails(backlogItem);
+        return backlogItemMapper.backlogItemToBacklogItemDetails(backlogItem, user);
     }
 
     @Override

corn-backend/src/main/java/dev/corn/cornbackend/api/project/ProjectServiceImpl.java

@@ -60,7 +60,7 @@ public final ProjectInfoResponse addNewProject(String name, User user) {
 
         log.info("Created project member: {}", newProjectMember);
 
-        return mapToProjectInfoResponse(newProject, NEW_PROJECT_MEMBER_NUMBER);
+        return mapToProjectInfoResponse(newProject, NEW_PROJECT_MEMBER_NUMBER, user);
     }
 
     @Override
@@ -74,7 +74,7 @@ public final List<ProjectInfoResponse> getProjectsOnPage(int page, User user) {
 
         return projects
                 .stream()
-                .map(this::mapToProjectInfoResponse)
+                .map((project) -> this.mapToProjectInfoResponse(project, user))
                 .toList();
     }
 
@@ -93,7 +93,7 @@ public final ProjectResponse updateProjectsName(String name, long projectId, Use
 
         log.info("Updated project: {}", updatedProject);
 
-        return projectMapper.toProjectResponse(updatedProject);
+        return projectMapper.toProjectResponse(updatedProject, user);
     }
 
     @Override
@@ -107,18 +107,18 @@ public final ProjectResponse deleteProject(long projectId, User user) {
 
         projectRepository.deleteById(projectId);
 
-        return projectMapper.toProjectResponse(projectToDelete);
+        return projectMapper.toProjectResponse(projectToDelete, user);
     }
 
-    private ProjectInfoResponse mapToProjectInfoResponse(Project project) {
+    private ProjectInfoResponse mapToProjectInfoResponse(Project project, User user) {
         long totalNumberOfUsers = projectMemberService.getTotalNumberOfMembers(project.getProjectId());
 
-        return mapToProjectInfoResponse(project, totalNumberOfUsers);
+        return mapToProjectInfoResponse(project, totalNumberOfUsers, user);
     }
 
-    private ProjectInfoResponse mapToProjectInfoResponse(Project project, long totalNumberOfUsers) {
+    private ProjectInfoResponse mapToProjectInfoResponse(Project project, long totalNumberOfUsers, User user) {
         List<UserResponse> members = projectMemberService.getProjectMembersInfo(project.getProjectId());
 
-        return projectMapper.toProjectInfoResponse(project, members, totalNumberOfUsers);
+        return projectMapper.toProjectInfoResponse(project, members, totalNumberOfUsers, user);
     }
 }

corn-backend/src/main/java/dev/corn/cornbackend/api/project/data/ProjectInfoResponse.java

@@ -8,5 +8,5 @@
 
 @Builder
 public record ProjectInfoResponse(long projectId, String name, List<SprintResponse> sprints, long totalNumberOfUsers,
-                                  List<UserResponse> membersInfo) {
+                                  List<UserResponse> membersInfo, boolean isOwner) {
 }

corn-backend/src/main/java/dev/corn/cornbackend/api/project/data/ProjectResponse.java

@@ -6,5 +6,5 @@
 import java.util.List;
 
 @Builder
-public record ProjectResponse(String name, List<SprintResponse> sprints) {
+public record ProjectResponse(String name, List<SprintResponse> sprints, boolean isOwner) {
 }

corn-backend/src/main/java/dev/corn/cornbackend/api/project/member/interfaces/ProjectMemberController.java

@@ -1,7 +1,7 @@
 package dev.corn.cornbackend.api.project.member.interfaces;
 
-import dev.corn.cornbackend.api.project.member.data.ProjectMemberList;
 import dev.corn.cornbackend.api.project.member.data.ProjectMemberInfoExtendedResponse;
+import dev.corn.cornbackend.api.project.member.data.ProjectMemberList;
 import dev.corn.cornbackend.entities.user.User;
 import dev.corn.cornbackend.entities.user.data.UserResponse;
 

corn-backend/src/main/java/dev/corn/cornbackend/config/PlaceholderData.java

@@ -131,8 +131,8 @@ public void run(String... args) {
                     )).map(backlogItemRepository::save).toList());
         }
 
-        for (int i = 0; i < SAMPLE_BACKLOG_ITEMS.length / 4; i++) {
-            for (int j = 0; j < random.nextInt(4); j++) {
+        for (int i = 0; i < SAMPLE_BACKLOG_ITEMS.length / 2; i++) {
+            for (int j = 0; j < random.nextInt(6); j++) {
                 long backlogItemId = drawRandom(backlogItems).getBacklogItemId();
                 User commenter = drawRandom(users);
                 for (int k = 0; k < 5; k++) {

corn-backend/src/main/java/dev/corn/cornbackend/entities/backlog/comment/interfaces/BacklogItemCommentMapper.java

@@ -2,8 +2,10 @@
 
 import dev.corn.cornbackend.api.backlog.comment.data.BacklogItemCommentResponse;
 import dev.corn.cornbackend.entities.backlog.comment.BacklogItemComment;
+import dev.corn.cornbackend.entities.user.User;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.mapstruct.Named;
 
 /**
  * Mapper for converting BacklogItemComment to BacklogItemCommentResponse
@@ -16,6 +18,8 @@ public interface BacklogItemCommentMapper {
      * @param backlogItemComment The BacklogItemComment to convert
      * @return The converted BacklogItemCommentResponse
      */
-    @Mapping(source = "commentDate", target = "commentTime")
-    BacklogItemCommentResponse toBacklogItemCommentResponse(BacklogItemComment backlogItemComment);
+    @Mapping(source = "backlogItemComment.commentDate", target = "commentTime")
+    @Mapping(target = "canEdit", expression = "java(user.equals(backlogItemComment.getUser()) || user.equals(backlogItemComment.getBacklogItem().getProject().getOwner()))")
+    @Named("toBacklogItemCommentResponse")
+    BacklogItemCommentResponse toBacklogItemCommentResponse(BacklogItemComment backlogItemComment, User user);
 }

corn-backend/src/main/java/dev/corn/cornbackend/entities/backlog/item/interfaces/BacklogItemMapper.java

@@ -7,6 +7,7 @@
 import dev.corn.cornbackend.entities.project.member.ProjectMemberMapperImpl;
 import dev.corn.cornbackend.entities.project.member.interfaces.ProjectMemberMapper;
 import dev.corn.cornbackend.entities.sprint.interfaces.SprintMapper;
+import dev.corn.cornbackend.entities.user.User;
 import dev.corn.cornbackend.entities.user.data.UserResponse;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -32,8 +33,8 @@ public interface BacklogItemMapper {
      * @param backlogItem The BacklogItem to map.
      * @return The mapped BacklogItemDetails.
      */
-    @Mapping(target = "sprint", source = "sprint")
-    BacklogItemDetails backlogItemToBacklogItemDetails(BacklogItem backlogItem);
+    @Mapping(target = "sprint", source = "backlogItem.sprint")
+    BacklogItemDetails backlogItemToBacklogItemDetails(BacklogItem backlogItem, User user);
 
     /**
      * Maps a ProjectMember to a UserResponse.

corn-backend/src/main/java/dev/corn/cornbackend/entities/project/interfaces/ProjectMapper.java

@@ -7,8 +7,10 @@
 import dev.corn.cornbackend.entities.sprint.Sprint;
 import dev.corn.cornbackend.entities.sprint.SprintMapperImpl;
 import dev.corn.cornbackend.entities.sprint.interfaces.SprintMapper;
+import dev.corn.cornbackend.entities.user.User;
 import dev.corn.cornbackend.entities.user.data.UserResponse;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 import java.util.List;
 
@@ -24,7 +26,9 @@ public interface ProjectMapper {
      * @param project the project to map
      * @return the project response
      */
-    ProjectResponse toProjectResponse(Project project);
+    @Mapping(target = "isOwner", expression = "java(user.equals(project.getOwner()))")
+    @Mapping(target = "name", source = "project.name")
+    ProjectResponse toProjectResponse(Project project, User user);
 
     /**
      * Map a project to a project info response
@@ -33,8 +37,10 @@ public interface ProjectMapper {
      * @param membersInfo the members info of the project
      * @return the project info response
      */
+    @Mapping(target = "name", source = "project.name")
+    @Mapping(target = "isOwner", expression = "java(user.equals(project.getOwner()))")
     ProjectInfoResponse toProjectInfoResponse(Project project, List<UserResponse> membersInfo,
-                                              long totalNumberOfUsers);
+                                              long totalNumberOfUsers, User user);
 
     default SprintResponse sprintToSprintResponse(Sprint sprint) {
         SprintMapper sprintMapper = new SprintMapperImpl();

corn-backend/src/test/java/dev/corn/cornbackend/api/backlog/comment/BacklogItemCommentServiceImplTest.java

@@ -64,7 +64,7 @@ final void test_addNewCommentShouldReturnCorrectBacklogItemCommentResponse() {
         when(backlogItemCommentRepository.save(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemCommentToSave()))
                 .thenReturn(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment());
 
-        when(backlogItemCommentMapper.toBacklogItemCommentResponse(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment()))
+        when(backlogItemCommentMapper.toBacklogItemCommentResponse(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment(), BACKLOG_ITEM_COMMENT_TEST_DATA.user()))
                 .thenReturn(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemCommentResponse());
 
         BacklogItemCommentResponse expected = BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemCommentResponse();
@@ -100,7 +100,8 @@ final void test_updateBacklogItemComentShouldReturnCorrectBacklogItemCommentResp
         when(backlogItemCommentRepository.save(UPDATE_BACKLOG_ITEM_TEST_DATA.updatedBacklogItemComment()))
                 .thenReturn(UPDATE_BACKLOG_ITEM_TEST_DATA.updatedBacklogItemComment());
 
-        when(backlogItemCommentMapper.toBacklogItemCommentResponse(UPDATE_BACKLOG_ITEM_TEST_DATA.updatedBacklogItemComment()))
+        when(backlogItemCommentMapper.toBacklogItemCommentResponse(UPDATE_BACKLOG_ITEM_TEST_DATA.updatedBacklogItemComment(),
+                UPDATE_BACKLOG_ITEM_TEST_DATA.user()))
                 .thenReturn(UPDATE_BACKLOG_ITEM_TEST_DATA.backlogItemCommentResponse());
 
         BacklogItemCommentResponse expected = UPDATE_BACKLOG_ITEM_TEST_DATA.backlogItemCommentResponse();
@@ -136,7 +137,8 @@ final void test_deleteCommentShouldReturnCorrectBacklogItemCommentResponse() {
         when(backlogItemCommentRepository.findByIdWithUserOrOwner(commentId, UPDATE_BACKLOG_ITEM_TEST_DATA.user()))
                 .thenReturn(Optional.of(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment()));
 
-        when(backlogItemCommentMapper.toBacklogItemCommentResponse(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment()))
+        when(backlogItemCommentMapper.toBacklogItemCommentResponse(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment(),
+                UPDATE_BACKLOG_ITEM_TEST_DATA.user()))
                 .thenReturn(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemCommentResponse());
 
         BacklogItemCommentResponse expected = BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemCommentResponse();
@@ -171,7 +173,8 @@ final void test_getCommentShouldReturnCorrectBacklogItemCommentResponse() {
         when(backlogItemCommentRepository.findByIdWithProjectMember(commentId, UPDATE_BACKLOG_ITEM_TEST_DATA.user()))
                 .thenReturn(Optional.of(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment()));
 
-        when(backlogItemCommentMapper.toBacklogItemCommentResponse(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment()))
+        when(backlogItemCommentMapper.toBacklogItemCommentResponse(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment(),
+                UPDATE_BACKLOG_ITEM_TEST_DATA.user()))
                 .thenReturn(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemCommentResponse());
 
         BacklogItemCommentResponse expected = BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemCommentResponse();
@@ -214,7 +217,8 @@ final void getCommentsForBacklogItemShouldReturnCorrectResponse() {
                 BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment().getBacklogItem(), pageable))
                 .thenReturn(page);
 
-        when(backlogItemCommentMapper.toBacklogItemCommentResponse(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment()))
+        when(backlogItemCommentMapper.toBacklogItemCommentResponse(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemComment(),
+                UPDATE_BACKLOG_ITEM_TEST_DATA.user()))
                 .thenReturn(BACKLOG_ITEM_COMMENT_TEST_DATA.backlogItemCommentResponse());
 
         //then

corn-backend/src/test/java/dev/corn/cornbackend/api/backlog/item/BacklogItemServiceImplTest.java

@@ -571,7 +571,7 @@ final void getDetailsById_shouldReturnCorrectBacklogItemDetailsResponseOnCorrect
         when(backlogItemRepository.findByIdWithProjectMember(id, SAMPLE_USER))
                 .thenReturn(Optional.of(BACKLOG_ITEM_DETAILS_TEST_DATA.backlogItem()));
 
-        when(backlogItemMapper.backlogItemToBacklogItemDetails(BACKLOG_ITEM_DETAILS_TEST_DATA.backlogItem()))
+        when(backlogItemMapper.backlogItemToBacklogItemDetails(BACKLOG_ITEM_DETAILS_TEST_DATA.backlogItem(), SAMPLE_USER))
                 .thenReturn(BACKLOG_ITEM_DETAILS_TEST_DATA.backlogItemDetails());
 
         BacklogItemDetails expected = BACKLOG_ITEM_DETAILS_TEST_DATA.backlogItemDetails();

corn-backend/src/test/java/dev/corn/cornbackend/api/project/ProjectControllerTest.java

@@ -37,7 +37,8 @@ class ProjectControllerTest {
     final void test_addNewProject_shouldAddNewProject() {
         // given
         Project project = ADD_PROJECT_DATA.project();
-        ProjectInfoResponse expected = MAPPER.toProjectInfoResponse(project, Collections.emptyList(), 0L);
+        ProjectInfoResponse expected = MAPPER.toProjectInfoResponse(project, Collections.emptyList(), 0L,
+                ADD_PROJECT_DATA.owner());
 
         // when
         when(projectService.addNewProject(ADD_PROJECT_DATA.project().getName(), ADD_PROJECT_DATA.owner()))
@@ -55,7 +56,8 @@ final void test_getProjectsOnPage_shouldGetProjects() {
         // given
         Project project = ADD_PROJECT_DATA.project();
         List<UserResponse> members = List.of(new UserResponse(1, "full", "name", "username"));
-        List<ProjectInfoResponse> expected = List.of(MAPPER.toProjectInfoResponse(project, members, 1L));
+        List<ProjectInfoResponse> expected = List.of(MAPPER.toProjectInfoResponse(project, members, 1L,
+                ADD_PROJECT_DATA.owner()));
         int page = 0;
 
         // when
@@ -73,7 +75,7 @@ final void test_getProjectsOnPage_shouldGetProjects() {
     final void test_updateProjectsName_shouldUpdateName() {
         // given
         Project project = ADD_PROJECT_DATA.project();
-        ProjectResponse expected = MAPPER.toProjectResponse(project);
+        ProjectResponse expected = MAPPER.toProjectResponse(project, ADD_PROJECT_DATA.owner());
 
         // when
         when(projectService.updateProjectsName(ADD_PROJECT_DATA.project().getName(), 0L, ADD_PROJECT_DATA.owner()))
@@ -91,7 +93,7 @@ final void test_deleteProject_shouldDeleteProject() {
         // given
         long projectId = 0L;
         Project project = ADD_PROJECT_DATA.project();
-        ProjectResponse expected = MAPPER.toProjectResponse(project);
+        ProjectResponse expected = MAPPER.toProjectResponse(project, ADD_PROJECT_DATA.owner());
 
         // when
         when(projectService.deleteProject(projectId, ADD_PROJECT_DATA.owner()))