fix: category update 에러 & group user 검색 예외 처리 (#158)

PrayHelper · Mar 24, 2024 · 537d8b8 · 537d8b8
2 parents db1e2e2 + 6b77385
commit 537d8b8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/main/java/com/uspray/uspray/controller/GroupController.java b/src/main/java/com/uspray/uspray/controller/GroupController.java
@@ -169,9 +169,10 @@ public ApiResponseDto<?> deleteGroup(
     @GetMapping("/{groupId}/member/search")
     public ApiResponseDto<List<GroupMemberResponseDto>> searchGroupMembers(
         @PathVariable Long groupId,
+        @Parameter(hidden = true) @AuthenticationPrincipal User user,
         @RequestParam(required = false) String name) {
         return ApiResponseDto.success(SuccessStatus.GET_MEMBER_LIST_SUCCESS,
-            groupService.searchGroupMembers(groupId, name));
+            groupService.searchGroupMembers(groupId, name, user.getUsername()));
     }
 
     @Operation(summary = "그룹 알림 설정")

diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryCustom.java b/src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryCustom.java
@@ -2,13 +2,13 @@
 
 import com.uspray.uspray.DTO.group.response.GroupMemberResponseDto;
 import com.uspray.uspray.DTO.group.response.GroupResponseDto;
-
 import java.util.List;
 
 public interface GroupRepositoryCustom {
 
     List<GroupResponseDto> findGroupListByMemberId(String userId);
 
-    List<GroupMemberResponseDto> findGroupMembersByGroupAndNameLike(Long groupId, String name);
+    List<GroupMemberResponseDto> findGroupMembersByGroupAndNameLikeExceptUser(Long groupId,
+        String name, String username);
 
 }
diff --git a/src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryImpl.java b/src/main/java/com/uspray/uspray/infrastructure/querydsl/group/GroupRepositoryImpl.java
@@ -45,8 +45,8 @@ public List<GroupResponseDto> findGroupListByMemberId(String userId) {
     }
 
     @Override
-    public List<GroupMemberResponseDto> findGroupMembersByGroupAndNameLike(Long groupId,
-        String name) {
+    public List<GroupMemberResponseDto> findGroupMembersByGroupAndNameLikeExceptUser(Long groupId,
+        String name, String username) {
 
         BooleanBuilder builder = new BooleanBuilder();
 
@@ -65,6 +65,7 @@ public List<GroupMemberResponseDto> findGroupMembersByGroupAndNameLike(Long grou
             .from(member)
             .join(member.groupMemberList, groupMember)
             .where(builder)
+            .where(member.userId.ne(username))
             .fetch();
     }
 

diff --git a/src/main/java/com/uspray/uspray/service/CategoryService.java b/src/main/java/com/uspray/uspray/service/CategoryService.java
@@ -89,8 +89,10 @@ public CategoryResponseDto updateCategory(String username, Long categoryId,
         CategoryRequestDto categoryRequestDto) {
         Category category = categoryRepository.getCategoryByIdAndMember(categoryId,
             memberRepository.getMemberByUserId(username));
-        categoryRepository.checkDuplicate(categoryRequestDto.getName(), category.getMember(),
-            CategoryType.valueOf(categoryRequestDto.getType().toUpperCase()));
+        if (categoryRequestDto.getName() != null) {
+            categoryRepository.checkDuplicate(categoryRequestDto.getName(), category.getMember(),
+                CategoryType.valueOf(categoryRequestDto.getType().toUpperCase()));
+        }
         category.update(categoryRequestDto);
         return CategoryResponseDto.of(category);
     }

diff --git a/src/main/java/com/uspray/uspray/service/GroupService.java b/src/main/java/com/uspray/uspray/service/GroupService.java
@@ -34,9 +34,10 @@ public GroupListResponseDto getGroupList(String username) {
     }
 
     @Transactional(readOnly = true)
-    public List<GroupMemberResponseDto> searchGroupMembers(Long groupId, String name) {
-        List<GroupMemberResponseDto> groupMemberResponseDtoList = groupRepository.findGroupMembersByGroupAndNameLike(
-            groupId, name);
+    public List<GroupMemberResponseDto> searchGroupMembers(Long groupId, String targetName,
+        String username) {
+        List<GroupMemberResponseDto> groupMemberResponseDtoList = groupRepository.findGroupMembersByGroupAndNameLikeExceptUser(
+            groupId, targetName, username);
         for (GroupMemberResponseDto dto : groupMemberResponseDtoList) {
             dto.setUserId(MaskingUtil.maskUserId(dto.getUserId()));
         }