Merge pull request #122 from Hanaro-trip-together-bank/feature/team

fix: 모임서비스 상세 선호 여행 리턴
Hanaro-trip-together-bank · Jun 5, 2024 · e38a8ed · e38a8ed
2 parents 50e5614 + 7e24df5
commit e38a8ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/com/hanaro/triptogether/team/dto/response/DetailTeamResDto.java b/src/main/java/com/hanaro/triptogether/team/dto/response/DetailTeamResDto.java
@@ -14,4 +14,5 @@ public class DetailTeamResDto {
     private String accNumber;
     private BigDecimal accBalance;
     private TeamMemberState teamMemberState;
+    private Long preferTripIdx;
 }
diff --git a/src/main/java/com/hanaro/triptogether/team/service/impl/TeamServiceImpl.java b/src/main/java/com/hanaro/triptogether/team/service/impl/TeamServiceImpl.java
@@ -69,15 +69,14 @@ public DetailTeamResDto detailTeam(DetailTeamReqDto detailTeamReqDto) {
         Team team = teamRepository.findById(detailTeamReqDto.getTeamIdx()).orElseThrow(() -> new ApiException(ExceptionEnum.TEAM_NOT_FOUND));
         TeamMember teamMember = teamMemberRepository.findById(detailTeamReqDto.getTeamMemberIdx()).orElseThrow(() -> new ApiException(ExceptionEnum.TEAM_MEMBER_NOT_FOUND));
 
-        DetailTeamResDto detailTeamResDto = DetailTeamResDto.builder()
+        return DetailTeamResDto.builder()
+                .preferTripIdx(team.getPreferTrip().getTripIdx())
                 .teamNotice(team.getTeamNotice())
                 .teamName(team.getTeamName())
                 .accNumber(team.getAccount().getAccNumber())
                 .accBalance(team.getAccount().getAccBalance())
                 .teamMemberState(teamMember.getTeamMemberState())
                 .build();
-
-        return detailTeamResDto;
     }
 
     // 모임서비스 나가기 (전체 내보내기 후 모임 삭제)

diff --git a/src/test/java/com/hanaro/triptogether/TeamServiceTests.java b/src/test/java/com/hanaro/triptogether/TeamServiceTests.java
@@ -12,6 +12,7 @@
 import com.hanaro.triptogether.team.service.impl.TeamServiceImpl;
 import com.hanaro.triptogether.teamMember.domain.TeamMember;
 import com.hanaro.triptogether.teamMember.domain.TeamMemberRepository;
+import com.hanaro.triptogether.trip.domain.Trip;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -51,6 +52,7 @@ public class TeamServiceTests {
     private Long memberIdx = 1L;
     private TeamMember teamMember;
     private Long teamMemberIdx = 1L;
+    private Trip trip;
 
     @BeforeEach
     void setUp() {
@@ -75,13 +77,18 @@ void setUp() {
                 .createdAt(LocalDateTime.now())
                 .build();
 
+        trip = Trip.builder()
+                .tripIdx(1L)
+                .build();
+
         team = Team.builder()
                 .teamIdx(teamIdx)
                 .account(account)
                 .teamName("Team Name")
                 .preferenceType(PreferenceType.해외)
                 .teamNotice("Team Notice")
                 .createdAt(LocalDateTime.now())
+                .preferTrip(trip)
                 .build();
 
         teamMember = TeamMember.builder()