fix: 공백 탭으로 변경

server/src/main/java/com/ticketing/server/global/exception/ErrorCode.java

@@ -28,11 +28,13 @@ public enum ErrorCode {
 	MOVIE_NOT_FOUND(NOT_FOUND, "해당 제목의 영화를 찾을 수 없습니다."),
 	REFRESH_TOKEN_NOT_FOUND(NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
 	PAYMENT_ID_NOT_FOUND(NOT_FOUND, "결제정보를 찾을 수 없습니다."),
+	THEATER_NOT_FOUND(NOT_FOUND, "상영관 정보를 찾을 수 없습니다."),
 
 	/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
 	DUPLICATE_EMAIL(CONFLICT, "이메일이 이미 존재합니다."),
 	DUPLICATE_PAYMENT(CONFLICT, "해당 좌석은 현재 판매된 좌석입니다."),
 	DUPLICATE_MOVIE(CONFLICT, "해당 영화 정보가 이미 존재합니다."),
+	DUPLICATE_MOVIE_TIME(CONFLICT, "해당 영화 시간표 정보가 이미 존재합니다."),
 	DELETED_EMAIL(CONFLICT, "이미 삭제된 이메일 입니다."),
 	DELETED_MOVIE(CONFLICT, "이미 삭제된 영화 입니다.");
 
@@ -82,6 +84,10 @@ public enum ErrorCode {
 		throw new TicketingException(PAYMENT_ID_NOT_FOUND);
 	}
 
+	public static TicketingException throwTheaterNotFound() {
+		throw new TicketingException(THEATER_NOT_FOUND);
+	}
+
 	/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
 	public static TicketingException throwDuplicateEmail() {
 		throw new TicketingException(DUPLICATE_EMAIL);
@@ -95,6 +101,10 @@ public enum ErrorCode {
 		throw new TicketingException(DUPLICATE_MOVIE);
 	}
 
+	public static TicketingException throwDuplicateMovieTime() {
+		throw new TicketingException(DUPLICATE_MOVIE_TIME);
+	}
+
 	public static TicketingException throwDeletedEmail() {
 		throw new TicketingException(DELETED_EMAIL);
 	}

server/src/main/java/com/ticketing/server/movie/application/MovieTimeController.java

@@ -1,18 +1,29 @@
 package com.ticketing.server.movie.application;
 
+import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
+
+import com.ticketing.server.movie.application.request.MovieTimeRegisterRequest;
+import com.ticketing.server.movie.application.response.MovieTimeInfoResponse;
 import com.ticketing.server.movie.application.response.MovieTimeListResponse;
+import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
+import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
 import com.ticketing.server.movie.service.interfaces.MovieTimeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import java.time.LocalDate;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,16 +35,35 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class MovieTimeController {
 
-    private final MovieTimeService movieTimeService;
+	private final MovieTimeService movieTimeService;
 
-    @GetMapping
-    @ApiOperation(value = "영화 시간표 조회")
-    @Validated
-    public ResponseEntity<MovieTimeListResponse> getMovieTimes(
-        @ApiParam(value = "영화 제목", required = true) @RequestParam String title,
-        @ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
-        return ResponseEntity.status(HttpStatus.OK).body(MovieTimeListResponse.from(movieTimeService.getMovieTimes(title, runningDate)));
-    }
+	@PostMapping
+	@ApiOperation(value = "영화 시간표 등록")
+	@Secured(STAFF)
+	public ResponseEntity<MovieTimeInfoResponse> registerMovieTime(
+		@RequestBody @Valid MovieTimeRegisterRequest movieTimeRegisterRequest) {
+		RegisteredMovieTimeDTO registeredMovieTimeDto = movieTimeService.registerMovieTime(
+			movieTimeRegisterRequest.toMovieTimeRegisterDTO()
+		);
 
+		return ResponseEntity.status(HttpStatus.OK)
+			.body(
+				registeredMovieTimeDto.toResponse()
+			);
+	}
+
+	@GetMapping
+	@ApiOperation(value = "영화 시간표 조회")
+	@Validated
+	public ResponseEntity<MovieTimeListResponse> getMovieTimes(
+		@ApiParam(value = "영화 ID", required = true) @RequestParam @NotNull Long movieId,
+		@ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
+		MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(movieId, runningDate);
+
+		return ResponseEntity.status(HttpStatus.OK)
+			.body(
+				movieTimeListDto.toResponse()
+			);
+	}
 
 }

server/src/main/java/com/ticketing/server/movie/application/request/MovieRegisterRequest.java

@@ -5,10 +5,8 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor
 @AllArgsConstructor
 public class MovieRegisterRequest {
 
@@ -19,7 +17,7 @@ public class MovieRegisterRequest {
 	private Long runningTime;
 
 	public MovieRegisterDTO toMovieRegisterDTO() {
-		return new MovieRegisterDTO(this.title, this.runningTime);
+		return new MovieRegisterDTO(title, runningTime);
 	}
 
 }

server/src/main/java/com/ticketing/server/movie/application/request/MovieTimeRegisterRequest.java

@@ -0,0 +1,29 @@
+package com.ticketing.server.movie.application.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
+import java.time.LocalDateTime;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class MovieTimeRegisterRequest {
+
+	@NotNull(message = "{validation.not.null.movieId}")
+	private Long movieId;
+
+	@NotNull(message = "{validation.not.null.theaterNumber}")
+	private Integer theaterNumber;
+
+	@NotNull(message = "{validation.not.null.round}")
+	private Integer round;
+
+	private LocalDateTime startAt;
+
+	public MovieTimeRegisterDTO toMovieTimeRegisterDTO() {
+		return new MovieTimeRegisterDTO(movieId, theaterNumber, round, startAt);
+	}
+
+}

server/src/main/java/com/ticketing/server/movie/application/response/MovieTimeInfoResponse.java

@@ -0,0 +1,28 @@
+package com.ticketing.server.movie.application.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class MovieTimeInfoResponse {
+
+	@ApiModelProperty(value = "영화 시간표 ID")
+	private Long movieTimeId;
+
+	@ApiModelProperty(value = "상영관 번호")
+	private Integer theaterNumber;
+
+	@ApiModelProperty(value = "회차")
+	private Integer round;
+
+	@ApiModelProperty(value = "시작 시간")
+	private LocalDateTime startAt;
+
+	@ApiModelProperty(value = "종료 시간")
+	private LocalDateTime endAt;
+
+
+}

server/src/main/java/com/ticketing/server/movie/application/response/MovieTimeListResponse.java

@@ -8,14 +8,10 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor
 public class MovieTimeListResponse {
 
     @ApiModelProperty(value = "영화 시간표 정보")
-    private List<MovieTimeDTO> movieTimeDTOS;
-
-    public static MovieTimeListResponse from(List<MovieTimeDTO> movieTimeDtos) {
-        return new MovieTimeListResponse(movieTimeDtos);
-    }
+    private List<MovieTimeDTO> movieTimeDtos;
 
 }

server/src/main/java/com/ticketing/server/movie/domain/MovieTime.java

@@ -1,6 +1,8 @@
 package com.ticketing.server.movie.domain;
 
+
 import com.ticketing.server.global.dto.repository.AbstractEntity;
+import com.ticketing.server.movie.service.dto.MovieTimeDTO;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -72,4 +74,9 @@ public class MovieTime extends AbstractEntity {
 		return this.theater.getSeats();
 	}
 
+	public MovieTimeDTO toMovieTimeDTO() {
+		return new MovieTimeDTO(
+			this.id, this.theater.getTheaterNumber(), this.round, this.startAt, this.endAt);
+	}
+
 }

server/src/main/java/com/ticketing/server/movie/domain/repository/MovieTimeRepository.java

@@ -2,8 +2,10 @@ package com.ticketing.server.movie.domain.repository;
 
 import com.ticketing.server.movie.domain.Movie;
 import com.ticketing.server.movie.domain.MovieTime;
+import com.ticketing.server.movie.domain.Theater;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -11,11 +13,13 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface MovieTimeRepository extends JpaRepository<MovieTime, Long> {
 
-    @Query(value = "SELECT mt "
-        + "FROM MovieTime mt "
-        + "JOIN FETCH mt.movie "
-        + "WHERE mt.movie = :movie "
-        + "AND mt.startAt BETWEEN :startOfDay AND :endOfDay ")
-    List<MovieTime> findValidMovieTimes(Movie movie, LocalDateTime startOfDay, LocalDateTime endOfDay);
+	Optional<MovieTime> findByMovieAndTheaterAndRoundAndDeletedAtNull(Movie movie, Theater theater, Integer round);
+
+	@Query(value = "SELECT mt "
+		+ "FROM MovieTime mt " 
+		+ "JOIN FETCH mt.movie "
+		+ "WHERE mt.movie = :movie "
+		+ "AND mt.startAt BETWEEN :startOfDay AND :endOfDay ")
+	List<MovieTime> findValidMovieTimes(Movie movie, LocalDateTime startOfDay, LocalDateTime endOfDay);
 
 }

server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java

@@ -3,14 +3,22 @@ package com.ticketing.server.movie.service;
 import com.ticketing.server.global.exception.ErrorCode;
 import com.ticketing.server.movie.domain.Movie;
 import com.ticketing.server.movie.domain.MovieTime;
+import com.ticketing.server.movie.domain.Theater;
 import com.ticketing.server.movie.domain.repository.MovieRepository;
 import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
+import com.ticketing.server.movie.domain.repository.TheaterRepository;
 import com.ticketing.server.movie.service.dto.MovieTimeDTO;
+import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
+import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
+import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
+import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
 import com.ticketing.server.movie.service.interfaces.MovieTimeService;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
+import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -22,22 +30,60 @@ public class MovieTimeServiceImpl implements MovieTimeService {
 
 	private final MovieRepository movieRepository;
 
+	private final TheaterRepository theaterRepository;
+
 	private final MovieTimeRepository movieTimeRepository;
 
 	@Override
-	public List<MovieTimeDTO> getMovieTimes(String title, LocalDate runningDate) {
-		Movie movie = movieRepository.findByTitle(title)
-			.orElseThrow(ErrorCode::throwMovieNotFound);
+	public RegisteredMovieTimeDTO registerMovieTime(@Valid MovieTimeRegisterDTO movieTimeRegisterDto) {
+		Movie movie = findMovieById(movieTimeRegisterDto.getMovieId());
+		Theater theater = findTheaterByNumber(movieTimeRegisterDto.getTheaterNumber());
+		int round = movieTimeRegisterDto.getRound();
+
+		Optional<MovieTime> movieTime =
+			movieTimeRepository.findByMovieAndTheaterAndRoundAndDeletedAtNull(movie, theater, round);
+
+		if(movieTime.isEmpty()) {
+			MovieTime newMovieTime = movieTimeRepository.save(
+				new MovieTime(movie, theater, round, movieTimeRegisterDto.getStartAt())
+			);
+
+			return new RegisteredMovieTimeDTO(newMovieTime);
+		}
+
+		throw ErrorCode.throwDuplicateMovieTime();
+	}
+
+	@Override
+	public MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate) {
+		Movie movie = findMovieById(movieId);
 
 		LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
 		LocalDateTime endOfDay = startOfDay.plusDays(1);
 
 		List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
 
-		return movieTimes.stream()
-			.map(MovieTimeDTO::from)
+		List<MovieTimeDTO> movieTimeDtos = movieTimes.stream()
+			.map(movieTime -> movieTime.toMovieTimeDTO())
 			.collect(Collectors.toList());
 
+		return new MovieTimeListDTO(movieTimeDtos);
+	}
+
+	@Override
+	public Movie findMovieById(Long movieId) {
+		Movie movie = movieRepository.findByIdAndDeletedAtNull(movieId)
+			.orElseThrow(ErrorCode::throwMovieNotFound);
+
+		return movie;
+	}
+
+	@Override
+	public Theater findTheaterByNumber(Integer theaterNumber) {
+		Theater theater = theaterRepository.findByTheaterNumber(theaterNumber)
+			.orElseThrow(ErrorCode::throwTheaterNotFound);
+
+		return theater;
 	}
 
 }

server/src/main/java/com/ticketing/server/movie/service/dto/MovieListDTO.java

@@ -6,7 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor()
+@AllArgsConstructor
 public class MovieListDTO {
 
 	private final List<MovieDTO> movieDtos;

server/src/main/java/com/ticketing/server/movie/service/dto/MovieRegisterDTO.java

@@ -21,4 +21,5 @@ public class MovieRegisterDTO {
 	public Movie toMovie() {
 		return new Movie(this.title, this.runningTime);
 	}
+
 }

server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeDTO.java

@@ -1,13 +1,11 @@
 package com.ticketing.server.movie.service.dto;
 
-import com.ticketing.server.movie.domain.MovieTime;
 import java.time.LocalDateTime;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor
 public class MovieTimeDTO {
 
     private Long movieTimeId;
@@ -20,9 +18,4 @@ public class MovieTimeDTO {
 
     private LocalDateTime endAt;
 
-    public static MovieTimeDTO from(MovieTime movieTime) {
-        return new MovieTimeDTO(movieTime.getId(), movieTime.getTheater().getTheaterNumber(),
-            movieTime.getRound(), movieTime.getStartAt(), movieTime.getEndAt());
-    }
-
 }

server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeListDTO.java

@@ -0,0 +1,18 @@
+package com.ticketing.server.movie.service.dto;
+
+import com.ticketing.server.movie.application.response.MovieTimeListResponse;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class MovieTimeListDTO {
+
+	private final List<MovieTimeDTO> movieTimeDtos;
+
+	public MovieTimeListResponse toResponse() {
+		return new MovieTimeListResponse(movieTimeDtos);
+	}
+
+}

server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeRegisterDTO.java

@@ -0,0 +1,25 @@
+package com.ticketing.server.movie.service.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class MovieTimeRegisterDTO {
+
+	@NotNull(message = "{validation.not.null.movieId}")
+	private Long movieId;
+
+	@NotNull(message = "{validation.not.null.theaterNumber}")
+	private Integer theaterNumber;
+
+	@NotNull(message = "{validation.not.null.round}")
+	private Integer round;
+
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul")
+	private LocalDateTime startAt;
+
+}

server/src/main/java/com/ticketing/server/movie/service/dto/RegisteredMovieTimeDTO.java

@@ -0,0 +1,38 @@
+package com.ticketing.server.movie.service.dto;
+
+import com.ticketing.server.movie.application.response.MovieTimeInfoResponse;
+import com.ticketing.server.movie.domain.MovieTime;
+import java.time.LocalDateTime;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class RegisteredMovieTimeDTO {
+
+	private final Long movieTimeId;
+
+	private final Integer theaterNumber;
+
+	private final Integer round;
+
+	private final LocalDateTime startAt;
+
+	private final LocalDateTime endAt;
+
+	public RegisteredMovieTimeDTO(MovieTime movieTime) {
+		this(
+			movieTime.getId(),
+			movieTime.getTheater().getTheaterNumber(),
+			movieTime.getRound(),
+			movieTime.getStartAt(),
+			movieTime.getEndAt()
+		);
+	}
+
+	public MovieTimeInfoResponse toResponse() {
+		return new MovieTimeInfoResponse(movieTimeId, theaterNumber, round, startAt, endAt);
+	}
+
+}

server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java

@@ -1,11 +1,21 @@
 package com.ticketing.server.movie.service.interfaces;
 
-import com.ticketing.server.movie.service.dto.MovieTimeDTO;
+import com.ticketing.server.movie.domain.Movie;
+import com.ticketing.server.movie.domain.Theater;
+import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
+import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
+import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
 import java.time.LocalDate;
-import java.util.List;
+import javax.validation.Valid;
 
 public interface MovieTimeService {
 
-    List<MovieTimeDTO> getMovieTimes(String title, LocalDate runningDate);
+	RegisteredMovieTimeDTO registerMovieTime(@Valid MovieTimeRegisterDTO movieTimeRegisterDto);
+
+	MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate);
+
+	Movie findMovieById(Long movieId);
+
+	Theater findTheaterByNumber(Integer theaterNumber);
 
 }

server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java

@@ -9,7 +9,7 @@ import com.ticketing.server.movie.domain.MovieTime;
 import com.ticketing.server.movie.domain.Theater;
 import com.ticketing.server.movie.domain.repository.MovieRepository;
 import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
-import com.ticketing.server.movie.service.dto.MovieTimeDTO;
+import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -39,26 +39,26 @@ public class MovieTimeServiceImplTest {
     MovieTimeServiceImpl movieTimeService;
 
     @Test
-    @DisplayName("MovieTime Service Test - get empty list when there is no valid movie times")
+    @DisplayName("MovieTime Service Test - get empty list when there are no valid movie times")
     void shouldGetEmptyList() {
         // given
         Movie movie = new Movie(title, 106L);
 
-        when(movieRepository.findByTitle(title))
+        when(movieRepository.findByIdAndDeletedAtNull(any()))
             .thenReturn(Optional.of(movie));
 
         when(movieTimeRepository.findValidMovieTimes(any(), any(), any()))
             .thenReturn(Collections.emptyList());
 
         // when
-        List<MovieTimeDTO> movieTimeDTOList = movieTimeService.getMovieTimes(title, LocalDate.now());
+        MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(any(), LocalDate.now());
 
         // then
-        assertTrue(movieTimeDTOList.isEmpty());
+        assertTrue(movieTimeListDto.getMovieTimeDtos().isEmpty());
     }
 
     @Test
-    @DisplayName("MovieTime Service Test - get list when there is valid movie times")
+    @DisplayName("MovieTime Service Test - get list when there are valid movie times")
     void shouldGetMovieTimeList() {
         // given
         Movie movie = new Movie(title, 106L);
@@ -69,17 +69,17 @@ public class MovieTimeServiceImplTest {
 
         movieTimes.add(movieTime);
 
-        when(movieRepository.findByTitle(title))
+        when(movieRepository.findByIdAndDeletedAtNull(any()))
             .thenReturn(Optional.of(movie));
 
         when(movieTimeRepository.findValidMovieTimes(any(), any(), any()))
             .thenReturn(movieTimes);
 
         // when
-        List<MovieTimeDTO> movieTimeDTOList = movieTimeService.getMovieTimes(title, LocalDate.of(2022, 07, 01));
+	    MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(any(), LocalDate.of(2022, 07, 01));
 
         // then
-        assertTrue(!movieTimeDTOList.isEmpty());
+        assertTrue(!movieTimeListDto.getMovieTimeDtos().isEmpty());
     }
 
 }