refactor: new-reservation.js 코드 수정

next-step · Dec 19, 2024 · 6d9acfd · 6d9acfd
1 parent fb70989
commit 6d9acfd
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 31 deletions.
diff --git a/src/main/java/roomescape/dao/ReservationDao.java b/src/main/java/roomescape/dao/ReservationDao.java
@@ -36,13 +36,13 @@ public List<Reservation> findAll() {
 
 
     public Reservation insert(Reservation reservation) {
-        String sql = "INSERT INTO reservation(name, date, time_id) VALUES (?, ?, ?)";
 
+        String sql = "INSERT INTO reservation(name, date, time_id) VALUES (?, ?, ?)";
         jdbcTemplate.update(sql, reservation.getName(), reservation.getDate(), reservation.getTime().getId());
 
         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().getTime());
     }
 

diff --git a/src/main/java/roomescape/dao/TimeDao.java b/src/main/java/roomescape/dao/TimeDao.java
@@ -1,9 +1,13 @@
 package roomescape.dao;
 
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 import roomescape.entity.Time;
 
+import java.sql.PreparedStatement;
+import java.sql.Statement;
 import java.util.List;
 
 @Repository
@@ -24,10 +28,15 @@ public List<Time> findAll() {
 
     public Time insert(Time time) {
         String sql = "INSERT INTO time(time) VALUES (?)";
-        jdbcTemplate.update(sql, time.getTime());
+        KeyHolder keyHolder = new GeneratedKeyHolder();
 
-        String query = "SELECT id FROM time ORDER BY id DESC LIMIT 1";
-        Long id = jdbcTemplate.queryForObject(query, Long.class);
+        jdbcTemplate.update(connection -> {
+                    PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+                    ps.setString(1, time.getTime());
+                    return ps;
+                }, keyHolder);
+
+        Long id = keyHolder.getKey().longValue();
 
         return new Time(id, time.getTime());
     }

diff --git a/src/main/java/roomescape/dto/TimeRequestDto.java b/src/main/java/roomescape/dto/TimeRequestDto.java
@@ -1,8 +1,5 @@
 package roomescape.dto;
 
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-
 public class TimeRequestDto {
     private String time;
 

diff --git a/src/main/java/roomescape/entity/Reservation.java b/src/main/java/roomescape/entity/Reservation.java
@@ -42,7 +42,7 @@ public Time getTime() {
     }
 
     public LocalTime getTimeAsLocalTime() {
-        return time.getTimeASLocalTime();
+        return time.getTimeAsLocalTime();
     }
 
 }
diff --git a/src/main/java/roomescape/entity/Time.java b/src/main/java/roomescape/entity/Time.java
@@ -1,5 +1,6 @@
 package roomescape.entity;
 
+import java.time.DateTimeException;
 import java.time.LocalTime;
 
 public class Time {
@@ -23,8 +24,11 @@ public String getTime() {
         return time;
     }
 
-    public LocalTime getTimeASLocalTime(){ //string -> localtime
-        return LocalTime.parse(time);
+    public LocalTime getTimeAsLocalTime(){ //string -> localtime
+        try {
+            return LocalTime.parse(time);
+        } catch (DateTimeException e) {
+        return LocalTime.parse(time + ":00"); // 초
+        }
     }
-
 }
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
@@ -9,8 +9,6 @@
 import roomescape.repository.TimeRepository;
 
 import java.time.DateTimeException;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -45,7 +43,6 @@ public ReservationResponseDto createReservation(ReservationRequestDto requestDto
                 time
         );
         Reservation newReservation = reservationRepository.save(reservation);
-        System.out.println("new Reservation" + newReservation.toString());
 
         return toResponseDto(newReservation);
     }
@@ -63,18 +60,10 @@ private ReservationResponseDto toResponseDto(Reservation reservation) {
         );
     }
 
-//    private void validateTimeFormat (String time) {
-//        try {
-//            LocalTime.parse(time);
-//        } catch (DateTimeException e){
-//            throw new IllegalArgumentException("Invalid time format.");
-//        }
-//    }
-
     private Long parseTimeId(String time) {  // String -> long
         try {
             return Long.parseLong(time);
-        } catch (NumberFormatException e) {
+        } catch (DateTimeException e) {
             throw new IllegalArgumentException("Invalid time id format: " + time);
         }
     }

diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
@@ -8,7 +8,6 @@
 
 import java.time.LocalTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 public class TimeService {
@@ -24,15 +23,15 @@ public List<TimeResponseDto> findAllTimes() {
                 .stream()
                 .map(time -> new TimeResponseDto(
                         time.getId(),
-                        time.getTimeASLocalTime()))
-                .collect(Collectors.toList());
+                        time.getTimeAsLocalTime()))
+                .toList();
     }
 
     public TimeResponseDto createTime(TimeRequestDto requestDto) {
         Time time = new Time(requestDto.getTime());
         Time newTime = timeRespository.save(time);
 
-        return toResponseDTO(newTime.getId(), newTime.getTimeASLocalTime());
+        return toResponseDTO(newTime.getId(), newTime.getTimeAsLocalTime());
     }
 
     private TimeResponseDto toResponseDTO(Long id, LocalTime time) {

diff --git a/src/main/resources/static/js/new-reservation.js b/src/main/resources/static/js/new-reservation.js
@@ -57,13 +57,13 @@ function renderReservations(data) {
 }
 
 function insertReservationRow(row, reservation) {
-  ['id', 'name', 'date'].forEach((field, index) => {
+  ['id', 'name', 'date', 'time'].forEach((field, index) => {
     row.insertCell(index).textContent = reservation[field];
   });
 
-  row.insertCell(3).textContent = reservation.time.time;
+  row.insertCell(4).textContent = reservation.time.time;
 
-  const actionCell = row.insertCell(4);
+  const actionCell = row.insertCell(5);
   actionCell.appendChild(createActionButton('삭제', 'btn-danger', deleteRow));
 }