[COZY-410] 룸메이트 추천, 필터링, 상세 필터링 color 리턴

src/main/java/com/cozymate/cozymate_server/domain/favorite/service/FavoriteQueryService.java

@@ -70,15 +70,16 @@ public List<FavoriteMemberResponseDTO> getFavoriteMemberList(Member member) {
 
         List<FavoriteMemberResponseDTO> favoriteMemberResponseDTOList = existFavoriteMemberList.stream()
             .filter(favoriteMember -> Objects.nonNull(favoriteMember.getMemberStat()))
-            .map(favoriteMember -> {
-                Map<String, Object> preferences = MemberStatUtil.getMemberStatFields(
-                    favoriteMember.getMemberStat(), criteriaPreferences);
-
-                return FavoriteConverter.toFavoriteMemberResponseDTO(
+            .map(favoriteMember ->
+                FavoriteConverter.toFavoriteMemberResponseDTO(
                     memberIdFavoriteIdMap.get(favoriteMember.getId()),
-                    MemberStatConverter.toPreferenceResponseDTO(favoriteMember.getMemberStat(),
-                        preferences, equalityMap.get(favoriteMember.getId())));
-            }).toList();
+                    MemberStatConverter.toPreferenceResponseDTO(
+                        favoriteMember.getMemberStat(),
+                        MemberStatConverter.toMemberStatPreferenceDetailColorDTOList(
+                            member.getMemberStat(), favoriteMember.getMemberStat(), criteriaPreferences
+                        ),
+                        equalityMap.get(favoriteMember.getId())))
+            ).toList();
 
         // 탈퇴한 회원이 있다면 삭제 처리
         deleteFavoriteMember(findFavoriteMemberIdList, existFavoriteMemberList);

src/main/java/com/cozymate/cozymate_server/domain/memberstat/converter/MemberStatConverter.java

@@ -7,6 +7,7 @@
 import com.cozymate.cozymate_server.domain.member.converter.MemberConverter;
 import com.cozymate.cozymate_server.domain.memberstat.MemberStat;
 import com.cozymate.cozymate_server.domain.memberstat.MemberStat.MemberStatBuilder;
+import com.cozymate.cozymate_server.domain.memberstat.dto.response.MemberStatPreferenceDetailColorDTO;
 import com.cozymate.cozymate_server.domain.memberstat.dto.response.MemberStatDetailAndRoomIdAndEqualityResponseDTO;
 import com.cozymate.cozymate_server.domain.memberstat.dto.response.MemberStatDetailWithMemberDetailResponseDTO;
 import com.cozymate.cozymate_server.domain.memberstat.dto.response.MemberStatDifferenceListResponseDTO;
@@ -187,7 +188,7 @@ public static DifferenceStatus toDifferenceStatus(List<MemberStat> memberStatLis
     }
 
     public static MemberStatPreferenceResponseDTO toPreferenceResponseDTO(MemberStat stat,
-        Map<String, Object> preferences, Integer equality) {
+        List<MemberStatPreferenceDetailColorDTO> preferences, Integer equality) {
 
         return MemberStatPreferenceResponseDTO.builder()
             .memberDetail(MemberConverter.toMemberDetailResponseDTOFromEntity(stat.getMember()))
@@ -196,6 +197,41 @@ public static MemberStatPreferenceResponseDTO toPreferenceResponseDTO(MemberStat
             .build();
     }
 
+
+    // 랜덤에서 사용하는 Converter
+    public static List<MemberStatPreferenceDetailColorDTO> toMemberStatPreferenceDetailColorDTOList(
+        MemberStat memberStat, List<String> preferences
+    ){
+        Map<String, Object> memberStatMap = MemberStatUtil.getMemberStatFields(memberStat, preferences);
+
+        return memberStatMap.entrySet().stream()
+            .map(entry ->
+                MemberStatConverter.toMemberStatPreferenceDetailColorDTO(entry.getKey(), entry.getValue(), DifferenceStatus.WHITE))
+            .toList();
+    }
+
+    // 일반 검색/ 필터링에서 사용하는 Converter
+    public static List<MemberStatPreferenceDetailColorDTO> toMemberStatPreferenceDetailColorDTOList(
+        MemberStat memberStat, MemberStat criteriaMemberStat, List<String> preferences
+    ){
+        Map<String, Object> memberStatMap = MemberStatUtil.getMemberStatFields(memberStat, preferences);
+        Map<String, Object> criteriaMemberStatMap = MemberStatUtil.getMemberStatFields(criteriaMemberStat, preferences);
+
+        return memberStatMap.entrySet().stream()
+            .map(entry->
+                MemberStatConverter.toMemberStatPreferenceDetailColorDTO(
+                    entry.getKey(), entry.getValue(), MemberStatUtil.compareField(entry.getValue(), criteriaMemberStatMap.get(entry.getKey())
+                    ))).toList();
+    }
+
+    public static MemberStatPreferenceDetailColorDTO toMemberStatPreferenceDetailColorDTO(String stat, Object value, DifferenceStatus color){
+        return MemberStatPreferenceDetailColorDTO.builder()
+            .stat(stat)
+            .value(value)
+            .color(color.getValue())
+            .build();
+    }
+
     public static MemberStatRandomListResponseDTO toMemberStatRandomListDTO(
         List<MemberStatPreferenceResponseDTO> memberList
     ) {

src/main/java/com/cozymate/cozymate_server/domain/memberstat/dto/response/MemberStatPreferenceDetailColorDTO.java

@@ -0,0 +1,14 @@
+package com.cozymate.cozymate_server.domain.memberstat.dto.response;
+
+import com.cozymate.cozymate_server.domain.memberstat.enums.DifferenceStatus;
+import lombok.Builder;
+
+@Builder
+public record MemberStatPreferenceDetailColorDTO(
+    String stat,
+    // 다양한 Stat 값이 들어갈 수 있어 Object로 정의.
+    Object value,
+    String color
+) {
+
+}

src/main/java/com/cozymate/cozymate_server/domain/memberstat/dto/response/MemberStatPreferenceResponseDTO.java

@@ -1,14 +1,14 @@
 package com.cozymate.cozymate_server.domain.memberstat.dto.response;
 
 import com.cozymate.cozymate_server.domain.member.dto.response.MemberDetailResponseDTO;
-import java.util.Map;
+import java.util.List;
 import lombok.Builder;
 
 @Builder
 public record MemberStatPreferenceResponseDTO(
     MemberDetailResponseDTO memberDetail,
     Integer equality,
-    Map<String,Object> preferenceStats
+    List<MemberStatPreferenceDetailColorDTO> preferenceStats
 ) {
 
 }

src/main/java/com/cozymate/cozymate_server/domain/memberstat/service/MemberStatQueryService.java

@@ -18,7 +18,6 @@
 import com.cozymate.cozymate_server.domain.memberstat.dto.response.MemberStatRandomListResponseDTO;
 import com.cozymate.cozymate_server.domain.memberstat.dto.response.MemberStatSearchResponseDTO;
 import com.cozymate.cozymate_server.domain.memberstat.repository.MemberStatRepository;
-import com.cozymate.cozymate_server.domain.memberstat.util.MemberStatUtil;
 import com.cozymate.cozymate_server.domain.memberstatequality.service.MemberStatEqualityQueryService;
 import com.cozymate.cozymate_server.domain.memberstatpreference.service.MemberStatPreferenceQueryService;
 import com.cozymate.cozymate_server.domain.room.enums.RoomStatus;
@@ -139,7 +138,7 @@ public MemberStatPageResponseDTO<List<?>> getMemberStatList(Member member,
             return createEmptyPageResponse(pageable);
         }
 
-        return toPageResponseDto(createMemberStatPreferenceResponse(filteredResult,criteriaMemberStat.getMember()));
+        return toPageResponseDto(createMemberStatPreferenceResponse(filteredResult,criteriaMemberStat));
 
     }
 
@@ -156,7 +155,7 @@ public MemberStatPageResponseDTO<List<?>> getSearchedAndFilteredMemberStatList(M
             return createEmptyPageResponse(pageable);
         }
 
-        return toPageResponseDto(createMemberStatPreferenceResponse(filteredResult,criteriaMemberStat.getMember()));
+        return toPageResponseDto(createMemberStatPreferenceResponse(filteredResult,criteriaMemberStat));
     }
 
     public Integer getNumOfSearchedAndFilteredMemberStatList(Member member,
@@ -194,15 +193,11 @@ public MemberStatRandomListResponseDTO getRandomMemberStatWithPreferences(Member
 
         // 선택된 멤버들에 대해 MemberStatPreferenceResponseDTO 리스트 생성
         List<MemberStatPreferenceResponseDTO> preferenceResponseList = randomMemberStats.stream()
-            .map(stat -> {
-                Map<String, Object> preferences = MemberStatUtil.getMemberStatFields(stat,
-                    criteriaPreferences);
-                return MemberStatConverter.toPreferenceResponseDTO(
-                    stat,
-                    preferences,
-                    NO_EQUALITY
-                );
-            })
+            .map(stat ->
+                MemberStatConverter.toPreferenceResponseDTO(stat,
+                    MemberStatConverter.toMemberStatPreferenceDetailColorDTOList(stat,criteriaPreferences),
+                    NO_EQUALITY)
+            )
             .toList();
 
         return MemberStatConverter.toMemberStatRandomListDTO(
@@ -211,21 +206,18 @@ public MemberStatRandomListResponseDTO getRandomMemberStatWithPreferences(Member
     }
 
     public Slice<MemberStatPreferenceResponseDTO> createMemberStatPreferenceResponse(
-        Slice<Map<MemberStat, Integer>> filteredResult, Member criteriaMember) {
-
+        Slice<Map<MemberStat, Integer>> filteredResult, MemberStat criteriaMemberStat) {
         return filteredResult.map(
             memberStatIntegerMap ->{
                 Map.Entry<MemberStat, Integer> entry = memberStatIntegerMap.entrySet().iterator()
                     .next();
                 MemberStat memberStat = entry.getKey();
                 Integer equality = entry.getValue();
                 List<String> criteriaPreferences = memberStatPreferenceQueryService.getPreferencesToList(
-                    criteriaMember.getId());
-                Map<String,Object> preferences = MemberStatUtil.getMemberStatFields(memberStat,
-                    criteriaPreferences);
+                    criteriaMemberStat.getMember().getId());
                 return MemberStatConverter.toPreferenceResponseDTO(
                     memberStat,
-                    preferences,
+                    MemberStatConverter.toMemberStatPreferenceDetailColorDTOList(memberStat,criteriaMemberStat,criteriaPreferences),
                     equality
                 );
             }

src/main/java/com/cozymate/cozymate_server/domain/memberstat/util/MemberStatUtil.java

@@ -9,6 +9,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
@@ -56,6 +57,14 @@ public static <T> DifferenceStatus compareField(List<MemberStat> memberStatList,
         }
     }
 
+    public static DifferenceStatus compareField(
+        Object memberStatMapValue, Object criteriaMemberStatValue){
+        if(memberStatMapValue.equals(criteriaMemberStatValue)){
+            return DifferenceStatus.BLUE;
+        }
+        return DifferenceStatus.RED;
+    }
+
 
     // 아래부터는 특정 멤버스탯을 가져오기 위한 Util들
      public static Map<String, BiFunction<Member,MemberStat,Object>> createFieldGetters() {
@@ -110,6 +119,8 @@ public static Map<String, Object> getMemberStatFields(MemberStat memberStat, Lis
         return result;
     }
 
+
+
     // 학번 Response 위해 필요한 Util
     public static String formatNumber(int number) {
         return String.format("%02d", number);