From 325c7981167ee455764d11b09f30bc9d8c752dbd Mon Sep 17 00:00:00 2001 From: oznchex <114240463+oznchex@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:42:49 +0900 Subject: [PATCH] fix : matching list error fix --- .../ToPrivateMatchingResponse.java | 37 +++++++++++++------ .../ToTeamMatchingResponse.java | 36 +++++++++++++----- .../linkit/search/service/SearchService.java | 1 + .../domain/repository/TeamWishRepository.java | 2 +- 4 files changed, 54 insertions(+), 22 deletions(-) diff --git a/src/main/java/liaison/linkit/matching/dto/response/toPrivateMatching/ToPrivateMatchingResponse.java b/src/main/java/liaison/linkit/matching/dto/response/toPrivateMatching/ToPrivateMatchingResponse.java index 276cc30c..d8784ba3 100644 --- a/src/main/java/liaison/linkit/matching/dto/response/toPrivateMatching/ToPrivateMatchingResponse.java +++ b/src/main/java/liaison/linkit/matching/dto/response/toPrivateMatching/ToPrivateMatchingResponse.java @@ -35,17 +35,32 @@ public static List toPrivateMatchingResponse( final List 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/src/main/java/liaison/linkit/matching/dto/response/toTeamMatching/ToTeamMatchingResponse.java b/src/main/java/liaison/linkit/matching/dto/response/toTeamMatching/ToTeamMatchingResponse.java index 4d0acda6..798585cc 100644 --- a/src/main/java/liaison/linkit/matching/dto/response/toTeamMatching/ToTeamMatchingResponse.java +++ b/src/main/java/liaison/linkit/matching/dto/response/toTeamMatching/ToTeamMatchingResponse.java @@ -32,15 +32,31 @@ public class ToTeamMatchingResponse { public static List toTeamMatchingResponse(final List 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 index 404c1f64..6bea2b73 100644 --- 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 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 index 74a5db29..4300317f 100644 --- 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 { @Query("SELECT tw FROM TeamWish tw WHERE tw.member.id = : memberId") - List findAllByMemberId(@Param("memberID") final Long memberId); + List findAllByMemberId(@Param("memberId") final Long memberId); @Modifying @Transactional