[fix/#505] 부모임장 추가에 따른 운동 API 로직 수정

src/main/java/umc/cockple/demo/domain/exercise/controller/ExerciseController.java

@@ -8,6 +8,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import umc.cockple.demo.domain.exercise.dto.*;
@@ -38,11 +39,11 @@ public class ExerciseController {
 
     @PostMapping("/parties/{partyId}/exercises")
     @Operation(summary = "운동 생성",
-            description = "모임 내에서 새로운 운동을 생성합니다. 모임장만 생성 가능합니다.")
+            description = "모임 내에서 새로운 운동을 생성합니다. 모임장과 부모임장만 생성 가능합니다.")
     @ApiResponse(responseCode = "201", description = "운동 생성 성공")
     @ApiResponse(responseCode = "400", description = "입력값 오류")
     @ApiResponse(responseCode = "403", description = "권한 없음")
-    public BaseResponse<ExerciseCreateDTO.Response> createExercise(
+    public ResponseEntity<BaseResponse<ExerciseCreateDTO.Response>> createExercise(
             @PathVariable Long partyId,
             @Valid @RequestBody ExerciseCreateDTO.Request request
     ) {
@@ -51,34 +52,34 @@ public BaseResponse<ExerciseCreateDTO.Response> createExercise(
         ExerciseCreateDTO.Response response = exerciseCommandService.createExercise(
                 partyId, memberId, request);
 
-        return BaseResponse.success(CommonSuccessCode.CREATED, response);
+        return BaseResponse.of(CommonSuccessCode.CREATED, response);
     }
 
     @DeleteMapping("/exercises/{exerciseId}")
     @Operation(summary = "운동 삭제",
-            description = "모임장이 운동을 삭제합니다. 삭제된 운동의 모든 참여자와 게스트도 함께 삭제됩니다.")
+            description = "모임장 또는 부모임장이 운동을 삭제합니다. 삭제된 운동의 모든 참여자와 게스트도 함께 삭제됩니다.")
     @ApiResponse(responseCode = "200", description = "운동 삭제 성공")
     @ApiResponse(responseCode = "403", description = "권한 없음 (모임장이 아님)")
     @ApiResponse(responseCode = "404", description = "운동을 찾을 수 없음")
-    public BaseResponse<ExerciseDeleteDTO.Response> deleteExercise(
+    public ResponseEntity<BaseResponse<ExerciseDeleteDTO.Response>> deleteExercise(
             @PathVariable Long exerciseId
     ) {
         Long memberId = SecurityUtil.getCurrentMemberId();
 
         ExerciseDeleteDTO.Response response = exerciseCommandService.deleteExercise(
                 exerciseId, memberId);
 
-        return BaseResponse.success(CommonSuccessCode.OK, response);
+        return BaseResponse.of(CommonSuccessCode.OK, response);
     }
 
     @PatchMapping("/exercises/{exerciseId}")
     @Operation(summary = "운동 수정",
-            description = "모임장이 생성한 운동의 정보를 수정합니다. 이미 시작된 운동은 수정할 수 없습니다.")
+            description = "모임장 또는 부모임장이 생성한 운동의 정보를 수정합니다. 이미 시작된 운동은 수정할 수 없습니다.")
     @ApiResponse(responseCode = "200", description = "운동 수정 성공")
     @ApiResponse(responseCode = "400", description = "입력값 오류 또는 비즈니스 룰 위반")
     @ApiResponse(responseCode = "403", description = "권한 없음 (모임장이 아님)")
     @ApiResponse(responseCode = "404", description = "존재하지 않는 운동")
-    public BaseResponse<ExerciseUpdateDTO.Response> updateExercise(
+    public ResponseEntity<BaseResponse<ExerciseUpdateDTO.Response>> updateExercise(
             @PathVariable Long exerciseId,
             @Valid @RequestBody ExerciseUpdateDTO.Request request
     ) {
@@ -87,7 +88,7 @@ public BaseResponse<ExerciseUpdateDTO.Response> updateExercise(
         ExerciseUpdateDTO.Response response = exerciseCommandService.updateExercise(
                 exerciseId, memberId, request);
 
-        return BaseResponse.success(CommonSuccessCode.OK, response);
+        return BaseResponse.of(CommonSuccessCode.OK, response);
     }
 
     @PostMapping("/exercises/{exerciseId}/participants")
@@ -131,7 +132,7 @@ public BaseResponse<ExerciseCancelDTO.Response> cancelParticipation(
     @ApiResponse(responseCode = "400", description = "취소할 수 없는 상태 (이미 시작됨, 참여하지 않음 등)")
     @ApiResponse(responseCode = "403", description = "권한 없음 (매니저가 아님)")
     @ApiResponse(responseCode = "404", description = "운동 또는 참여 기록을 찾을 수 없음")
-    public BaseResponse<ExerciseCancelDTO.Response> cancelParticipationByManager(
+    public ResponseEntity<BaseResponse<ExerciseCancelDTO.Response>> cancelParticipationByManager(
             @PathVariable Long exerciseId,
             @PathVariable Long participantId,
             @Valid @RequestBody ExerciseCancelDTO.ByManagerRequest request
@@ -141,7 +142,7 @@ public BaseResponse<ExerciseCancelDTO.Response> cancelParticipationByManager(
         ExerciseCancelDTO.Response response = exerciseCommandService.cancelParticipationByManager(
                 exerciseId, participantId, memberId, request);
 
-        return BaseResponse.success(CommonSuccessCode.OK, response);
+        return BaseResponse.of(CommonSuccessCode.OK, response);
     }
 
     @PostMapping("/exercises/{exerciseId}/guests")

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

@@ -70,11 +70,11 @@ public void validateCancelGuestParticipationByManager(Guest guest, Exercise exer
     }
 
     public void validateDeleteExercise(Exercise exercise, Long memberId) {
-        validateManagerPermission(memberId, exercise.getParty());
+        validateSubManagerPermission(memberId, exercise.getParty());
     }
 
     public void validateUpdateExercise(Exercise exercise, Member member, ExerciseUpdateDTO.Request request) {
-        validateManagerPermission(member.getId(), exercise.getParty());
+        validateSubManagerPermission(member.getId(), exercise.getParty());
         validateAlreadyStarted(exercise, ExerciseErrorCode.EXERCISE_ALREADY_STARTED_UPDATE);
         validateUpdateTime(request, exercise);
     }
@@ -87,15 +87,6 @@ private void validatePartyIsActive(Party party) {
         }
     }
 
-    private void validateManagerPermission(Long memberId, Party party) {
-        boolean isOwner = party.getOwnerId().equals(memberId);
-        boolean isManager = memberPartyRepository.existsByPartyIdAndMemberIdAndRole(
-                party.getId(), memberId, Role.party_MANAGER);
-
-        if (!isOwner && !isManager)
-            throw new ExerciseException(ExerciseErrorCode.INSUFFICIENT_PERMISSION);
-    }
-
     private void validateSubManagerPermission(Long memberId, Party party) {
         boolean isOwner = party.getOwnerId().equals(memberId);
         boolean isManager = memberPartyRepository.existsByPartyIdAndMemberIdAndRole(

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

@@ -58,36 +58,46 @@ public class Member extends BaseEntity {
 
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
+    @Builder.Default
     private List<Contest> contests = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
+    @Builder.Default
     private List<Notification> notifications = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
+    @Builder.Default
     private List<MemberKeyword> keywords = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
+    @Builder.Default
     private List<MemberAddr> addresses = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
+    @Builder.Default
     private List<MemberParty> memberParties = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
+    @Builder.Default
     private List<MemberExercise> memberExercises = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
+    @Builder.Default
     private List<ExerciseBookmark> exerciseBookmarks = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
+    @Builder.Default
     private List<PartyBookmark> partyBookmarks = new ArrayList<>();
 
     @OneToOne(mappedBy = "member", cascade = CascadeType.ALL)
     private ProfileImg profileImg;
 
     @OneToMany(mappedBy = "sender")
+    @Builder.Default
     private List<ChatMessage> chatMessages = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
     private List<ChatRoomMember> chatRoomMembers = new ArrayList<>();
 
 

src/main/java/umc/cockple/demo/global/response/BaseResponse.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Getter;
+import org.springframework.http.ResponseEntity;
 import umc.cockple.demo.global.response.code.BaseCode;
 import umc.cockple.demo.global.response.code.BaseErrorCode;
 import umc.cockple.demo.global.response.code.status.CommonSuccessCode;
@@ -84,4 +85,23 @@ public static <T> BaseResponse<T> error(BaseErrorCode errorCode, String customMe
                 .build();
     }
 
+    public static <T> ResponseEntity<BaseResponse<T>> of(BaseCode code) {
+        return of(code, null);
+    }
+
+    public static <T> ResponseEntity<BaseResponse<T>> of(BaseCode code, T data) {
+        ReasonDTO reason = code.getReason();
+
+        BaseResponse<T> body = BaseResponse.<T>builder()
+                .isSuccess(reason.getHttpStatus().is2xxSuccessful())
+                .code(reason.getCode())
+                .message(reason.getMessage())
+                .data(data)
+                .build();
+
+        return ResponseEntity
+                .status(reason.getHttpStatus())
+                .body(body);
+    }
+
 }