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 index e0a28ae6..750ea360 100644 --- 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 index b2366138..f418189d 100644 --- 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 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 index 6ae332e7..4fc64a42 100644 --- 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 searchGroupMembers(Long groupId, String name List groupMemberResponseDtoList = groupRepository.findGroupMembersByGroupAndNameLike(groupId, name); for (GroupMemberResponseDto dto: groupMemberResponseDtoList) { dto.setUserId(MaskingUtil.maskUserId(dto.getUserId())); - dto.setName(MaskingUtil.maskName(dto.getName())); } return groupMemberResponseDtoList; }