Merge pull request #320 from TEAM-LIAISON/develop

fix : matching list error fix prod server
TEAM-LIAISON · Jul 23, 2024 · 009bce2 · 009bce2
2 parents c4f3bf0 + d2528cd
commit 009bce2
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 22 deletions.
diff --git a/...ava/liaison/linkit/matching/dto/response/toPrivateMatching/ToPrivateMatchingResponse.java b/...ava/liaison/linkit/matching/dto/response/toPrivateMatching/ToPrivateMatchingResponse.java
@@ -35,17 +35,32 @@ public static List<ToPrivateMatchingResponse> toPrivateMatchingResponse(
             final List<PrivateMatching> privateMatchingList
     ) {
         return privateMatchingList.stream()
-                .map(privateMatching -> new ToPrivateMatchingResponse(
-                        privateMatching.getId(),
-                        privateMatching.getMember().getProfile().getMiniProfile().getMiniProfileImg(),
-                        privateMatching.getMember().getMemberBasicInform().getMemberName(),
-                        privateMatching.getRequestMessage(),
-                        LocalDate.from(privateMatching.getCreatedAt()),
-                        privateMatching.getSenderType(),
-                        privateMatching.getMatchingType(),
-                        false
-                )).collect(Collectors.toList());
+                .map(privateMatching -> {
+                    if (privateMatching.getSenderType() == SenderType.PRIVATE) {
+                        return new ToPrivateMatchingResponse(
+                                privateMatching.getId(),
+                                privateMatching.getMember().getProfile().getMiniProfile().getMiniProfileImg(),
+                                privateMatching.getMember().getMemberBasicInform().getMemberName(),
+                                privateMatching.getRequestMessage(),
+                                LocalDate.from(privateMatching.getCreatedAt()),
+                                privateMatching.getSenderType(),
+                                privateMatching.getMatchingType(),
+                                false
+                        );
+                    } else {
+                        return new ToPrivateMatchingResponse(
+                                privateMatching.getId(),
+                                privateMatching.getMember().getTeamProfile().getTeamMiniProfile().getTeamLogoImageUrl(),
+                                privateMatching.getMember().getTeamProfile().getTeamMiniProfile().getTeamName(),
+                                privateMatching.getRequestMessage(),
+                                LocalDate.from(privateMatching.getCreatedAt()),
+                                privateMatching.getSenderType(),
+                                privateMatching.getMatchingType(),
+                                true
+                        );
+                    }
+                })
+                .collect(Collectors.toList());
     }
 
-
 }
diff --git a/...main/java/liaison/linkit/matching/dto/response/toTeamMatching/ToTeamMatchingResponse.java b/...main/java/liaison/linkit/matching/dto/response/toTeamMatching/ToTeamMatchingResponse.java
@@ -32,15 +32,31 @@ public class ToTeamMatchingResponse {
 
     public static List<ToTeamMatchingResponse> toTeamMatchingResponse(final List<TeamMatching> teamMatchingList) {
         return teamMatchingList.stream()
-                .map(teamMatching -> new ToTeamMatchingResponse(
-                        teamMatching.getId(),
-                        teamMatching.getMember().getTeamProfile().getTeamMiniProfile().getTeamLogoImageUrl(),
-                        teamMatching.getMember().getMemberBasicInform().getMemberName(),
-                        teamMatching.getRequestMessage(),
-                        LocalDate.from(teamMatching.getCreatedAt()),
-                        teamMatching.getSenderType(),
-                        teamMatching.getMatchingType(),
-                        true
-                )).collect(Collectors.toList());
+                .map(teamMatching -> {
+                    if (teamMatching.getSenderType() == SenderType.PRIVATE) {
+                        return new ToTeamMatchingResponse(
+                                teamMatching.getId(),
+                                teamMatching.getMember().getProfile().getMiniProfile().getMiniProfileImg(),
+                                teamMatching.getMember().getMemberBasicInform().getMemberName(),
+                                teamMatching.getRequestMessage(),
+                                LocalDate.from(teamMatching.getCreatedAt()),
+                                teamMatching.getSenderType(),
+                                teamMatching.getMatchingType(),
+                                true
+                        );
+                    } else {
+                        return new ToTeamMatchingResponse(
+                                teamMatching.getId(),
+                                teamMatching.getMember().getTeamProfile().getTeamMiniProfile().getTeamLogoImageUrl(),
+                                teamMatching.getMember().getTeamProfile().getTeamMiniProfile().getTeamName(),
+                                teamMatching.getRequestMessage(),
+                                LocalDate.from(teamMatching.getCreatedAt()),
+                                teamMatching.getSenderType(),
+                                teamMatching.getMatchingType(),
+                                true
+                        );
+                    }
+                })
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/liaison/linkit/search/service/SearchService.java b/src/main/java/liaison/linkit/search/service/SearchService.java
@@ -245,6 +245,7 @@ private SearchBrowseTeamProfileResponse convertToSearchTeamProfileResponseAfterL
         final List<TeamMemberAnnouncementSkill> teamMemberAnnouncementSkillList = getTeamMemberAnnouncementSkills(teamMemberAnnouncement.getId());
         final String teamName = teamMemberAnnouncement.getTeamProfile().getTeamMiniProfile().getTeamName();
         final boolean isTeamSaved = teamWishRepository.findByTeamMemberAnnouncementIdAndMemberId(teamMemberAnnouncement.getId(), memberId);
+        log.info("isTeamSaved={}", isTeamSaved);
 
         return new SearchBrowseTeamProfileResponse(
                 TeamMiniProfileResponse.personalTeamMiniProfile(teamMiniProfile, teamMiniProfileKeyword),

diff --git a/src/main/java/liaison/linkit/wish/domain/repository/TeamWishRepository.java b/src/main/java/liaison/linkit/wish/domain/repository/TeamWishRepository.java
@@ -13,7 +13,7 @@
 public interface TeamWishRepository extends JpaRepository<TeamWish, Long> {
 
     @Query("SELECT tw FROM TeamWish tw WHERE tw.member.id = : memberId")
-    List<TeamWish> findAllByMemberId(@Param("memberID") final Long memberId);
+    List<TeamWish> findAllByMemberId(@Param("memberId") final Long memberId);
 
     @Modifying
     @Transactional