Merge pull request #52 from Team-KeepGoing/feature/device

Refactor :: refactor device request value
Team-KeepGoing · Jun 13, 2024 · 8ee441f · 8ee441f
2 parents 93917a4 + 72224d5
commit 8ee441f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/src/main/java/com/keepgoing/keepserver/domain/device/entity/Device.java b/src/main/java/com/keepgoing/keepserver/domain/device/entity/Device.java
@@ -45,7 +45,7 @@ public class Device {
         기기 등록일
     */
     @Column(nullable = false)
-    private String regDate;
+    private LocalDateTime regDate;
 
     /*
         기기 대여 시작일
@@ -61,7 +61,7 @@ public class Device {
     private User borrower;
 
     @Builder
-    public Device(String deviceName, DeviceStatus status, String imgUrl, String regDate, LocalDateTime rentDate, User borrower) {
+    public Device(String deviceName, DeviceStatus status, String imgUrl, LocalDateTime regDate, LocalDateTime rentDate, User borrower) {
         this.deviceName = deviceName;
         this.status = status;
         this.imgUrl = imgUrl;

diff --git a/src/main/java/com/keepgoing/keepserver/domain/device/mapper/DeviceMapper.java b/src/main/java/com/keepgoing/keepserver/domain/device/mapper/DeviceMapper.java
@@ -6,6 +6,7 @@
 import com.keepgoing.keepserver.domain.device.payload.request.DeviceDto;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -25,7 +26,7 @@ public static Device dtoToEntity(DeviceDto dto) {
         return Device.builder()
                 .deviceName(dto.deviceName())
                 .imgUrl(dto.imgUrl())
-                .regDate(dto.regDate())
+                .regDate(LocalDateTime.now())
                 .rentDate(dto.rentDate())
                 .status(DeviceStatus.AVAILABLE)
                 .build();

diff --git a/src/main/java/com/keepgoing/keepserver/domain/device/payload/request/DeviceDto.java b/src/main/java/com/keepgoing/keepserver/domain/device/payload/request/DeviceDto.java
@@ -8,7 +8,7 @@ public record DeviceDto (
         Long id,
         String deviceName,
         String imgUrl,
-        String regDate,
+        LocalDateTime regDate,
         LocalDateTime rentDate,
         DeviceStatus status
 ) {

diff --git a/src/main/java/com/keepgoing/keepserver/domain/device/payload/response/DeviceResponseDto.java b/src/main/java/com/keepgoing/keepserver/domain/device/payload/response/DeviceResponseDto.java
@@ -10,6 +10,7 @@ public record DeviceResponseDto (
         Long id,
         String deviceName,
         String imgUrl,
+        LocalDateTime regDate,
         LocalDateTime rentDate,
         DeviceStatus status
 ) {

diff --git a/src/main/java/com/keepgoing/keepserver/domain/device/payload/response/MyDevicesDto.java b/src/main/java/com/keepgoing/keepserver/domain/device/payload/response/MyDevicesDto.java