Feature/2단계 예외처리및리팩터링

build.gradle

@@ -17,6 +17,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     runtimeOnly 'com.h2database:h2'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'

src/main/java/roomescape/controller/AdminPageController.java

@@ -0,0 +1,24 @@
+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 AdminPageController {
+    @GetMapping("/reservation")
+    public String reservation() {
+        return "/admin/reservation-new";
+    }
+
+    @GetMapping("/time")
+    public String time() {
+        return "/admin/time";
+    }
+
+    @GetMapping("/theme")
+    public String theme() {
+        return "/admin/theme";
+    }
+}

src/main/java/roomescape/controller/PageController.java

@@ -9,15 +9,4 @@ public class PageController {
     public String home() {
         return "/admin/index";
     }
-
-    @GetMapping("/admin/reservation")
-    public String reservation() {
-        return "/admin/reservation";
-    }
-
-    @GetMapping("/admin/time")
-    public String time() {
-        return "/admin/time";
-    }
-
 }

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

@@ -1,11 +1,13 @@
 package roomescape.controller;
 
+import jakarta.validation.Valid;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import roomescape.dto.ReservationRq;
 import roomescape.dto.ReservationRs;
 import roomescape.service.ReservationService;
 
+import java.net.URI;
 import java.util.List;
 
 @RestController
@@ -17,25 +19,21 @@ public ReservationController(ReservationService reservationService) {
         this.reservationService = reservationService;
     }
 
-    // 예약 조회
     @GetMapping
     public ResponseEntity<List<ReservationRs>> getReservations() {
         List<ReservationRs> reservations = reservationService.getAllReservations();
         return ResponseEntity.ok().body(reservations);
     }
 
-    // 예약 추가
     @PostMapping
-    public ResponseEntity<ReservationRs> addReservation(@RequestBody ReservationRq reservationRq) {
+    public ResponseEntity<ReservationRs> addReservation(@RequestBody @Valid ReservationRq reservationRq) {
         ReservationRs reservationRs = reservationService.addReservation(reservationRq);
-        return ResponseEntity.ok().body(reservationRs);
+        return ResponseEntity.created(URI.create("/reservations/" + reservationRs.getId())).body(reservationRs);
     }
 
-    // 예약 취소
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
         reservationService.deleteReservation(id);
-        return ResponseEntity.ok().build();
+        return ResponseEntity.noContent().build();
     }
-
 }

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

@@ -6,6 +6,7 @@
 import roomescape.dto.ReservationTimeRs;
 import roomescape.service.ReservationTimeService;
 
+import java.net.URI;
 import java.util.List;
 
 @RestController
@@ -28,14 +29,14 @@ public ResponseEntity<List<ReservationTimeRs>> getReservationTimes() {
     @PostMapping
     public ResponseEntity<ReservationTimeRs> addReservationTime(@RequestBody ReservationTimeRq reservationTimeRq) {
         ReservationTimeRs reservationTimeRs = reservationTimeService.addReservationTime(reservationTimeRq);
-        return ResponseEntity.ok().body(reservationTimeRs);
+        return ResponseEntity.created(URI.create("/times/" + reservationTimeRs.getId())).body(reservationTimeRs);
     }
 
     // 시간 삭제
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteReservationTime(@PathVariable Long id) {
         reservationTimeService.deleteReservationTime(id);
-        return ResponseEntity.ok().build();
+        return ResponseEntity.noContent().build();
     }
 
 }

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

@@ -0,0 +1,42 @@
+package roomescape.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import roomescape.dto.ThemeRq;
+import roomescape.dto.ThemeRs;
+import roomescape.service.ThemeService;
+
+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<ThemeRs>> getThemes() {
+        List<ThemeRs> themes = themeService.getAllThemes();
+        return ResponseEntity.ok().body(themes);
+    }
+
+    // 테마 추가
+    @PostMapping
+    public ResponseEntity<ThemeRs> addTheme(@RequestBody ThemeRq themeRq) {
+        ThemeRs themeRs = themeService.addTheme(themeRq);
+        return ResponseEntity.created(URI.create("/themes/" + themeRs.getId())).body(themeRs);
+    }
+
+    // 테마 삭제
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteTheme(@PathVariable Long id) {
+        themeService.deleteTheme(id);
+        return ResponseEntity.noContent().build();
+    }
+
+}

src/main/java/roomescape/dto/ReservationRq.java

@@ -1,16 +1,32 @@
 package roomescape.dto;
 
+import java.time.LocalDate;
+
+import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
 public class ReservationRq {
+    @NotEmpty(message = "Reservation name must not be empty")
     private String name;
-    private String date;
+
+    @NotNull(message = "Reservation date must not be null")
+    @Future(message = "Reservation date must be in the future")
+    private LocalDate date;
+
+    @NotNull(message = "Reservation time ID must not be null")
     private Long timeId;
 
+    @NotNull(message = "Theme ID must not be null")
+    private Long themeId;
+
     public ReservationRq() {}
 
-    public ReservationRq(String name, String date, Long timeId) {
+    public ReservationRq(String name, LocalDate date, Long timeId, Long themeId) {
         this.name = name;
         this.date = date;
         this.timeId = timeId;
+        this.themeId = themeId;
     }
 
     public String getName() {
@@ -21,11 +37,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public String getDate() {
+    public LocalDate getDate() {
         return date;
     }
 
-    public void setDate(String date) {
+    public void setDate(LocalDate date) {
         this.date = date;
     }
 
@@ -36,4 +52,12 @@ public Long getTimeId() {
     public void setTimeId(Long timeId) {
         this.timeId = timeId;
     }
+
+    public Long getThemeId() {
+        return themeId;
+    }
+
+    public void setThemeId(Long themeId) {
+        this.themeId = themeId;
+    }
 }

src/main/java/roomescape/dto/ReservationRs.java

@@ -1,20 +1,25 @@
 package roomescape.dto;
 
 import roomescape.model.ReservationTime;
+import roomescape.model.Theme;
+
+import java.time.LocalDate;
 
 public class ReservationRs {
     private Long id;
     private String name;
-    private String date;
+    private LocalDate date;
     private ReservationTime time;
+    private Theme theme;
 
     public ReservationRs() {}
 
-    public ReservationRs(Long id, String name, String date, ReservationTime time) {
+    public ReservationRs(Long id, String name, LocalDate date, ReservationTime time, Theme theme) {
         this.id = id;
         this.name = name;
         this.date = date;
         this.time = time;
+        this.theme = theme;
     }
 
     public Long getId() {
@@ -33,11 +38,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public String getDate() {
+    public LocalDate getDate() {
         return date;
     }
 
-    public void setDate(String date) {
+    public void setDate(LocalDate date) {
         this.date = date;
     }
 
@@ -48,4 +53,12 @@ public ReservationTime getTime() {
     public void setTime(ReservationTime time) {
         this.time = time;
     }
+
+    public Theme getTheme() {
+        return theme;
+    }
+
+    public void setTheme(Theme theme) {
+        this.theme = theme;
+    }
 }

src/main/java/roomescape/dto/ReservationTimeRq.java

@@ -1,19 +1,21 @@
 package roomescape.dto;
 
+import java.time.LocalTime;
+
 public class ReservationTimeRq {
-    private String startAt;
+    private LocalTime startAt;
 
     public ReservationTimeRq() {}
 
-    public ReservationTimeRq(String startAt) {
+    public ReservationTimeRq(LocalTime startAt) {
         this.startAt = startAt;
     }
 
-    public String getStartAt() {
+    public LocalTime getStartAt() {
         return startAt;
     }
 
-    public void setStartAt(String startAt) {
+    public void setStartAt(LocalTime startAt) {
         this.startAt = startAt;
     }
 }

src/main/java/roomescape/dto/ReservationTimeRs.java

@@ -1,12 +1,14 @@
 package roomescape.dto;
 
+import java.time.LocalTime;
+
 public class ReservationTimeRs {
     private Long id;
-    private String startAt;
+    private LocalTime startAt;
 
     public ReservationTimeRs() {}
 
-    public ReservationTimeRs(Long id, String startAt) {
+    public ReservationTimeRs(Long id, LocalTime startAt) {
         this.id = id;
         this.startAt = startAt;
     }
@@ -19,11 +21,11 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    public String getStartAt() {
+    public LocalTime getStartAt() {
         return startAt;
     }
 
-    public void setStartAt(String startAt) {
+    public void setStartAt(LocalTime startAt) {
         this.startAt = startAt;
     }
 }