From a09cf30c2b6077352b617d462a5fee0aaa5fb368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B2=9C=20=EC=A7=84=EA=B0=95?= <jjjjjk12@ajou.ac.kr> Date: Wed, 26 Mar 2025 21:46:11 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20DB=20=ED=95=84=EB=93=9C=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EC=84=A4=EC=A0=95=20=EB=B0=8F=20=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=20=EC=96=91=EC=8B=9D=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/aolda/itda/dto/forwarding/ForwardingDTO.java | 5 +++++ src/main/java/com/aolda/itda/dto/log/LogDTO.java | 5 +++++ src/main/java/com/aolda/itda/dto/routing/RoutingDTO.java | 3 +++ src/main/java/com/aolda/itda/entity/BaseTimeEntity.java | 4 ++-- .../java/com/aolda/itda/entity/certificate/Certificate.java | 4 ++++ .../java/com/aolda/itda/entity/forwarding/Forwarding.java | 6 ++++++ src/main/java/com/aolda/itda/entity/log/Log.java | 4 ++++ src/main/java/com/aolda/itda/entity/routing/Routing.java | 5 +++++ 8 files changed, 34 insertions(+), 2 deletions(-) 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 3302d0a..be003b6 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 5895455..9946028 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 6bc48d8..985056e 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 6cfa1fd..b62af84 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 a23cf85..85b1f29 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 0e5e505..0ba96d6 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 9832ab2..6bf6074 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 de13d82..94ecb55 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() { -- GitLab