Skip to content
Snippets Groups Projects
Commit a09cf30c authored by 천 진강's avatar 천 진강
Browse files

feat: DB 필드 상세 설정 및 시간 양식 설정

parent 6e706c25
No related branches found
No related tags found
2 merge requests!15Feat/certificate,!14Feat/main 자잘한 변경 사항들
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;
}
......@@ -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
......
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
......
......@@ -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;
......
......@@ -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() {
......
......@@ -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) {
......
......@@ -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() {
......
......@@ -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() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment