diff --git a/src/main/java/com/aolda/itda/dto/forwarding/ForwardingDTO.java b/src/main/java/com/aolda/itda/dto/forwarding/ForwardingDTO.java index 3302d0a3b20500ec9731028aaa3390c5959a542a..be003b6ca78d1f4e317c391559fd41e2c4a304ad 100644 --- a/src/main/java/com/aolda/itda/dto/forwarding/ForwardingDTO.java +++ b/src/main/java/com/aolda/itda/dto/forwarding/ForwardingDTO.java @@ -1,5 +1,6 @@ package com.aolda.itda.dto.forwarding; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -40,6 +41,10 @@ public class ForwardingDTO { @NotBlank(message = "name 값이 존재하지 않습니다") private String name; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul") private LocalDateTime createdAt; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul") private LocalDateTime updatedAt; } diff --git a/src/main/java/com/aolda/itda/dto/log/LogDTO.java b/src/main/java/com/aolda/itda/dto/log/LogDTO.java index 589545518431c85d093ca695b3cb97778fb9bac0..9946028fa254c24ea5197f8002c610ad02a083b5 100644 --- a/src/main/java/com/aolda/itda/dto/log/LogDTO.java +++ b/src/main/java/com/aolda/itda/dto/log/LogDTO.java @@ -3,6 +3,7 @@ package com.aolda.itda.dto.log; import com.aolda.itda.dto.auth.IdAndNameDTO; import com.aolda.itda.entity.log.Action; import com.aolda.itda.entity.log.ObjectType; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import com.querydsl.core.annotations.QueryProjection; import lombok.AllArgsConstructor; @@ -22,7 +23,11 @@ public class LogDTO { private Action action; private ObjectType type; private Long objectId; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul") private String description; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul") private LocalDateTime createdAt; @QueryProjection diff --git a/src/main/java/com/aolda/itda/dto/routing/RoutingDTO.java b/src/main/java/com/aolda/itda/dto/routing/RoutingDTO.java index 6bc48d87f455151d743711bd40037496257fb940..985056ea3771b0a0fc3b7afc2db890c039f4db84 100644 --- a/src/main/java/com/aolda/itda/dto/routing/RoutingDTO.java +++ b/src/main/java/com/aolda/itda/dto/routing/RoutingDTO.java @@ -1,5 +1,6 @@ package com.aolda.itda.dto.routing; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -28,8 +29,10 @@ public class RoutingDTO { @NotNull private Long certificateId; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul") private LocalDateTime createdAt; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul") private LocalDateTime updatedAt; @NotNull diff --git a/src/main/java/com/aolda/itda/entity/BaseTimeEntity.java b/src/main/java/com/aolda/itda/entity/BaseTimeEntity.java index 6cfa1fde46f85bae5cf6c3ae7b2e543002db0ad9..b62af84f1afea4909e4af4e7cb72848ddd0feee1 100644 --- a/src/main/java/com/aolda/itda/entity/BaseTimeEntity.java +++ b/src/main/java/com/aolda/itda/entity/BaseTimeEntity.java @@ -17,12 +17,12 @@ import java.time.LocalDateTime; public abstract class BaseTimeEntity { @CreatedDate - @Column(updatable = false) + @Column(updatable = false, columnDefinition = "DATETIME") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul") private LocalDateTime createdAt; @LastModifiedDate - @Column(name = "updated_at") + @Column(name = "updated_at", columnDefinition = "DATETIME") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul") private LocalDateTime updatedAt; diff --git a/src/main/java/com/aolda/itda/entity/certificate/Certificate.java b/src/main/java/com/aolda/itda/entity/certificate/Certificate.java index a23cf858c8926a19b36a1b81df45b3b0bfd033f3..85b1f29b492b15fa7e213d6f94ee8f683d55c61e 100644 --- a/src/main/java/com/aolda/itda/entity/certificate/Certificate.java +++ b/src/main/java/com/aolda/itda/entity/certificate/Certificate.java @@ -27,10 +27,13 @@ public class Certificate extends BaseTimeEntity { @JoinColumn(nullable = false, name = "user_id") private User user; + @Column(length = 64) private String projectId; + @Column(length = 64) private String domain; + @Column(length = 64) private String email; private LocalDateTime expiredAt; @@ -40,6 +43,7 @@ public class Certificate extends BaseTimeEntity { private Boolean isDeleted; + @Column(length = 256) private String description; public String formatDomain() { diff --git a/src/main/java/com/aolda/itda/entity/forwarding/Forwarding.java b/src/main/java/com/aolda/itda/entity/forwarding/Forwarding.java index 0e5e50559860fbebf6cc5378fa91bd6fcefa00fa..0ba96d651f09690952337da5a311e12d8f1f51e6 100644 --- a/src/main/java/com/aolda/itda/entity/forwarding/Forwarding.java +++ b/src/main/java/com/aolda/itda/entity/forwarding/Forwarding.java @@ -20,18 +20,24 @@ public class Forwarding extends BaseTimeEntity { @Column(nullable = false) private Long forwardingId; + @Column(length = 64) private String projectId; + @Column(length = 32) private String serverIp; + @Column(length = 8) private String serverPort; + @Column(length = 32) private String instanceIp; + @Column(length = 8) private String instancePort; private Boolean isDeleted; + @Column(length = 256) private String name; public Forwarding(Forwarding forwarding) { diff --git a/src/main/java/com/aolda/itda/entity/log/Log.java b/src/main/java/com/aolda/itda/entity/log/Log.java index 9832ab291bdd2b8aaf5a8b6ea2d6823e71a55df7..6bf607497bb95f9ba71ca677dbcb9af5d7b9a36d 100644 --- a/src/main/java/com/aolda/itda/entity/log/Log.java +++ b/src/main/java/com/aolda/itda/entity/log/Log.java @@ -27,16 +27,20 @@ public class Log extends BaseTimeEntity { @JoinColumn(name = "user_id", nullable = false) private User user; + @Column(length = 64) private String projectId; @Enumerated(EnumType.STRING) private ObjectType objectType; + @Column(length = 64) private Long objectId; @Enumerated(EnumType.STRING) private Action action; + @Lob + @Column(length = 1024) private String description; public LogDTO toLogDTO() { diff --git a/src/main/java/com/aolda/itda/entity/routing/Routing.java b/src/main/java/com/aolda/itda/entity/routing/Routing.java index de13d82d149e0ec8c6acd60c162b9e980eb1bc91..94ecb5517358ec3445d5604207c6a28822c3b142 100644 --- a/src/main/java/com/aolda/itda/entity/routing/Routing.java +++ b/src/main/java/com/aolda/itda/entity/routing/Routing.java @@ -28,18 +28,23 @@ public class Routing extends BaseTimeEntity { @JoinColumn(name = "certificate_id") private Certificate certificate; + @Column(length = 64) private String projectId; + @Column(length = 64) private String domain; + @Column(length = 32) private String instanceIp; + @Column(length = 8) private String instancePort; private Boolean isDeleted; private Boolean caching; + @Column(length = 256) private String name; public RoutingDTO toRoutingDTO() {