[release] 수정사항을 반영해 배포합니다.

src/main/java/org/sopt/confeti/api/artist/facade/ArtistFacade.java

@@ -18,17 +18,14 @@ public class ArtistFacade {
 
     @Transactional(readOnly = true)
     public SearchArtistDTO searchByKeyword(final Long userId, final String keyword) {
-        Optional<ConfetiArtist> confetiArtist = spotifyAPIHandler.findArtistsByKeyword(keyword);
+        ConfetiArtist confetiArtist = spotifyAPIHandler.findArtistsByKeyword(keyword);
 
         boolean isFavorite = false;
 
-        if (confetiArtist.isPresent() && userId != null) {
-            isFavorite = artistFavoriteService.isFavorite(userId, confetiArtist.get().getArtistId());
+        if (userId != null) {
+            isFavorite = artistFavoriteService.isFavorite(userId, confetiArtist.getArtistId());
         }
 
-        return SearchArtistDTO.from(
-                confetiArtist.orElse(ConfetiArtist.empty()),
-                isFavorite
-        );
+        return SearchArtistDTO.from(confetiArtist, isFavorite);
     }
 }

src/main/java/org/sopt/confeti/api/performance/controller/PerformanceController.java

@@ -39,7 +39,7 @@ public ResponseEntity<BaseResponse<?>> getConcertInfo(
             @RequestHeader(name = "Authorization", required = false) Long userId,
             @PathVariable("concertId") @Min(value = 0, message = "요청 형식이 올바르지 않습니다.") long concertId
     ) {
-        ConcertDetailDTO concertDetailDTO = performanceFacade.getConcertDetailInfo(concertId);
+        ConcertDetailDTO concertDetailDTO = performanceFacade.getConcertDetailInfo(userId, concertId);
         return ApiResponseUtil.success(SuccessMessage.SUCCESS, ConcertDetailResponse.of(concertDetailDTO, s3FileHandler));
     }
 
@@ -54,7 +54,7 @@ public ResponseEntity<BaseResponse<?>> getFestivalInfo(@RequestHeader(name = "Au
     public ResponseEntity<BaseResponse<?>> createConcert(@RequestBody CreateFestivalRequest createFestivalRequest) {
         performanceFacade.createFestival(CreateFestivalDTO.from(createFestivalRequest));
 
-        return ApiResponseUtil.success(SuccessMessage.SUCCESS);
+        return ApiResponseUtil.success(SuccessMessage.CREATED);
     }
 
     @GetMapping("/reservation")

src/main/java/org/sopt/confeti/api/performance/dto/request/CreateFestivalDateRequest.java

@@ -7,10 +7,10 @@
 import java.util.List;
 
 public record CreateFestivalDateRequest(
-        @JsonFormat(pattern = "yyyy.MM.dd")
+        @JsonFormat(pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
         @JsonProperty(value = "festival_at")
         LocalDate festivalAt,
-        @JsonFormat(pattern = "HH:mm:ss")
+        @JsonFormat(pattern = "HH:mm:ss", timezone = "Asia/Seoul")
         @JsonProperty(value = "ticket_open_at")
         LocalTime ticketOpenAt,
         @JsonProperty(value = "festival_stages")

src/main/java/org/sopt/confeti/api/performance/dto/request/CreateFestivalRequest.java

@@ -11,12 +11,12 @@ public record CreateFestivalRequest(
         String festivalTitle,
         @JsonProperty(value = "festival_subtitle")
         String festivalSubtitle,
-        @JsonFormat(pattern = "yyyy.MM.dd")
+        @JsonFormat(pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
         @JsonProperty(value = "festival_start_at")
-        LocalDateTime festivalStartAt,
-        @JsonFormat(pattern = "yyyy.MM.dd")
+        LocalDate festivalStartAt,
+        @JsonFormat(pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
         @JsonProperty(value = "festival_end_at")
-        LocalDateTime festivalEndAt,
+        LocalDate festivalEndAt,
         @JsonProperty(value = "festival_area")
         String festivalArea,
         @JsonProperty(value = "festival_poster_path")
@@ -29,9 +29,9 @@ public record CreateFestivalRequest(
         String festivalReservationBgPath,
         @JsonProperty(value = "festival_logo_path")
         String festivalLogoPath,
-        @JsonFormat(pattern = "yyyy.MM.dd")
+        @JsonFormat(pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
         @JsonProperty(value = "reserve_at")
-        LocalDateTime reserveAt,
+        LocalDate reserveAt,
         @JsonProperty(value = "reservation_url")
         String reservationUrl,
         @JsonProperty(value = "reservation_office")

src/main/java/org/sopt/confeti/api/performance/dto/request/CreateFestivalTimeRequest.java

@@ -6,10 +6,10 @@
 import java.util.List;
 
 public record CreateFestivalTimeRequest(
-        @JsonFormat(pattern = "HH:mm:ss")
+        @JsonFormat(pattern = "HH:mm:ss", timezone = "Asia/Seoul")
         @JsonProperty(value = "start_at")
         LocalTime startAt,
-        @JsonFormat(pattern = "HH:mm:ss")
+        @JsonFormat(pattern = "HH:mm:ss", timezone = "Asia/Seoul")
         @JsonProperty(value = "end_at")
         LocalTime endAt,
         @JsonProperty(value = "festival_artists")

src/main/java/org/sopt/confeti/api/performance/dto/response/ConcertDetailInfoResponse.java

@@ -21,7 +21,8 @@ public record ConcertDetailInfoResponse(
         String ageRating,
         String reservationOffice,
         String price,
-        String infoImgUrl
+        String infoImgUrl,
+        boolean isFavorite
 ) {
     public static ConcertDetailInfoResponse of(final ConcertDetailDTO concertDetailDTO, final S3FileHandler s3FileHandler) {
         return new ConcertDetailInfoResponse(
@@ -39,7 +40,8 @@ public static ConcertDetailInfoResponse of(final ConcertDetailDTO concertDetailD
                 concertDetailDTO.ageRating(),
                 concertDetailDTO.reservationOffice(),
                 concertDetailDTO.price(),
-                s3FileHandler.getFileUrl(concertDetailDTO.infoImgPath())
+                s3FileHandler.getFileUrl(concertDetailDTO.infoImgPath()),
+                concertDetailDTO.isFavorite()
         );
     }
 }

src/main/java/org/sopt/confeti/api/performance/facade/PerformanceFacade.java

@@ -36,11 +36,20 @@ public class PerformanceFacade {
     private final ConcertFavoriteService concertFavoriteService;
 
     @Transactional(readOnly = true)
-    public ConcertDetailDTO getConcertDetailInfo(final long concertId) {
+    public ConcertDetailDTO getConcertDetailInfo(final Long userId, final long concertId) {
         Concert concert = concertService.getConcertDetailByConcertId(concertId);
         validateConcertNotPassed(concert);
 
-        return ConcertDetailDTO.from(concert);
+        return ConcertDetailDTO.of(concert, getConcertFavorite(userId, concertId));
+    }
+
+    @Transactional(readOnly = true)
+    public boolean getConcertFavorite(final Long userId, final long concertId) {
+        if (userId == null) {
+            return false;
+        }
+
+        return concertFavoriteService.isFavorite(userId, concertId);
     }
 
     @Transactional(readOnly = true)
@@ -52,7 +61,8 @@ protected void validateConcertNotPassed(final Concert concert) {
 
     @Transactional
     public void createFestival(final CreateFestivalDTO createFestivalDTO) {
-        festivalService.create(createFestivalDTO);
+        Festival festival = festivalService.create(createFestivalDTO);
+        performanceService.create(festival);
     }
 
     @Transactional(readOnly = true)

src/main/java/org/sopt/confeti/api/performance/facade/dto/request/CreateFestivalDTO.java

@@ -1,6 +1,5 @@
 package org.sopt.confeti.api.performance.facade.dto.request;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import org.sopt.confeti.api.performance.dto.request.CreateFestivalRequest;
@@ -28,15 +27,15 @@ public static CreateFestivalDTO from(final CreateFestivalRequest createFestivalR
         return new CreateFestivalDTO(
                 createFestivalRequest.festivalTitle(),
                 createFestivalRequest.festivalSubtitle(),
-                createFestivalRequest.festivalStartAt(),
-                createFestivalRequest.festivalEndAt(),
+                createFestivalRequest.festivalStartAt().atStartOfDay(),
+                createFestivalRequest.festivalEndAt().atStartOfDay(),
                 createFestivalRequest.festivalArea(),
                 createFestivalRequest.festivalPosterPath(),
                 createFestivalRequest.festivalPosterBgPath(),
                 createFestivalRequest.festivalInfoImgPath(),
                 createFestivalRequest.festivalReservationBgPath(),
                 createFestivalRequest.festivalLogoPath(),
-                createFestivalRequest.reserveAt(),
+                createFestivalRequest.reserveAt().atStartOfDay(),
                 createFestivalRequest.reservationUrl(),
                 createFestivalRequest.reservationOffice(),
                 createFestivalRequest.ageRating(),

src/main/java/org/sopt/confeti/api/performance/facade/dto/response/ConcertDetailDTO.java

@@ -22,9 +22,10 @@ public record ConcertDetailDTO(
         String ageRating,
         String time,
         String price,
-        List<ConcertArtistDTO> artists
+        List<ConcertArtistDTO> artists,
+        boolean isFavorite
 ) {
-    public static ConcertDetailDTO from(final Concert concert) {
+    public static ConcertDetailDTO of(final Concert concert, final boolean isFavorite) {
         return new ConcertDetailDTO(
                 concert.getId(),
                 concert.getConcertTitle(),
@@ -44,7 +45,8 @@ public static ConcertDetailDTO from(final Concert concert) {
                 concert.getPrice(),
                 concert.getArtists().stream()
                         .map(ConcertArtistDTO::of)
-                        .toList()
+                        .toList(),
+                isFavorite
         );
     }
 }

src/main/java/org/sopt/confeti/api/user/controller/UserTimetableController.java

@@ -3,30 +3,25 @@
 import jakarta.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
 import org.sopt.confeti.api.user.dto.request.AddTimetableFestivalRequest;
+import org.sopt.confeti.api.user.dto.request.PatchTimetableRequest;
 import org.sopt.confeti.api.user.dto.response.TimetablesToAddResponse;
 import org.sopt.confeti.api.user.dto.response.UserTimetableDetailResponse;
 import org.sopt.confeti.api.user.dto.response.UserTimetableFestivalResponse;
 import org.sopt.confeti.api.user.facade.UserTimetableFacade;
 import org.sopt.confeti.api.user.facade.dto.request.AddTimetableFestivalDTO;
+import org.sopt.confeti.api.user.facade.dto.request.PatchTimetableDTO;
 import org.sopt.confeti.api.user.facade.dto.response.TimetableToAddDTO;
 import org.sopt.confeti.api.user.facade.dto.response.UserTimetableDTO;
 import org.sopt.confeti.api.user.facade.dto.response.UserTimetableFestivalBasicDTO;
+import org.sopt.confeti.api.user.facade.dto.response.UserTimetableFestivalDTO;
 import org.sopt.confeti.global.common.BaseResponse;
 import org.sopt.confeti.global.common.CursorPage;
 import org.sopt.confeti.global.message.SuccessMessage;
 import org.sopt.confeti.global.util.ApiResponseUtil;
 import org.sopt.confeti.global.util.S3FileHandler;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @Validated
@@ -78,4 +73,13 @@ public ResponseEntity<BaseResponse<?>> getTimetableFestival(
         UserTimetableFestivalBasicDTO response = userTimetableFacade.getTimetableInfo(userId, festivalDateId);
         return ApiResponseUtil.success(SuccessMessage.SUCCESS, UserTimetableFestivalResponse.from(response));
     }
+
+    @PatchMapping
+    public ResponseEntity<BaseResponse<?>> updateTimetableFestival(
+            @RequestHeader("Authorization") long userId,
+            @RequestBody PatchTimetableRequest patchTimetablerequest
+    ){
+        userTimetableFacade.patchTimetableFestivals(userId, PatchTimetableDTO.from(patchTimetablerequest));
+        return ApiResponseUtil.success(SuccessMessage.SUCCESS);
+    }
 }

src/main/java/org/sopt/confeti/api/user/dto/request/PatchTimetableListRequest.java

@@ -0,0 +1,10 @@
+package org.sopt.confeti.api.user.dto.request;
+
+public record PatchTimetableListRequest (
+        long userTimetableId,
+        boolean isSelected
+){
+    public static PatchTimetableListRequest from(PatchTimetableListRequest request) {
+        return new PatchTimetableListRequest(request.userTimetableId(), request.isSelected());
+    }
+}

src/main/java/org/sopt/confeti/api/user/dto/request/PatchTimetableRequest.java

@@ -0,0 +1,8 @@
+package org.sopt.confeti.api.user.dto.request;
+
+import java.util.List;
+
+public record PatchTimetableRequest (
+        List<PatchTimetableListRequest> userTimetables
+){
+}

src/main/java/org/sopt/confeti/api/user/dto/response/UserTimetableFestivalTimeResponse.java

@@ -6,15 +6,15 @@
 import java.util.List;
 
 public record UserTimetableFestivalTimeResponse(
-        Long festivalTimeId,
+        Long userTimetableId,
         String startAt,
         String endAt,
         Boolean isSelected,
         List<UserTimetableFestivalArtistResponse> artists
 ) {
     public static UserTimetableFestivalTimeResponse from(UserTimetableFestivalTimeDTO festivalTime) {
         return new UserTimetableFestivalTimeResponse(
-                festivalTime.festivalTimeId(),
+                festivalTime.userTimetableId(),
                 DateConvertor.convert(festivalTime.startAt()),
                 DateConvertor.convert(festivalTime.endAt()),
                 festivalTime.isSelected(),

src/main/java/org/sopt/confeti/api/user/facade/UserTimetableFacade.java

@@ -1,11 +1,15 @@
 package org.sopt.confeti.api.user.facade;
 
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import lombok.RequiredArgsConstructor;
 import org.sopt.confeti.annotation.Facade;
 import org.sopt.confeti.api.user.facade.dto.request.AddTimetableFestivalArtiestDTO;
 import org.sopt.confeti.api.user.facade.dto.request.AddTimetableFestivalDTO;
+import org.sopt.confeti.api.user.facade.dto.request.PatchTimetableDTO;
+import org.sopt.confeti.api.user.facade.dto.request.PatchTimetableListDTO;
 import org.sopt.confeti.api.user.facade.dto.response.TimetableToAddDTO;
 import org.sopt.confeti.api.user.facade.dto.response.UserTimetableDTO;
 import org.sopt.confeti.api.user.facade.dto.response.UserTimetableFestivalBasicDTO;
@@ -14,23 +18,23 @@
 import org.sopt.confeti.domain.festivaldate.FestivalDate;
 import org.sopt.confeti.domain.festivaldate.application.FestivalDateService;
 import org.sopt.confeti.domain.festival.application.dto.FestivalCursorDTO;
-import org.sopt.confeti.domain.festivaldate.FestivalDate;
-import org.sopt.confeti.domain.festivaldate.application.FestivalDateService;
+import org.sopt.confeti.domain.festivaltime.FestivalTime;
 import org.sopt.confeti.domain.timetablefestival.TimetableFestival;
 import org.sopt.confeti.domain.timetablefestival.application.TimetableFestivalService;
 import org.sopt.confeti.domain.user.User;
 import org.sopt.confeti.domain.user.application.UserService;
+import org.sopt.confeti.domain.usertimetable.UserTimetable;
+import org.sopt.confeti.domain.usertimetable.application.UserTimetableService;
 import org.sopt.confeti.global.common.CursorPage;
 import org.sopt.confeti.global.exception.ConflictException;
 import org.sopt.confeti.global.exception.NotFoundException;
 import org.sopt.confeti.global.exception.UnauthorizedException;
 import org.sopt.confeti.global.message.ErrorMessage;
 import org.sopt.confeti.global.util.artistsearcher.ArtistResolver;
-import org.sopt.confeti.global.util.artistsearcher.ArtistResolver;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Facade
 @RequiredArgsConstructor
@@ -45,8 +49,8 @@ public class UserTimetableFacade {
     private final FestivalService festivalService;
     private final FestivalDateService festivalDateService;
     private final ArtistResolver artistResolver;
+    private final UserTimetableService userTimetableService;
 
-    @Transactional(readOnly = true)
     public UserTimetableDTO getTimetablesListAndDate(long userId) {
         validateExistUser(userId);
 
@@ -151,10 +155,20 @@ public CursorPage<TimetableToAddDTO> getTimetablesToAdd(final long userId, final
     public UserTimetableFestivalBasicDTO getTimetableInfo(final long userId, final long festivalDateId) {
         validateUserExists(userId);
 
-        FestivalDate festivalDate = festivalDateService.findFestivalDateId(userId, festivalDateId);
+        FestivalDate festivalDate = festivalDateService.findFestivalDateId(festivalDateId);
         artistResolver.load(festivalDate);
 
-        return UserTimetableFestivalBasicDTO.from(festivalDate);
+        List<Long> festivalTimeIds = festivalDate.getStages().stream()
+                .flatMap(festivalStage -> festivalStage.getTimes().stream())
+                .map(FestivalTime::getId)
+                .toList();
+
+        List<UserTimetable> userTimetables = userTimetableService.getUserTimetables(userId, festivalTimeIds);
+
+        Map<Long, UserTimetable> userTimetableMapper = userTimetables.stream()
+                .collect(Collectors.toMap(UserTimetable::getId, Function.identity()));
+
+        return UserTimetableFestivalBasicDTO.of(festivalDate, userTimetableMapper);
     }
 
     @Transactional(readOnly = true)
@@ -171,5 +185,11 @@ public FestivalCursorDTO getFestivalCursor(final long userId, final long cursor)
                         () -> new NotFoundException(ErrorMessage.NOT_FOUND)
                 );
     }
+
+    @Transactional
+    public void patchTimetableFestivals(final long userId, final PatchTimetableDTO timetableDTO) {
+        validateUserExists(userId);
+        userTimetableService.patchTimetableFestival(userId, timetableDTO);
+    }
 }
 

src/main/java/org/sopt/confeti/api/user/facade/dto/request/PatchTimetableDTO.java

@@ -0,0 +1,19 @@
+package org.sopt.confeti.api.user.facade.dto.request;
+
+import org.sopt.confeti.api.user.dto.request.PatchTimetableRequest;
+
+import java.util.List;
+
+public record PatchTimetableDTO (
+        List<PatchTimetableListDTO> userTimetables
+) {
+    public static PatchTimetableDTO from(PatchTimetableRequest timetableRequest) {
+        return new PatchTimetableDTO(
+                timetableRequest.userTimetables()
+                        .stream()
+                        .map(PatchTimetableListDTO::from)
+                        .toList()
+        );
+    }
+}
+