fix: 구조 변경

Author: haeyoon1

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

@@ -8,23 +8,20 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
-import roomescape.dto.Reservation;
-import roomescape.exception.InvalidValueException;
-import roomescape.exception.NotFoundReservationException;
-import roomescape.repository.ReservationRepository;
+import roomescape.dto.ReservationRequestDto;
+import roomescape.dto.ReservationResponseDto;
+import roomescape.service.ReservationService;
 
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
 
 @Controller
 public class ReservationController {
 
-    private final ReservationRepository reservationRepository;
+    private final ReservationService reservationService;
 
-    public ReservationController(ReservationRepository repository) {
-        this.reservationRepository = repository;
+    public ReservationController(ReservationService reservationService) {
+        this.reservationService = reservationService;
     }
 
     // 홈화면
@@ -36,21 +33,17 @@ public String reservationPage() {
     //예약 조회
     @ResponseBody
     @GetMapping("/reservations")
-    public List<Reservation> list() {
-        return reservationRepository.findAll();
+    public ResponseEntity<List<ReservationResponseDto>> list() {
+        List<ReservationResponseDto> reservations = reservationService.getAllReservations();
+        return ResponseEntity.ok(reservations);
     }
 
     //예약 추가
     @ResponseBody
     @PostMapping("/reservations")
-    public ResponseEntity<Reservation> create(@RequestBody Reservation newReservation) {
-        if (newReservation.getName() == null || newReservation.getName().isEmpty() ||
-                newReservation.getDate() == null || newReservation.getDate().isEmpty() ||
-                newReservation.getTime() == null || newReservation.getTime().isEmpty()) {
-            throw new InvalidValueException("예약 추가에 필요한 인자값이 비어있습니다.");
-        }
+    public ResponseEntity<ReservationResponseDto> create(@RequestBody ReservationRequestDto newReservationDto) {
 
-        Reservation reservation = reservationRepository.insert(newReservation);
+        ReservationResponseDto reservation = reservationService.createReservation(newReservationDto);
 
         return ResponseEntity.created(URI.create("/reservations/" + reservation.getId()))
                 .body(reservation);
@@ -59,10 +52,7 @@ public ResponseEntity<Reservation> create(@RequestBody Reservation newReservatio
     //예약 삭제
     @DeleteMapping("/reservations/{id}")
     public ResponseEntity<Void> delete(@PathVariable Long id) {
-// 수정예정       Reservation reservation = reservationRepository.fin
-//                .orElseThrow(() -> new NotFoundReservationException("예약을 찾을 수 없습니다."));
-
-        reservationRepository.delete(id);
+        reservationService.deleteReservation(id);
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/roomescape/dto/ReservationRequestDto.java

@@ -0,0 +1,25 @@
+package roomescape.dto;
+
+public class ReservationRequestDto {
+    private String name;
+    private String date;
+    private String time;
+
+    public ReservationRequestDto(String name, String date, String time) {
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+}

src/main/java/roomescape/dto/ReservationResponseDto.java

@@ -0,0 +1,31 @@
+package roomescape.dto;
+
+public class ReservationResponseDto {
+    private Long id;
+    private String name;
+    private String date;
+    private String time;
+
+    public ReservationResponseDto(Long id, String name, String date, String time) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+}

src/main/java/roomescape/dto/Reservation.java renamed to src/main/java/roomescape/entity/Reservation.java

@@ -1,7 +1,6 @@
-package roomescape.dto;
+package roomescape.entity;
 
 public class Reservation {
-
     private Long id;
     private String name;
     private String date;
@@ -29,5 +28,4 @@ public String getDate() {
     public String getTime() {
         return time;
     }
-
 }

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

@@ -3,7 +3,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
-import roomescape.dto.Reservation;
+import roomescape.entity.Reservation;
 
 import java.util.List;
 
@@ -31,24 +31,19 @@ public List<Reservation> findAll() {
 
     //예약 추가
     public Reservation insert(Reservation reservation) {
-        try {
-            String sql = "INSERT INTO reservation(name, date, time) VALUES (?, ?, ?)";
-            jdbcTemplate.update(sql, reservation.getName(), reservation.getDate(), reservation.getTime());
+        String sql = "INSERT INTO reservation(name, date, time) VALUES (?, ?, ?)";
+        jdbcTemplate.update(sql, reservation.getName(), reservation.getDate(), reservation.getTime());
 
-            String query = "SELECT id FROM reservation ORDER BY id DESC LIMIT 1";
-            Long id = jdbcTemplate.queryForObject(query, Long.class);
+        String query = "SELECT id FROM reservation ORDER BY id DESC LIMIT 1";
+        Long id = jdbcTemplate.queryForObject(query, Long.class);
 
-            return new Reservation(id, reservation.getName(), reservation.getDate(), reservation.getTime());
-        } catch (Exception ex) {
-            throw new RuntimeException("오류가 발생하였습니다.");
-        }
+        return new Reservation(id, reservation.getName(), reservation.getDate(), reservation.getTime());
     }
 
     //예약 삭제
-    public ResponseEntity<Object> delete(Long id) {
+    public void delete(Long id) {
         String sql = "DELETE FROM reservation WHERE id = ?";
         jdbcTemplate.update(sql, Long.valueOf(id));
-        return ResponseEntity.noContent().build();
     }
 }
 

src/main/java/roomescape/service/ReservationService.java

@@ -0,0 +1,52 @@
+package roomescape.service;
+
+import org.springframework.stereotype.Service;
+import roomescape.dto.ReservationRequestDto;
+import roomescape.dto.ReservationResponseDto;
+import roomescape.entity.Reservation;
+import roomescape.repository.ReservationRepository;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class ReservationService {
+
+    private final ReservationRepository reservationRepository;
+
+    public ReservationService(ReservationRepository reservationRepository) {
+        this.reservationRepository = reservationRepository;
+    }
+
+    public List<ReservationResponseDto> getAllReservations(){
+        return reservationRepository.findAll()
+                .stream()
+                .map(this::toResponseDto)
+                .collect(Collectors.toList());
+    }
+
+    public ReservationResponseDto createReservation(ReservationRequestDto requestDto){
+
+        Reservation reservation = new Reservation(
+                null,
+                requestDto.getName(),
+                requestDto.getDate(),
+                requestDto.getTime()
+        );
+        Reservation savedReservation = reservationRepository.insert(reservation);
+        return toResponseDto(savedReservation);
+    }
+
+    public void deleteReservation(Long id){
+        reservationRepository.delete(id);
+    }
+
+    private ReservationResponseDto toResponseDto(Reservation reservation) {
+        return new ReservationResponseDto(
+                reservation.getId(),
+                reservation.getName(),
+                reservation.getDate(),
+                reservation.getTime()
+        );
+    }
+}

src/test/java/roomescape/MissionStepTest2.java

@@ -7,7 +7,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
-import roomescape.dto.Reservation;
+import roomescape.entity.Reservation;
 
 import java.sql.Connection;
 import java.sql.SQLException;