[Spring Core] 정민주 미션 제출합니다.

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

@@ -1,53 +1,50 @@
 package roomescape.controller;
 
-import jakarta.transaction.Transactional;
 import java.net.URI;
 import java.util.List;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import roomescape.entity.Dto.ReservationInDto;
 import roomescape.entity.Reservation;
-import roomescape.entity.repository.ReservationRepository;
-import roomescape.exception.NotFoundException;
 import roomescape.exception.ReservationException;
+import roomescape.service.ReservationService;
 
 @RestController
+@RequestMapping("/reservations")
 public class ReservationController {
 
-    private final ReservationRepository reservationRepository;
+    private final ReservationService reservationService;
 
-    public ReservationController(ReservationRepository reservationRepository) {
-        this.reservationRepository = reservationRepository;
+    public ReservationController(ReservationService reservationService) {
+        this.reservationService = reservationService;
     }
 
-    @GetMapping("/reservations")
+    @GetMapping
     public List<Reservation> getReservations() {
-        return reservationRepository.findAll();
+        return reservationService.findAllReservations();
     }
 
     @Transactional
-    @PostMapping("/reservations")
-    public ResponseEntity<Reservation> createReservation(@RequestBody Reservation reservation) {
-        final Reservation save = reservationRepository.save(reservation);
-        URI location = URI.create("/reservations/" + save.getId());
-        return ResponseEntity.created(location).body(save);
+    @PostMapping
+    public ResponseEntity<Reservation> createReservation(@RequestBody ReservationInDto reservationInDto) {
+        final Reservation reservation = reservationService.saveReservation(reservationInDto);
+        URI location = URI.create("/reservations/" + reservation.getId());
+        return ResponseEntity.created(location).body(reservation);
     }
 
     @Transactional
-    @DeleteMapping("/reservations/{id}")
+    @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
-        final int countOfDeleted = reservationRepository.deleteById(id);
-
-        if (countOfDeleted <= 0) {
-            throw new NotFoundException("해당 id를 가진 예약을 찾을 수 없습니다.");
-        }
-
+        reservationService.deleteReservationById(id);
         return ResponseEntity.noContent().build();
     }
 

src/main/java/roomescape/controller/RoomEscapeController.java

@@ -13,6 +13,11 @@ public String home() {
 
     @GetMapping("/reservation")
     public String reservation() {
-        return "reservation";
+        return "new-reservation";
+    }
+
+    @GetMapping("/time")
+    public String time() {
+        return "time";
     }
 }

src/main/java/roomescape/controller/TimeController.java

@@ -0,0 +1,48 @@
+package roomescape.controller;
+
+import java.net.URI;
+import java.util.List;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import roomescape.entity.Dto.TimeInDto;
+import roomescape.entity.value.Time;
+import roomescape.service.ReservationService;
+
+@RestController
+@RequestMapping("/times")
+public class TimeController {
+
+    private final ReservationService reservationService;
+
+    public TimeController(ReservationService reservationService) {
+        this.reservationService = reservationService;
+    }
+
+    @GetMapping
+    public List<Time> getTimes() {
+        return reservationService.findAllTimes();
+    }
+
+    @Transactional
+    @PostMapping
+    public ResponseEntity<Time> createTime(@RequestBody TimeInDto timeInDto) {
+        final Time time = reservationService.saveTime(timeInDto);
+        URI location = URI.create("/times/" + time.getId());
+        return ResponseEntity.created(location).body(time);
+    }
+
+    @Transactional
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
+        reservationService.deleteTimeById(id);
+        return ResponseEntity.noContent().build();
+    }
+
+}

src/main/java/roomescape/entity/Dto/ReservationInDto.java

@@ -0,0 +1,26 @@
+package roomescape.entity.Dto;
+
+public class ReservationInDto {
+
+    private String name;
+    private String date;
+    private Long time;
+
+    public ReservationInDto(String name, String date, Long time) {
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public Long getTimeId() {
+        return time;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+}

src/main/java/roomescape/entity/Dto/ReservationOutDto.java

@@ -0,0 +1,33 @@
+package roomescape.entity.Dto;
+
+public class ReservationOutDto {
+
+    private Long id;
+
+    private String name;
+    private String date;
+    private Long timeId;
+
+    public ReservationOutDto(Long id, String name, String date, Long timeId) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.timeId = timeId;
+    }
+
+    public Long getTimeId() {
+        return timeId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+}

src/main/java/roomescape/entity/Dto/TimeInDto.java

@@ -0,0 +1,19 @@
+package roomescape.entity.Dto;
+
+public class TimeInDto {
+
+    private String time;
+
+    private TimeInDto() {
+        this.time = null;
+    }
+
+    public TimeInDto(String time) {
+        this.time = time;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+}

src/main/java/roomescape/entity/Reservation.java

@@ -1,5 +1,6 @@
 package roomescape.entity;
 
+import roomescape.entity.Dto.ReservationOutDto;
 import roomescape.entity.value.Date;
 import roomescape.entity.value.Name;
 import roomescape.entity.value.Time;
@@ -11,18 +12,15 @@ public class Reservation {
     private final Date date;
     private final Time time;
 
-    public Reservation(Long id, String name, String date, String time) {
+    public Reservation(Long id, String name, String date, Time time) {
         this.id = id;
         this.name = Name.of(name);
         this.date = Date.of(date);
-        this.time = Time.of(time);
+        this.time = time;
     }
 
-    public Reservation(String name, String date, String time) {
-        this.id = null;
-        this.name = Name.of(name);
-        this.date = Date.of(date);
-        this.time = Time.of(time);
+    public static Reservation of(ReservationOutDto reservationOutDto, Time time) {
+        return new Reservation(reservationOutDto.getId(), reservationOutDto.getName(), reservationOutDto.getDate(), time);
     }
 
     private Reservation() {
@@ -44,8 +42,8 @@ public String getDate() {
         return date.getValue();
     }
 
-    public String getTime() {
-        return time.getValue();
+    public Time getTime() {
+        return time;
     }
 
 

src/main/java/roomescape/entity/repository/ReservationRepository.java

@@ -7,7 +7,8 @@
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
 import org.springframework.stereotype.Repository;
-import roomescape.entity.Reservation;
+import roomescape.entity.Dto.ReservationInDto;
+import roomescape.entity.Dto.ReservationOutDto;
 
 @Repository
 public class ReservationRepository {
@@ -22,23 +23,28 @@ public ReservationRepository(JdbcTemplate jdbcTemplate, DataSource source) {
             .usingGeneratedKeyColumns("id");
     }
 
-    public List<Reservation> findAll() {
-        String sql = "SELECT * FROM reservation";
+    public List<ReservationOutDto> findAll() {
+        String sql = "SELECT \n" +
+            "    r.id as reservation_id, \n" +
+            "    r.name, \n" +
+            "    r.date, \n" +
+            "    t.id as time_id, \n" +
+            "    t.time as time_value \n" +
+            "FROM reservation as r inner join time as t on r.time_id = t.id\n";
         return jdbcTemplate.query(sql, (rs, rowNum) ->
-            new Reservation(
-                rs.getLong("id"),
+            new ReservationOutDto(
+                rs.getLong("reservation_id"),
                 rs.getString("name"),
                 rs.getString("date"),
-                rs.getString("time")));
+                rs.getLong("time_id")));
     }
 
-    public Reservation save(Reservation reservation) {
+    public Long save(ReservationInDto reservationInDto) {
         SqlParameterSource params = new MapSqlParameterSource()
-            .addValue("name", reservation.getName())
-            .addValue("date", reservation.getDate())
-            .addValue("time", reservation.getTime());
-        long id = simpleJdbcInsert.executeAndReturnKey(params).longValue();
-        return new Reservation(id, reservation.getName(), reservation.getDate(), reservation.getTime());
+            .addValue("name", reservationInDto.getName())
+            .addValue("date", reservationInDto.getDate())
+            .addValue("time_id", reservationInDto.getTimeId());
+        return simpleJdbcInsert.executeAndReturnKey(params).longValue();
     }
 
     public int deleteById(Long id) {

src/main/java/roomescape/entity/repository/TimeRepository.java

@@ -0,0 +1,56 @@
+package roomescape.entity.repository;
+
+import java.util.List;
+import java.util.Optional;
+import javax.sql.DataSource;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+import roomescape.entity.Dto.TimeInDto;
+import roomescape.entity.value.Time;
+
+@Repository
+public class TimeRepository {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final SimpleJdbcInsert simpleJdbcInsert;
+
+    public TimeRepository(JdbcTemplate jdbcTemplate, DataSource source) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.simpleJdbcInsert = new SimpleJdbcInsert(source)
+            .withTableName("time")
+            .usingGeneratedKeyColumns("id");
+    }
+
+    public List<Time> findAll() {
+        String sql = "SELECT * FROM time";
+        return jdbcTemplate.query(sql, (rs, rowNum) ->
+            new Time(
+                rs.getLong("id"),
+                rs.getString("time")));
+    }
+
+    public Time save(TimeInDto timeInDto) {
+        SqlParameterSource params = new MapSqlParameterSource()
+            .addValue("time", timeInDto.getTime());
+        long id = simpleJdbcInsert.executeAndReturnKey(params).longValue();
+        return new Time(id, timeInDto.getTime());
+    }
+
+    public Optional<Time> findById(Long id) {
+        String sql = "SELECT * FROM time WHERE id = ?";
+        final List<Time> times = jdbcTemplate.query(sql, new Object[]{id}, (rs, rowNum) ->
+            new Time(
+                rs.getLong("id"),
+                rs.getString("time")));
+        return times.stream().findFirst();
+    }
+
+    public int deleteById(Long id) {
+        String sql = "DELETE FROM time WHERE id = ?";
+        return jdbcTemplate.update(sql, id);
+    }
+
+}