Merge pull request #116 from Hanaro-trip-together-bank/feature/moim

fix: 내 팀 조회 총무 또는 모임원만 리턴
Hanaro-trip-together-bank · Jun 4, 2024 · 510b057 · 510b057
2 parents ede9095 + 5ddbdfb
commit 510b057
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/hanaro/triptogether/account/service/impl/AccountServiceImpl.java b/src/main/java/com/hanaro/triptogether/account/service/impl/AccountServiceImpl.java
@@ -6,6 +6,7 @@
 import com.hanaro.triptogether.account.dto.response.AccountsResDto;
 import com.hanaro.triptogether.account.dto.response.TeamServiceListResDto;
 import com.hanaro.triptogether.account.service.AccountService;
+import com.hanaro.triptogether.enumeration.TeamMemberState;
 import com.hanaro.triptogether.exception.ApiException;
 import com.hanaro.triptogether.exception.ExceptionEnum;
 import com.hanaro.triptogether.member.domain.Member;
@@ -41,7 +42,7 @@ public List<TeamServiceListResDto> teamServiceList(Long memberIdx) {
 
         for(int i = 0; i < teams.size(); i++) {
             Optional<TeamMember> teamMember=  teamMemberRepository.findTeamMemberByMember_MemberIdxAndTeam_TeamIdx(memberIdx, teams.get(i).getTeamIdx());
-            if(teamMember.isPresent()) {
+            if(teamMember.isPresent() && (teamMember.get().getTeamMemberState() == TeamMemberState.총무 || teamMember.get().getTeamMemberState() == TeamMemberState.모임원)) {
                 Long teamMemberIdx = teamMember.get().getTeamMemberIdx();
                 TeamServiceListResDto teamServiceListResDto = TeamServiceListResDto.builder()
                         .accIdx(teams.get(i).getAccount().getAccIdx())