Merge pull request #160 from Modagbul/feat/mission

fix :모임원 인증물 좋아요 mapper 변경
Modagbul · Dec 20, 2023 · f09ffbe · f09ffbe
2 parents 7b4be7a + 6d66f39
commit f09ffbe
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/...java/com/moing/backend/domain/missionArchive/application/mapper/MissionArchiveMapper.java b/...java/com/moing/backend/domain/missionArchive/application/mapper/MissionArchiveMapper.java
@@ -14,9 +14,11 @@
 import com.moing.backend.domain.missionHeart.domain.constant.MissionHeartStatus;
 import com.moing.backend.global.annotation.Mapper;
 
+import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 
+@Transactional
 @Mapper
 public class MissionArchiveMapper {
 
@@ -39,12 +41,13 @@ public static MissionArchiveRes mapToMissionArchiveRes(MissionArchive missionArc
                 .status(missionArchive.getStatus().name())
                 .count(missionArchive.getCount())
                 .heartStatus(
-                        String.valueOf(missionArchive.getHeartList().stream().anyMatch(
-                        missionHeart -> missionHeart.getPushMemberId().equals(memberId) &&
-                                missionHeart.getHeartStatus().equals(MissionHeartStatus.True)
+                        String.valueOf(
+                                missionArchive.getHeartList().stream().anyMatch(
+                                    missionHeart -> missionHeart.getPushMemberId().equals(memberId)
+                                            && missionHeart.getHeartStatus() == (MissionHeartStatus.True)
                                 )))
                 .hearts(missionArchive.getHeartList().stream()
-                        .filter(heart -> heart.getHeartStatus().equals( MissionHeartStatus.True))
+                        .filter(heart -> heart.getHeartStatus() == ( MissionHeartStatus.True))
                         .filter(heart -> heart.getMissionArchive().equals( missionArchive))// heartStatus가 true인 요소만 필터링
                         .count())
                 .build();
@@ -71,8 +74,11 @@ public static PersonalArchiveRes mapToPersonalArchive(MissionArchive missionArch
                 .status(missionArchive.getStatus().name())
                 .count(missionArchive.getCount())
                 .heartStatus(
-                        String.valueOf(missionArchive.getHeartList().stream().anyMatch(
-                                missionHeart -> missionHeart.getPushMemberId().equals(memberId))))
+                        String.valueOf(
+                                missionArchive.getHeartList().stream().anyMatch(
+                                        missionHeart -> missionHeart.getPushMemberId().equals(memberId)
+                                                && missionHeart.getHeartStatus() == (MissionHeartStatus.True)
+                                )))
                 .hearts((int) missionArchive.getHeartList().stream()
                         .filter(heart -> heart.getHeartStatus().equals( MissionHeartStatus.True))
                         .filter(heart -> heart.getMissionArchive().equals( missionArchive))// heartStatus가 true인 요소만 필터링