[1 - 3단계 방탈출 사용자 예약] 에버(손채영) 미션 제출합니다.

.gitignore

@@ -1,3 +1,5 @@
+.gitmessage.txt
+
 HELP.md
 .gradle
 build/

README.md

@@ -0,0 +1,28 @@
+## 기능 요구사항
+- [x] 예외 처리
+  - [x] 시간 생성 시 시작 시간에 유효하지 않은 값이 입력되었을 때
+    - null, "", HH:mm이 아닌 경우
+  - [x] 예약 생성 시 예약자명, 날짜, 시간에 유효하지 않은 값이 입력 되었을 때
+    - 예약자명: null, ""
+    - 날짜: null, "", yyyy-MM-dd이 아닌 경우
+    - 시간: null, "", HH:mm이 아닌 경우
+  - [x] 특정 시간에 대한 예약이 존재하는데, 그 시간을 삭제하려 할 때
+  - [x] 존재하지 않는 id를 가진 데이터에 접근하려 할 때
+  - [x] 지나간 날짜와 시간에 대한 예약 생성 불가능
+  - [x] 중복 예약 불가능
+  - [x] 예약 시간 중복 불가능
+
+- [x] '테마' 도메인 추가
+  - [x] 모든 테마는 시작 시간과 소요 시간이 동일
+- [x] 테마 관리 페이지 조회
+- [x] 테마 추가 API
+- [x] 테마 삭제 API
+- [x] 테마 조회 API
+
+- [x] (관리자가 아닌) 사용자가 예약 가능한 시간을 조회하고, 예약할 수 있도록 기능을 추가/변경
+  - [x] 테마와 날짜를 선택하면 예약 가능한 시간 조회
+  - [x] 예약 추가
+  - [X] /reservation 요청 시 사용자 예약 페이지 조회
+- [x] 인기 테마 조회 기능을 추가
+  - [x] 최근 일주일을 기준으로 하여 해당 기간 내에 방문하는 예약이 많은 테마 10개를 확인
+  - [x] / 요청 시 인기 테마 페이지 조회

src/main/java/roomescape/RoomescapeApplication.java

@@ -9,5 +9,4 @@ public class RoomescapeApplication {
     public static void main(String[] args) {
         SpringApplication.run(RoomescapeApplication.class, args);
     }
-
 }

src/main/java/roomescape/controller/ReservationController.java

@@ -0,0 +1,68 @@
+package roomescape.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import roomescape.controller.request.ReservationRequest;
+import roomescape.controller.response.MemberReservationTimeResponse;
+import roomescape.controller.response.ReservationResponse;
+import roomescape.exception.BadRequestException;
+import roomescape.model.Reservation;
+import roomescape.service.ReservationService;
+import roomescape.service.dto.ReservationDto;
+
+import java.net.URI;
+import java.time.LocalDate;
+import java.util.List;
+
+@RestController
+@RequestMapping("/reservations")
+public class ReservationController {
+
+    private final ReservationService reservationService;
+
+    public ReservationController(ReservationService reservationService) {
+        this.reservationService = reservationService;
+    }
+
+    @GetMapping
+    public ResponseEntity<List<ReservationResponse>> showReservations() {
+        List<Reservation> reservations = reservationService.findAllReservations();
+        List<ReservationResponse> response = reservations.stream()
+                .map(ReservationResponse::from)
+                .toList();
+        return ResponseEntity.ok(response);
+    }
+
+    @PostMapping
+    public ResponseEntity<ReservationResponse> addReservation(@RequestBody ReservationRequest request) {
+        ReservationDto reservationDto = ReservationDto.from(request);
+        Reservation reservation = reservationService.saveReservation(reservationDto);
+        ReservationResponse response = ReservationResponse.from(reservation);
+        return ResponseEntity
+                .created(URI.create("/reservations/" + response.getId()))
+                .body(response);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteReservation(@PathVariable("id") Long id) {
+        validateNull(id);
+        reservationService.deleteReservation(id);
+        return ResponseEntity.noContent().build();
+    }
+
+    @GetMapping("/times")
+    public ResponseEntity<List<MemberReservationTimeResponse>> showReservationTimesInformation(
+            @RequestParam(name = "date") LocalDate date,
+            @RequestParam(name = "themeId") Long themeId) {
+        validateNull(themeId);
+        List<MemberReservationTimeResponse> response = reservationService.findReservationTimesInformation(date, themeId);
+        // TODO: 여기서 response 객체로 반환하도록 수정
+        return ResponseEntity.ok(response);
+    }
+
+    private void validateNull(Long value) {
+        if (value == null) {
+            throw new BadRequestException("[ERROR] 요청된 데이터에 null 혹은 비어있는 값이 존재합니다.");
+        }
+    }
+}

src/main/java/roomescape/controller/ReservationTimeController.java

@@ -0,0 +1,56 @@
+package roomescape.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import roomescape.controller.request.ReservationTimeRequest;
+import roomescape.controller.response.ReservationTimeResponse;
+import roomescape.exception.BadRequestException;
+import roomescape.model.ReservationTime;
+import roomescape.service.ReservationTimeService;
+import roomescape.service.dto.ReservationTimeDto;
+
+import java.net.URI;
+import java.util.List;
+
+@RestController
+@RequestMapping("/times")
+public class ReservationTimeController {
+
+    private final ReservationTimeService reservationTimeService;
+
+    public ReservationTimeController(ReservationTimeService reservationTimeService) {
+        this.reservationTimeService = reservationTimeService;
+    }
+
+    @GetMapping
+    public ResponseEntity<List<ReservationTimeResponse>> showReservationTimes() {
+        List<ReservationTime> times = reservationTimeService.findAllReservationTimes();
+        List<ReservationTimeResponse> response = times.stream()
+                .map(ReservationTimeResponse::from)
+                .toList();
+        return ResponseEntity.ok(response);
+    }
+
+    @PostMapping
+    public ResponseEntity<ReservationTimeResponse> addReservationTime(@RequestBody ReservationTimeRequest request) {
+        ReservationTimeDto timeDto = ReservationTimeDto.from(request);
+        ReservationTime time = reservationTimeService.saveReservationTime(timeDto);
+        ReservationTimeResponse response = ReservationTimeResponse.from(time);
+        return ResponseEntity
+                .created(URI.create("/times/" + response.getId()))
+                .body(response);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteReservationTime(@PathVariable("id") Long id) {
+        validateNull(id);
+        reservationTimeService.deleteReservationTime(id);
+        return ResponseEntity.noContent().build();
+    }
+
+    private void validateNull(Long value) {
+        if (value == null) {
+            throw new BadRequestException("[ERROR] 요청된 데이터에 null 혹은 비어있는 값이 존재합니다.");
+        }
+    }
+}

src/main/java/roomescape/controller/StaticAdminPageController.java

@@ -0,0 +1,29 @@
+package roomescape.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/admin")
+public class StaticAdminPageController {
+    @GetMapping
+    public String getAdminPage() {
+        return "admin/index";
+    }
+
+    @GetMapping("/reservation")
+    public String getReservationPage() {
+        return "admin/reservation-new";
+    }
+
+    @GetMapping("/time")
+    public String getReservationTimePage() {
+        return "admin/time";
+    }
+
+    @GetMapping("/theme")
+    public String getThemePage() {
+        return "admin/theme";
+    }
+}

src/main/java/roomescape/controller/StaticUserPageController.java

@@ -0,0 +1,18 @@
+package roomescape.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class StaticUserPageController {
+
+    @GetMapping
+    public String getHome() {
+        return "index";
+    }
+
+    @GetMapping("/reservation")
+    public String getReservation() {
+        return "reservation";
+    }
+}

src/main/java/roomescape/controller/ThemeController.java

@@ -0,0 +1,65 @@
+package roomescape.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import roomescape.controller.request.ThemeRequest;
+import roomescape.controller.response.ThemeResponse;
+import roomescape.exception.BadRequestException;
+import roomescape.model.Theme;
+import roomescape.service.ThemeService;
+import roomescape.service.dto.ThemeDto;
+
+import java.net.URI;
+import java.util.List;
+
+@RestController
+@RequestMapping("/themes")
+public class ThemeController {
+
+    private final ThemeService themeService;
+
+    public ThemeController(ThemeService themeService) {
+        this.themeService = themeService;
+    }
+
+    @GetMapping
+    public ResponseEntity<List<ThemeResponse>> showThemes() {
+        List<Theme> themes = themeService.findAllThemes();
+        List<ThemeResponse> response = themes.stream()
+                .map(ThemeResponse::from)
+                .toList();
+        return ResponseEntity.ok(response);
+    }
+
+    @PostMapping
+    public ResponseEntity<ThemeResponse> addTheme(@RequestBody ThemeRequest request) {
+        ThemeDto themeDto = ThemeDto.from(request);
+        Theme theme = themeService.saveTheme(themeDto);
+        ThemeResponse response = ThemeResponse.from(theme);
+        return ResponseEntity
+                .created(URI.create("/themes/" + response.getId()))
+                .body(response);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteTheme(@PathVariable("id") Long id) {
+        validateNull(id);
+        themeService.deleteTheme(id);
+        return ResponseEntity.noContent().build();
+    }
+
+    @GetMapping("/rank")
+    public ResponseEntity<List<ThemeResponse>> showPopularThemes() {
+        List<Theme> themes = themeService.findPopularThemes();
+        List<ThemeResponse> response = themes.stream()
+                .map(ThemeResponse::from)
+                .toList();
+        return ResponseEntity.ok(response);
+    }
+
+    private void validateNull(Long value) {
+        if (value == null) {
+            throw new BadRequestException("[ERROR] 요청된 데이터에 null 혹은 비어있는 값이 존재합니다.");
+        }
+    }
+}

src/main/java/roomescape/controller/request/ReservationRequest.java

@@ -0,0 +1,56 @@
+package roomescape.controller.request;
+
+import roomescape.exception.BadRequestException;
+
+import java.time.LocalDate;
+
+public class ReservationRequest {
+
+    private final String name;
+    private final LocalDate date;
+    private final long timeId;
+    private final long themeId;
+
+    public ReservationRequest(String name, LocalDate date, Long timeId, Long themeId) {
+        validate(name, date, timeId, themeId);
+        this.name = name;
+        this.date = date;
+        this.timeId = timeId;
+        this.themeId = themeId;
+    }
+
+    private void validate(String name, LocalDate date, Long timeId, Long themeId) {
+        validateName(name);
+        validateNull(date);
+        validateNull(timeId);
+        validateNull(themeId);
+    }
+
+    private void validateNull(Object value) {
+        if (value == null) {
+            throw new BadRequestException("[ERROR] 요청된 데이터에 null 혹은 비어있는 값이 존재합니다.");
+        }
+    }
+
+    private void validateName(String name) {
+        if (name == null || name.isBlank()) {
+            throw new BadRequestException("[ERROR] 요청된 데이터에 null 혹은 비어있는 값이 존재합니다.");
+        }
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public long getTimeId() {
+        return timeId;
+    }
+
+    public long getThemeId() {
+        return themeId;
+    }
+}

src/main/java/roomescape/controller/request/ReservationTimeRequest.java

@@ -0,0 +1,28 @@
+package roomescape.controller.request;
+
+import roomescape.exception.BadRequestException;
+
+import java.time.LocalTime;
+
+public class ReservationTimeRequest {
+
+    private LocalTime startAt;
+
+    public ReservationTimeRequest(LocalTime startAt) {
+        validateNull(startAt);
+        this.startAt = startAt;
+    }
+
+    private ReservationTimeRequest() {
+    }
+
+    private void validateNull(LocalTime startAt) {
+        if (startAt == null) {
+            throw new BadRequestException("[ERROR] 요청된 데이터에 null 혹은 비어있는 값이 존재합니다.");
+        }
+    }
+
+    public LocalTime getStartAt() {
+        return startAt;
+    }
+}