[Feat/#213] 공연 이미지 수정/삭제 API

src/main/java/com/amp/domain/congestion/repository/StageCongestionRepository.java

@@ -27,4 +27,6 @@ SELECT MAX(sc2.id)
             "ORDER BY sc.measuredAt DESC")
     Optional<StageCongestion> findLatestByStageId(@Param("stageId") Long stageId);
 
+    void deleteByStageIdIn(List<Long> stageIds);
+
 }

src/main/java/com/amp/domain/congestion/service/StageService.java

@@ -3,6 +3,8 @@
 import com.amp.domain.festival.entity.Festival;
 import com.amp.domain.congestion.dto.request.StageRequest;
 import com.amp.domain.congestion.entity.Stage;
+import com.amp.domain.congestion.repository.StageCongestionRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,8 +17,11 @@
 
 @Service
 @Transactional
+@RequiredArgsConstructor
 public class StageService {
 
+    private final StageCongestionRepository stageCongestionRepository;
+
     public void syncStages(Festival festival, List<StageRequest> requests) {
         if (requests == null || requests.isEmpty()) {
             return;
@@ -29,6 +34,15 @@ public void syncStages(Festival festival, List<StageRequest> requests) {
         Set<Long> requestIds = requests.stream()
                 .map(StageRequest::getId).filter(Objects::nonNull).collect(Collectors.toSet());
 
+        List<Long> removedStageIds = existStages.stream()
+                .map(Stage::getId)
+                .filter(id -> !requestIds.contains(id))
+                .collect(Collectors.toList());
+
+        if (!removedStageIds.isEmpty()) {
+            stageCongestionRepository.deleteByStageIdIn(removedStageIds);
+        }
+
         existStages.removeIf(stage -> !requestIds.contains(stage.getId()));
 
         for (StageRequest request : requests) {

src/main/java/com/amp/domain/festival/controller/organizer/FestivalController.java

@@ -52,10 +52,10 @@ public ResponseEntity<BaseResponse<FestivalDetailResponse>> getFestivalDetail(
 
     @Operation(summary = "공연 수정")
     @ApiErrorCodes(SwaggerResponseDescription.FAIL_TO_UPDATE_FESTIVAL)
-    @PatchMapping("/{festivalId}")
+    @PutMapping(value = "/{festivalId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<BaseResponse<FestivalUpdateResponse>> updateFestival(
             @PathVariable Long festivalId,
-            @RequestBody @Valid FestivalUpdateRequest request) {
+            @ModelAttribute @Valid FestivalUpdateRequest request) {
         FestivalUpdateResponse response = festivalService.updateFestival(festivalId, request);
         return ResponseEntity
                 .status(SuccessStatus.FESTIVAL_UPDATE_SUCCESS.getHttpStatus())

src/main/java/com/amp/domain/festival/dto/request/FestivalUpdateRequest.java

@@ -1,17 +1,14 @@
 package com.amp.domain.festival.dto.request;
 
-import com.amp.domain.congestion.dto.request.StageRequest;
-import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-
-import java.util.List;
+import org.springframework.web.multipart.MultipartFile;
 
 public record FestivalUpdateRequest(
         @NotBlank(message = "공연명은 필수입니다.") String title,
         @NotBlank(message = "공연 장소는 필수입니다.") String location,
-        @Valid @NotEmpty(message = "공연 일시는 필수입니다.") List<ScheduleRequest> schedules,
-        @Valid @NotEmpty(message = "1개 이상의 무대/부스 정보는 필수입니다.") List<StageRequest> stages,
-        @NotEmpty(message = "최소 1개의 카테고리를 선택해야 합니다.") List<Long> activeCategoryIds
+        MultipartFile mainImage,
+        @NotBlank(message = "공연 일시는 필수입니다.") String schedules,
+        @NotBlank(message = "1개 이상의 무대/부스 정보는 필수입니다.") String stages,
+        @NotBlank(message = "1개 이상의 카테고리 선택은 필수입니다.") String activeCategoryIds
 ) {
 }

src/main/java/com/amp/domain/festival/entity/Festival.java

@@ -108,4 +108,8 @@ public void updateDates(LocalDate startDate, LocalDate endDate) {
     public void updateStartTime(LocalTime startTime) {
         this.startTime = startTime;
     }
+
+    public void updateMainImage(String mainImageUrl) {
+        this.mainImageUrl = mainImageUrl;
+    }
 }

src/main/java/com/amp/domain/festival/service/organizer/FestivalService.java

@@ -20,7 +20,6 @@
 import com.amp.domain.congestion.service.StageService;
 import com.amp.domain.user.entity.Organizer;
 import com.amp.domain.user.entity.User;
-import com.amp.global.annotation.LogExecutionTime;
 import com.amp.global.common.CommonErrorCode;
 import com.amp.global.exception.CustomException;
 import com.amp.global.s3.S3ErrorCode;
@@ -32,6 +31,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDate;
@@ -63,41 +64,30 @@ public class FestivalService {
     public FestivalCreateResponse createFestival(FestivalCreateRequest request) {
         User user = authService.getCurrentUser();
 
-        if (!(user instanceof Organizer)) {
+        if (!(user instanceof Organizer organizer)) {
             throw new CustomException(CommonErrorCode.FORBIDDEN);
         }
-        Organizer organizer = (Organizer) user;
 
         List<ScheduleRequest> schedules = parseJson(
                 request.schedules(),
                 new TypeReference<List<ScheduleRequest>>() {
                 },
                 FestivalErrorCode.INVALID_SCHEDULE_FORMAT
         );
-
         List<StageRequest> stages = parseJson(
                 request.stages(),
                 new TypeReference<List<StageRequest>>() {
                 },
                 FestivalErrorCode.INVALID_STAGE_FORMAT
         );
-
         List<Long> activeCategoryIds = parseJson(
-                request.activeCategoryIds(),
+                normalizeJsonArray(request.activeCategoryIds()),
                 new TypeReference<List<Long>>() {
                 },
                 FestivalErrorCode.INVALID_CATEGORY_FORMAT
         );
 
-        if (schedules == null || schedules.isEmpty()) {
-            throw new CustomException(FestivalErrorCode.SCHEDULES_REQUIRED);
-        }
-        if (stages == null || stages.isEmpty()) {
-            throw new CustomException(FestivalErrorCode.STAGES_REQUIRED);
-        }
-        if (activeCategoryIds == null || activeCategoryIds.isEmpty()) {
-            throw new CustomException(CategoryErrorCode.CATEGORY_REQUIRED);
-        }
+        checkNullField(schedules, stages, activeCategoryIds);
 
         ScheduleRequest earliestSchedule = schedules.stream()
                 .min(Comparator.comparing(ScheduleRequest::getFestivalDate)
@@ -170,11 +160,53 @@ public FestivalUpdateResponse updateFestival(Long festivalId, FestivalUpdateRequ
 
         validateOrganizer(festival, user);
 
+        List<ScheduleRequest> schedules = parseJson(
+                request.schedules(),
+                new TypeReference<List<ScheduleRequest>>() {
+                },
+                FestivalErrorCode.INVALID_SCHEDULE_FORMAT
+        );
+        List<StageRequest> stages = parseJson(
+                request.stages(),
+                new TypeReference<List<StageRequest>>() {
+                },
+                FestivalErrorCode.INVALID_STAGE_FORMAT
+        );
+        List<Long> activeCategoryIds = parseJson(
+                normalizeJsonArray(request.activeCategoryIds()),
+                new TypeReference<List<Long>>() {
+                },
+                FestivalErrorCode.INVALID_CATEGORY_FORMAT
+        );
+
+        checkNullField(schedules, stages, activeCategoryIds);
+
         festival.updateInfo(request.title(), request.location());
 
-        scheduleService.syncSchedules(festival, request.schedules());
-        stageService.syncStages(festival, request.stages());
-        categoryService.syncCategories(festival, request.activeCategoryIds());
+        scheduleService.syncSchedules(festival, schedules);
+        stageService.syncStages(festival, stages);
+        categoryService.syncCategories(festival, activeCategoryIds);
+
+        if (request.mainImage() != null && !request.mainImage().isEmpty()) {
+            String oldKey = s3Service.extractKey(festival.getMainImageUrl());
+            String newKey = uploadImage(request.mainImage());
+
+            festival.updateMainImage(s3Service.getPublicUrl(newKey));
+
+            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+                @Override
+                public void afterCommit() {
+                    s3Service.delete(oldKey);
+                }
+
+                @Override
+                public void afterCompletion(int status) {
+                    if (status == STATUS_ROLLED_BACK) {
+                        s3Service.delete(newKey);
+                    }
+                }
+            });
+        }
 
         LocalDate startDate = calculateDate(festival.getSchedules(), FestivalSchedule::getFestivalDate, true);
         LocalDate endDate = calculateDate(festival.getSchedules(), FestivalSchedule::getFestivalDate, false);
@@ -197,8 +229,6 @@ public void deleteFestival(Long festivalId) {
         festivalScheduleRepository.softDeleteByFestivalId(festivalId);
         stageRepository.softDeleteByFestivalId(festivalId);
         festivalCategoryRepository.softDeleteByFestivalId(festivalId);
-
-
         festivalRepository.softDeleteById(festivalId);
     }
 
@@ -218,7 +248,6 @@ private <T> LocalTime calculateTime(List<T> schedules, Function<T, LocalTime> ti
                 .orElseThrow(() -> new CustomException(FestivalErrorCode.INVALID_SCHEDULE_FORMAT));
     }
 
-    @LogExecutionTime("이미지 업로드")
     private String uploadImage(MultipartFile image) {
         try {
             return s3Service.upload(image, "festivals");
@@ -227,10 +256,17 @@ private String uploadImage(MultipartFile image) {
         }
     }
 
+    private String normalizeJsonArray(String value) {
+        if (value == null) return null;
+        String trimmed = value.trim();
+        return trimmed.startsWith("[") ? trimmed : "[" + trimmed + "]";
+    }
+
     private <T> T parseJson(String json, TypeReference<T> typeReference, FestivalErrorCode errorCode) {
         if (json == null || json.trim().isEmpty()) {
             return null;
         }
+
         try {
             return objectMapper.readValue(json, typeReference);
         } catch (Exception e) {
@@ -243,10 +279,21 @@ private Festival findFestival(Long id) {
                 .orElseThrow(() -> new CustomException(FestivalErrorCode.FESTIVAL_NOT_FOUND));
     }
 
-
     private void validateOrganizer(Festival festival, User user) {
         if (!festival.getOrganizer().getId().equals(user.getId())) {
             throw new CustomException(CommonErrorCode.FORBIDDEN);
         }
     }
+
+    private static void checkNullField(List<ScheduleRequest> schedules, List<StageRequest> stages, List<Long> activeCategoryIds) {
+        if (schedules == null || schedules.isEmpty()) {
+            throw new CustomException(FestivalErrorCode.SCHEDULES_REQUIRED);
+        }
+        if (stages == null || stages.isEmpty()) {
+            throw new CustomException(FestivalErrorCode.STAGES_REQUIRED);
+        }
+        if (activeCategoryIds == null || activeCategoryIds.isEmpty()) {
+            throw new CustomException(CategoryErrorCode.CATEGORY_REQUIRED);
+        }
+    }
 }

src/main/java/com/amp/global/s3/S3ErrorCode.java

@@ -13,6 +13,7 @@ public enum S3ErrorCode implements ErrorCode {
     INVALID_IMAGE_IMAGE(HttpStatus.BAD_REQUEST, "S3", "001", "이미지 파일만 업로드 가능합니다."),
     FILE_NAME_NOT_FOUND(HttpStatus.BAD_REQUEST, "S3", "002", "파일명이 없습니다."),
     INVALID_DIRECTORY_ROUTE(HttpStatus.BAD_REQUEST, "S3", "003", "잘못된 디렉토리 경로입니다."),
+    INVALID_IMAGE_URL(HttpStatus.BAD_REQUEST, "S3", "004", "유효하지 않은 이미지 URL입니다."),
 
     // 500 Internal Server Error
     S3_UPLOAD_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "S3", "001", "S3 업로드를 실패하였습니다."),

src/main/java/com/amp/global/s3/S3Service.java

@@ -2,7 +2,6 @@
 
 import com.amp.global.exception.CustomException;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -82,5 +81,16 @@ public String getPublicUrl(String key) {
                 s3Properties.getRegion()
         ) + key;
     }
-}
 
+    public String extractKey(String publicUrl) {
+        String baseUrl = String.format(
+                s3Properties.getBaseUrl(),
+                s3Properties.getBucket(),
+                s3Properties.getRegion()
+        );
+        if (!publicUrl.startsWith(baseUrl)) {
+            throw new CustomException(S3ErrorCode.INVALID_IMAGE_URL);
+        }
+        return publicUrl.substring(baseUrl.length());
+    }
+}