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 index 3a0bac43..717bbfe4 100644 --- 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 index 1f667e3f..35bf1196 100644 --- 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 index deb7e1db..5e3f894d 100644 --- 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 index 803f6b67..8bc7bad1 100644 --- 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 deleted file mode 100644 index 40a38089..00000000 --- a/src/main/java/com/keepgoing/keepserver/domain/device/payload/response/MyDevicesDto.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.keepgoing.keepserver.domain.device.payload.response; - -import lombok.Builder; - -@Builder -public record MyDevicesDto ( - Long id, - String deviceName -) { -}