Refactor: grouppray 수정

src/main/java/com/uspray/uspray/domain/group/dto/grouppray/GroupPrayResponseDto.java

@@ -1,7 +1,7 @@
 package com.uspray.uspray.domain.group.dto.grouppray;
 
+import com.querydsl.core.annotations.QueryProjection;
 import com.uspray.uspray.domain.group.model.GroupPray;
-import com.uspray.uspray.domain.member.model.Member;
 import com.uspray.uspray.domain.group.model.ScrapAndHeart;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDate;
@@ -28,11 +28,12 @@ public class GroupPrayResponseDto {
     private LocalDate createdAt;
 
     @Builder
-    public GroupPrayResponseDto(GroupPray groupPray, Member member, ScrapAndHeart scrapAndHeart) {
+    @QueryProjection
+    public GroupPrayResponseDto(GroupPray groupPray, Long memberId, ScrapAndHeart scrapAndHeart) {
         this.groupPrayId = groupPray.getId();
         this.content = groupPray.getContent();
         this.authorName = groupPray.getAuthor().getName();
-        setIsOwner(groupPray.getAuthor().getId(), member.getId());
+        setIsOwner(groupPray.getAuthor().getId(), memberId);
         setSC(scrapAndHeart);
         this.createdAt = LocalDate.from(groupPray.getCreatedAt());
     }

src/main/java/com/uspray/uspray/domain/group/repository/GroupMemberRepository.java

@@ -13,16 +13,11 @@ public interface GroupMemberRepository extends JpaRepository<GroupMember, Long>
 
     boolean existsByGroupAndMember(Group group, Member member);
 
-    Optional<GroupMember> findByGroupAndMember(Group group, Member member);
-
     Optional<GroupMember> findByGroupIdAndMemberId(Long groupId, Long memberId);
 
     void deleteAllByGroup(Group group);
 
-    default GroupMember getGroupMemberByGroupAndMember(Group group, Member member) {
-        return this.findByGroupAndMember(group, member).orElseThrow(
-            () -> new NotFoundException(ErrorStatus.NOT_FOUND_GROUP_MEMBER_EXCEPTION));
-    }
+    GroupMember findByGroup_GroupIdAndMember(Long groupId, Member member);
 
     default GroupMember getGroupMemberByGroupIdAndMemberId(Long groupId, Long memberId) {
         return this.findByGroupIdAndMemberId(groupId, memberId).orElseThrow(

src/main/java/com/uspray/uspray/domain/group/repository/GroupPrayRepository.java

@@ -2,6 +2,7 @@
 
 import com.uspray.uspray.domain.group.model.Group;
 import com.uspray.uspray.domain.group.model.GroupPray;
+import com.uspray.uspray.domain.group.repository.querydsl.GroupPrayRepositoryCustom;
 import com.uspray.uspray.global.exception.ErrorStatus;
 import com.uspray.uspray.global.exception.model.NotFoundException;
 import java.util.List;
@@ -10,10 +11,11 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-public interface GroupPrayRepository extends JpaRepository<GroupPray, Long> {
+public interface GroupPrayRepository extends JpaRepository<GroupPray, Long>,
+    GroupPrayRepositoryCustom {
 
     @EntityGraph(attributePaths = {"author"})
-    List<GroupPray> findGroupPraysByGroup(Group group);
+    List<GroupPray> findByGroup_GroupId(Long groupid);
 
     @Query("select g.originPray.id from GroupPray g left join g.originPray left join g.group where g.group.id = :groupId")
     List<Long> getOriginPrayIdByGroupId(@Param("groupId") Long groupId);

src/main/java/com/uspray/uspray/domain/group/repository/querydsl/GroupPrayRepositoryCustom.java

@@ -0,0 +1,9 @@
+package com.uspray.uspray.domain.group.repository.querydsl;
+
+import com.uspray.uspray.domain.group.dto.grouppray.GroupPrayResponseDto;
+import java.util.List;
+
+public interface GroupPrayRepositoryCustom{
+
+    List<GroupPrayResponseDto> findGroupPray(Long groupId, Long memberId);
+}

src/main/java/com/uspray/uspray/domain/group/repository/querydsl/GroupPrayRepositoryImpl.java

@@ -0,0 +1,34 @@
+package com.uspray.uspray.domain.group.repository.querydsl;
+
+import static com.uspray.uspray.domain.group.model.QGroupPray.groupPray;
+import static com.uspray.uspray.domain.group.model.QScrapAndHeart.scrapAndHeart;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import com.uspray.uspray.domain.group.dto.grouppray.GroupPrayResponseDto;
+import com.uspray.uspray.domain.group.dto.grouppray.QGroupPrayResponseDto;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class GroupPrayRepositoryImpl implements GroupPrayRepositoryCustom {
+
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public List<GroupPrayResponseDto> findGroupPray(Long groupId, Long memberId) {
+        return queryFactory
+            .select(new QGroupPrayResponseDto(
+                groupPray,
+                Expressions.constant(memberId),
+                scrapAndHeart
+            ))
+            .from(groupPray)
+            .where(groupPray.group.id.eq(groupId))
+            .leftJoin(groupPray.scrapAndHeart, scrapAndHeart)
+            .on(scrapAndHeart.member.id.eq(memberId))
+            .fetch();
+    }
+}

src/main/java/com/uspray/uspray/domain/group/service/GroupMemberService.java

@@ -37,8 +37,8 @@ public void deleteAllByGroup(Group group) {
         groupMemberRepository.deleteAllByGroup(group);
     }
 
-    public GroupMember getGroupMemberByGroupAndMember(Group group, Member member) {
-        return groupMemberRepository.getGroupMemberByGroupAndMember(group, member);
+    public GroupMember getGroupMemberByGroupAndMember(Long groupId, Member member) {
+        return groupMemberRepository.findByGroup_GroupIdAndMember(groupId, member);
     }
 
 }

src/main/java/com/uspray/uspray/domain/group/service/GroupPrayFacade.java

@@ -24,7 +24,6 @@
 import com.uspray.uspray.global.push.service.FCMNotificationService;
 import java.io.IOException;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Comparator;
 import java.util.List;
@@ -121,23 +120,14 @@ public void createGroupPray(GroupPrayRequestDto groupPrayRequestDto, String user
     public GroupPrayRappingDto getGroupPray(Long groupId, String userId) {
 
         Member member = memberService.findMemberByUserId(userId);
-        Group group = groupService.getGroupById(groupId);
 
-        List<GroupPray> groupPrays = groupPrayService.findGroupPraysByGroup(group);
+        List<GroupPray> groupPrays = groupPrayService.findGroupPraysByGroup(groupId);
         Long count = scrapAndHeartService.countHeart(groupPrays);
 
-        List<GroupPrayResponseDto> groupPrayList = new ArrayList<>();
-        for (GroupPray groupPray : groupPrays) {
-            ScrapAndHeart scrapAndHeart = scrapAndHeartService.findScrapAndHeartByGroupPrayAndMember(
-                groupPray, member).orElse(null);
-            groupPrayList.add(GroupPrayResponseDto.builder()
-                .groupPray(groupPray)
-                .member(member)
-                .scrapAndHeart(scrapAndHeart)
-                .build());
-        }
+        List<GroupPrayResponseDto> groupPrayList = groupPrayService.getGroupPrayDto(groupId,
+            member.getId());
 
-        GroupMember groupMember = groupMemberService.getGroupMemberByGroupAndMember(group, member);
+        GroupMember groupMember = groupMemberService.getGroupMemberByGroupAndMember(groupId, member);
 
         return new GroupPrayRappingDto(count, groupMember.getNotificationAgree(),
             makeSortedTreeMap(groupPrayList));

src/main/java/com/uspray/uspray/domain/group/service/GroupPrayService.java

@@ -1,5 +1,6 @@
 package com.uspray.uspray.domain.group.service;
 
+import com.uspray.uspray.domain.group.dto.grouppray.GroupPrayResponseDto;
 import com.uspray.uspray.domain.group.model.Group;
 import com.uspray.uspray.domain.group.model.GroupPray;
 import com.uspray.uspray.domain.group.repository.GroupPrayRepository;
@@ -38,8 +39,12 @@ public List<Long> getOriginPrayIdsByGroupId(Long groupId) {
         return groupPrayRepository.getOriginPrayIdByGroupId(groupId);
     }
 
-    public List<GroupPray> findGroupPraysByGroup(Group group) {
-        return groupPrayRepository.findGroupPraysByGroup(group);
+    public List<GroupPray> findGroupPraysByGroup(Long groupId) {
+        return groupPrayRepository.findByGroup_GroupId(groupId);
+    }
+
+    public List<GroupPrayResponseDto> getGroupPrayDto(Long groupId, Long memberId) {
+        return groupPrayRepository.findGroupPray(groupId, memberId);
     }
 
 }