Refactor: Group API (#90)

PrayHelper · Dec 21, 2023 · 7fbacf1 · 7fbacf1
2 parents 39c88a3 + aed5513
commit 7fbacf1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/com/uspray/uspray/DTO/group/response/GroupResponseDto.java b/src/main/java/com/uspray/uspray/DTO/group/response/GroupResponseDto.java
@@ -26,13 +26,16 @@ public class GroupResponseDto {
 
     private LocalDateTime updatedAt;
 
+    private boolean isLeader;
+
     @QueryProjection
-    public GroupResponseDto(Long id, String name, String lastPrayContent, Integer memberCount, Integer prayCount, LocalDateTime updatedAt) {
+    public GroupResponseDto(Long id, String name, String lastPrayContent, Integer memberCount, Integer prayCount, LocalDateTime updatedAt, boolean isLeader) {
         this.id = id;
         this.name = name;
         this.lastPrayContent = lastPrayContent;
         this.memberCount = memberCount;
         this.prayCount = prayCount;
         this.updatedAt = updatedAt;
+        this.isLeader = isLeader;
     }
 }
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
@@ -35,7 +35,8 @@ public List<GroupResponseDto> findGroupListByMemberId(String userId) {
                 groupPray.content.max(),
                 group.groupMemberList.size(),
                 group.groupPrayList.size(),
-                groupPray.createdAt.max()
+                groupPray.createdAt.max(),
+                group.leader.userId.eq(userId)
             ))
             .from(group)
             .join(group.groupMemberList, groupMember)

diff --git a/src/main/java/com/uspray/uspray/service/GroupService.java b/src/main/java/com/uspray/uspray/service/GroupService.java
@@ -28,7 +28,6 @@ public List<GroupMemberResponseDto> searchGroupMembers(Long groupId, String name
         List<GroupMemberResponseDto> groupMemberResponseDtoList = groupRepository.findGroupMembersByGroupAndNameLike(groupId, name);
         for (GroupMemberResponseDto dto: groupMemberResponseDtoList) {
             dto.setUserId(MaskingUtil.maskUserId(dto.getUserId()));
-            dto.setName(MaskingUtil.maskName(dto.getName()));
         }
         return groupMemberResponseDtoList;
     }