[test/#519] 모임 도메인 테스트코드 작성

src/main/java/umc/cockple/demo/domain/exercise/service/ExerciseQueryService.java

@@ -391,7 +391,7 @@ private void validatePartyIsActive(Party party) {
 
     private boolean checkManagerPermission(Party party, Member member) {
         return memberPartyRepository.existsByPartyIdAndMemberIdAndRole(
-                party.getId(), member.getId(), Role.party_MANAGER);
+                party.getId(), member.getId(), Role.PARTY_MANAGER);
     }
 
     private ExerciseDetailDTO.ExerciseInfo createExerciseInfo(Exercise exercise) {

src/main/java/umc/cockple/demo/domain/exercise/service/ExerciseValidator.java

@@ -90,9 +90,9 @@ private void validatePartyIsActive(Party party) {
     private void validateSubManagerPermission(Long memberId, Party party) {
         boolean isOwner = party.getOwnerId().equals(memberId);
         boolean isManager = memberPartyRepository.existsByPartyIdAndMemberIdAndRole(
-                party.getId(), memberId, Role.party_MANAGER);
+                party.getId(), memberId, Role.PARTY_MANAGER);
         boolean isSubManager = memberPartyRepository.existsByPartyIdAndMemberIdAndRole(
-                party.getId(), memberId, Role.party_SUBMANAGER);
+                party.getId(), memberId, Role.PARTY_SUBMANAGER);
 
         if (!isOwner && !isManager && !isSubManager)
             throw new ExerciseException(ExerciseErrorCode.INSUFFICIENT_PERMISSION);

src/main/java/umc/cockple/demo/domain/member/domain/MemberParty.java

@@ -47,7 +47,7 @@ public static MemberParty createOwner(Member member, Party party) {
         return MemberParty.builder()
                 .member(member)
                 .party(party)
-                .role(Role.party_MANAGER)
+                .role(Role.PARTY_MANAGER)
                 .joinedAt(LocalDateTime.now())
                 .status(ACTIVE)
                 .build();
@@ -57,20 +57,20 @@ public static MemberParty create(Party party, Member member) {
         return MemberParty.builder()
                 .member(member)
                 .party(party)
-                .role(Role.party_MEMBER)
+                .role(Role.PARTY_MEMBER)
                 .joinedAt(LocalDateTime.now())
                 .status(ACTIVE)
                 .build();
     }
 
     public boolean isLeader() {
-        if (this.role == Role.party_MANAGER) return true;
+        if (this.role == Role.PARTY_MANAGER) return true;
         return false;
     }
 
 
     public boolean isViceLeader() {
-        if (this.role == Role.party_SUBMANAGER) return true;
+        if (this.role == Role.PARTY_SUBMANAGER) return true;
         return false;
     }
 

src/main/java/umc/cockple/demo/domain/party/converter/PartyConverter.java

@@ -211,9 +211,9 @@ public PartyMemberSuggestionDTO.Response toPartyMemberSuggestionDTO(Member membe
 
     private int getRolePriority(String role) {
         return switch (role) {
-            case "party_MANAGER" -> 0; // 모임장 역할
-            case "party_SUBMANAGER" -> 1; // 부모임장
-            case "party_MEMBER" -> 2; // 일반 멤버
+            case "PARTY_MANAGER" -> 0; // 모임장 역할
+            case "PARTY_SUBMANAGER" -> 1; // 부모임장
+            case "PARTY_MEMBER" -> 2; // 일반 멤버
             default -> 99;
         };
     }

src/main/java/umc/cockple/demo/domain/party/exception/PartyErrorCode.java

@@ -24,10 +24,10 @@ public enum PartyErrorCode implements BaseErrorCode {
     INVALID_ORDER_TYPE(HttpStatus.BAD_REQUEST, "PARTY106", "유효하지 않은 정렬 기준입니다. (최신순, 오래된 순, 운동 많은 순 중 하나여야 합니다.)"),
     INVALID_KEYWORD(HttpStatus.BAD_REQUEST, "PARTY107", "유효하지 않은 키워드입니다."),
     MALE_LEVEL_NOT_NEEDED(HttpStatus.BAD_REQUEST, "PARTY108", "여복 모임은 남자 급수를 설정할 수 없습니다."),
-    INVALID_ROLE_VALUE(HttpStatus.BAD_REQUEST, "PARTY411", "유효하지 않은 역할 값입니다. (party_SUBMANAGER 또는 party_MEMBER를 입력해주세요.)"),
+    INVALID_ROLE_VALUE(HttpStatus.BAD_REQUEST, "PARTY411", "유효하지 않은 역할 값입니다. (PARTY_SUBMANAGER 또는 PARTY_MEMBER를 입력해주세요.)"),
 
     PARTY_NOT_FOUND(HttpStatus.NOT_FOUND, "PARTY201", "존재하지 않는 모임입니다."),
-    JoinRequest_NOT_FOUND(HttpStatus.NOT_FOUND, "PARTY202", "존재하지 않는 가입신청입니다."),
+    JOIN_REQUEST_NOT_FOUND(HttpStatus.NOT_FOUND, "PARTY202", "존재하지 않는 가입신청입니다."),
     JOIN_REQUEST_PARTY_NOT_FOUND(HttpStatus.NOT_FOUND, "PARTY203", "해당 모임에서 존재하지 않는 가입신청입니다."),
     NOT_MEMBER(HttpStatus.BAD_REQUEST, "PARTY204", "해당 모임의 멤버가 아닙니다."),
     INVITATION_NOT_FOUND(HttpStatus.NOT_FOUND, "PARTY205", "존재하지 않는 모임 초대입니다."),

src/main/java/umc/cockple/demo/domain/party/service/PartyCommandServiceImpl.java

@@ -190,7 +190,7 @@ public void updateMemberRole(Long partyId, Long targetMemberId, Long currentMemb
         // 모임장 권한 검증
         validateOwnerPermission(party, currentMemberId);
         // 대상이 모임장인 경우 변경 불가
-        if (targetMemberParty.getRole() == Role.party_MANAGER) {
+        if (targetMemberParty.getRole() == Role.PARTY_MANAGER) {
             throw new PartyException(PartyErrorCode.CANNOT_ASSIGN_TO_OWNER);
         }
         // 이미 같은 역할인 경우
@@ -199,10 +199,10 @@ public void updateMemberRole(Long partyId, Long targetMemberId, Long currentMemb
         }
 
         // SUBOWNER 지정 시, 기존 부모임장 자동 해제
-        if (newRole == Role.party_SUBMANAGER) {
-            memberPartyRepository.findByPartyIdAndRole(partyId, Role.party_SUBMANAGER)
+        if (newRole == Role.PARTY_SUBMANAGER) {
+            memberPartyRepository.findByPartyIdAndRole(partyId, Role.PARTY_SUBMANAGER)
                     .ifPresent(mp -> {
-                        mp.changeRole(Role.party_MEMBER);
+                        mp.changeRole(Role.PARTY_MEMBER);
                         createRoleNotification(partyId, NotificationTarget.PARTY_SUBOWNER_RELEASED,
                                 mp.getMember().getNickname());
                     });
@@ -212,7 +212,7 @@ public void updateMemberRole(Long partyId, Long targetMemberId, Long currentMemb
         targetMemberParty.changeRole(newRole);
 
         // 알림 발송 (전체 멤버 대상)
-        NotificationTarget notifTarget = (newRole == Role.party_SUBMANAGER)
+        NotificationTarget notifTarget = (newRole == Role.PARTY_SUBMANAGER)
                 ? NotificationTarget.PARTY_SUBOWNER_ASSIGNED
                 : NotificationTarget.PARTY_SUBOWNER_RELEASED;
         createRoleNotification(partyId, notifTarget, targetMember.getNickname());
@@ -335,7 +335,7 @@ public void addKeyword(Long partyId, Long memberId, PartyKeywordDTO.Request requ
     //가입신청 조회
     private PartyJoinRequest findJoinRequestOrThrow(Long requestId) {
         return partyJoinRequestRepository.findById(requestId)
-                .orElseThrow(() -> new PartyException(PartyErrorCode.JoinRequest_NOT_FOUND));
+                .orElseThrow(() -> new PartyException(PartyErrorCode.JOIN_REQUEST_NOT_FOUND));
     }
 
     private PartyInvitation findInvitationOrThrow(Long invitationId) {
@@ -387,7 +387,7 @@ private void validateIsNotOwner(Party party, Long memberId) {
 
     // 부모임장은 권한이 없음을 검증
     private void validateIsNotSubOwner(Party party, Long memberId) {
-        memberPartyRepository.findByPartyIdAndRole(party.getId(), Role.party_SUBMANAGER)
+        memberPartyRepository.findByPartyIdAndRole(party.getId(), Role.PARTY_SUBMANAGER)
                 .ifPresent(mp -> {
                     if (mp.getMember().getId().equals(memberId)) {
                         throw new PartyException(PartyErrorCode.INVALID_ACTION_FOR_SUBOWNER);
@@ -427,7 +427,7 @@ private void validateRemovalPermission(Party party, Member remover, MemberParty
         if (remover.getId().equals(memberPartyToRemove.getMember().getId())) {
             //부모임장인 경우에만 가능
             MemberParty removerMemberParty = findMemberPartyOrThrow(party, remover);
-            if (removerMemberParty.getRole() == Role.party_SUBMANAGER) {
+            if (removerMemberParty.getRole() == Role.PARTY_SUBMANAGER) {
                 return;
             } else {
                 throw new PartyException(PartyErrorCode.CANNOT_REMOVE_SELF);
@@ -439,11 +439,11 @@ private void validateRemovalPermission(Party party, Member remover, MemberParty
         Role removerRole = removerMemberParty.getRole();
         Role targetRole = memberPartyToRemove.getRole();
         //모임장은 모두 삭제 가능
-        if (removerRole == Role.party_MANAGER) {
+        if (removerRole == Role.PARTY_MANAGER) {
             return;
         }
         //부모임장은 일반 멤버만 삭제 가능 (모임장을 삭제하려할 경우 권한 없음)
-        if (removerRole == Role.party_SUBMANAGER && targetRole == Role.party_MEMBER) {
+        if (removerRole == Role.PARTY_SUBMANAGER && targetRole == Role.PARTY_MEMBER) {
             return;
         }
         //일반 멤버는 권한 없음

src/main/java/umc/cockple/demo/global/enums/Role.java

@@ -2,9 +2,9 @@
 
 public enum Role {
 
-    party_MEMBER, //일반 멤버
+    PARTY_MEMBER, //일반 멤버
 
-    party_MANAGER, //모임장
+    PARTY_MANAGER, //모임장
 
-    party_SUBMANAGER //부모임장
+    PARTY_SUBMANAGER //부모임장
 }

src/test/java/umc/cockple/demo/domain/bookmark/integration/BookmarkIntegrationTest.java

@@ -63,7 +63,7 @@ void setUp() {
         PartyAddr addr = partyAddrRepository.save(PartyFixture.createPartyAddr("경기도", "안산시"));
         bookmarkParty = partyRepository.save(PartyFixture.createParty("테스트 모임", member.getId(), addr));
 
-        memberPartyRepository.save(MemberFixture.createMemberParty(bookmarkParty, member, Role.party_MANAGER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(bookmarkParty, member, Role.PARTY_MANAGER));
 
         bookmarkExercise = exerciseRepository.save(Exercise.builder()
                 .party(bookmarkParty)

src/test/java/umc/cockple/demo/domain/chat/integration/ChatIntegrationTest.java

@@ -58,8 +58,8 @@ void setUp() {
         PartyAddr addr = partyAddrRepository.save(PartyFixture.createPartyAddr("서울특별시", "강남구"));
         party = partyRepository.save(PartyFixture.createParty("배드민턴 모임", member.getId(), addr));
 
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, member, Role.party_MANAGER));
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, otherMember, Role.party_MEMBER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, member, Role.PARTY_MANAGER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, otherMember, Role.PARTY_MEMBER));
 
         partyChatRoom = chatRoomRepository.save(ChatFixture.createPartyChatRoom(party));
         directChatRoom = chatRoomRepository.save(ChatFixture.createDirectChatRoom());

src/test/java/umc/cockple/demo/domain/exercise/integration/ExerciseCommandIntegrationTest.java

@@ -70,9 +70,9 @@ void setUp() {
         PartyAddr addr = partyAddrRepository.save(PartyFixture.createPartyAddr("서울특별시", "강남구"));
         party = partyRepository.save(PartyFixture.createParty("테스트 모임", manager.getId(), addr));
 
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, manager, Role.party_MANAGER));
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, subManager, Role.party_SUBMANAGER));
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, normalMember, Role.party_MEMBER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, manager, Role.PARTY_MANAGER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, subManager, Role.PARTY_SUBMANAGER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, normalMember, Role.PARTY_MEMBER));
     }
 
     @AfterEach
@@ -606,7 +606,7 @@ void notPartyMember_outsideNotAccepted() throws Exception {
             void ageNotAllowed() throws Exception {
                 Member youngMember = memberRepository.save(
                         MemberFixture.createMember("어린회원", Gender.MALE, Level.B, 4001L, LocalDate.of(2010, 1, 1)));
-                memberPartyRepository.save(MemberFixture.createMemberParty(party, youngMember, Role.party_MEMBER));
+                memberPartyRepository.save(MemberFixture.createMemberParty(party, youngMember, Role.PARTY_MEMBER));
 
                 SecurityContextHelper.setAuthentication(youngMember.getId(), youngMember.getNickname());
 

src/test/java/umc/cockple/demo/domain/exercise/integration/ExerciseQueryIntegrationTest.java

@@ -2,7 +2,6 @@
 
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
 import umc.cockple.demo.domain.bookmark.domain.ExerciseBookmark;
@@ -39,7 +38,6 @@
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import javax.sql.DataSource;
 
@@ -79,9 +77,9 @@ void setUp() {
         PartyAddr addr = partyAddrRepository.save(PartyFixture.createPartyAddr("서울특별시", "강남구"));
         party = partyRepository.save(PartyFixture.createParty("테스트 모임", manager.getId(), addr));
 
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, manager, Role.party_MANAGER));
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, subManager, Role.party_SUBMANAGER));
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, normalMember, Role.party_MEMBER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, manager, Role.PARTY_MANAGER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, subManager, Role.PARTY_SUBMANAGER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, normalMember, Role.PARTY_MEMBER));
     }
 
     @AfterEach
@@ -139,15 +137,15 @@ class Success {
                         .andExpect(jsonPath("$.data.participants.list[0].gender").value("MALE"))
                         .andExpect(jsonPath("$.data.participants.list[0].level").isString())
                         .andExpect(jsonPath("$.data.participants.list[0].participantType").value("PARTY_MEMBER"))
-                        .andExpect(jsonPath("$.data.participants.list[0].partyPosition").value("party_MEMBER"))
+                        .andExpect(jsonPath("$.data.participants.list[0].partyPosition").value("PARTY_MEMBER"))
                         .andExpect(jsonPath("$.data.participants.list[0].isWithdrawn").value(false))
                         .andExpect(jsonPath("$.data.waiting.currentWaitingCount").value(1))
                         .andExpect(jsonPath("$.data.waiting.manCount").value(0))
                         .andExpect(jsonPath("$.data.waiting.womenCount").value(1))
                         .andExpect(jsonPath("$.data.waiting.list[0].name").value(subManager.getMemberName()))
                         .andExpect(jsonPath("$.data.waiting.list[0].gender").value("FEMALE"))
                         .andExpect(jsonPath("$.data.waiting.list[0].participantType").value("PARTY_MEMBER"))
-                        .andExpect(jsonPath("$.data.waiting.list[0].partyPosition").value("party_SUBMANAGER"))
+                        .andExpect(jsonPath("$.data.waiting.list[0].partyPosition").value("PARTY_SUBMANAGER"))
                         .andExpect(jsonPath("$.data.waiting.list[0].isWithdrawn").value(false));
             }
 
@@ -277,13 +275,13 @@ class Success {
                         .andExpect(status().isOk())
                         .andExpect(jsonPath("$.data.participants.list[0].name").value(manager.getMemberName()))
                         .andExpect(jsonPath("$.data.participants.list[0].participantType").value("PARTY_MEMBER"))
-                        .andExpect(jsonPath("$.data.participants.list[0].partyPosition").value("party_MANAGER"))
+                        .andExpect(jsonPath("$.data.participants.list[0].partyPosition").value("PARTY_MANAGER"))
                         .andExpect(jsonPath("$.data.participants.list[1].name").value(subManager.getMemberName()))
                         .andExpect(jsonPath("$.data.participants.list[1].participantType").value("PARTY_MEMBER"))
-                        .andExpect(jsonPath("$.data.participants.list[1].partyPosition").value("party_SUBMANAGER"))
+                        .andExpect(jsonPath("$.data.participants.list[1].partyPosition").value("PARTY_SUBMANAGER"))
                         .andExpect(jsonPath("$.data.participants.list[2].name").value(normalMember.getMemberName()))
                         .andExpect(jsonPath("$.data.participants.list[2].participantType").value("PARTY_MEMBER"))
-                        .andExpect(jsonPath("$.data.participants.list[2].partyPosition").value("party_MEMBER"))
+                        .andExpect(jsonPath("$.data.participants.list[2].partyPosition").value("PARTY_MEMBER"))
                         .andExpect(jsonPath("$.data.participants.list[3].name").value(outsider.getMemberName()))
                         .andExpect(jsonPath("$.data.participants.list[3].participantType").value("EXTERNAL_PARTICIPANT"))
                         .andExpect(jsonPath("$.data.participants.list[3].partyPosition").value(nullValue()))
@@ -1501,7 +1499,7 @@ void setUp() {
             filteredParty = partyRepository.save(filteredParty);
             filteredParty.addLevel(Gender.MALE, Level.B);
             filteredParty = partyRepository.save(filteredParty);
-            memberPartyRepository.save(MemberFixture.createMemberParty(filteredParty, manager, Role.party_MANAGER));
+            memberPartyRepository.save(MemberFixture.createMemberParty(filteredParty, manager, Role.PARTY_MANAGER));
 
             startDate = LocalDate.of(2026, 3, 23);
             endDate = LocalDate.of(2026, 4, 5);

src/test/java/umc/cockple/demo/domain/exercise/integration/ExerciseRecommendationIntegrationTest.java

@@ -72,7 +72,7 @@ void setUp() {
         partyRepository.save(party);
 
         // 모임장을 모임 멤버로 등록
-        memberPartyRepository.save(MemberFixture.createMemberParty(party, manager, Role.party_MANAGER));
+        memberPartyRepository.save(MemberFixture.createMemberParty(party, manager, Role.PARTY_MANAGER));
     }
 
     @AfterEach
@@ -155,7 +155,7 @@ class Success {
             void 소속된_모임의_운동은_추천되지_않는다() throws Exception {
                 // given - outsider를 모임에 가입시킴
                 memberPartyRepository.save(
-                        MemberFixture.createMemberParty(party, outsider, Role.party_MEMBER));
+                        MemberFixture.createMemberParty(party, outsider, Role.PARTY_MEMBER));
 
                 exerciseRepository.save(ExerciseFixture.createRecommendableExercise(party,
                         LocalDate.now().plusDays(3), 37.5, 127.0, "테스트 체육관"));