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

fix: expiredAt에서 expiresAt으로 필드명 변경

parent 790875fc
Branches
No related tags found
1 merge request!15Feat/certificate
......@@ -13,11 +13,11 @@ import java.time.LocalDateTime;
@JsonInclude(JsonInclude.Include.NON_NULL)
public class CertificateDTO {
private Long certificateId; // 인증서 고유 ID
private Long id; // 인증서 고유 ID
// private String projectId; // 프로젝트 식별자
private String domain; // SSL 인증받을 도메인 주소
private String email; // 도메인 소유자의 이메일
private LocalDateTime expiredAt; // 인증서 만료일
private LocalDateTime expiresAt; // 인증서 만료일
private LocalDateTime createdAt; // 인증서 생성일
private LocalDateTime updatedAt; // 인증서 업데이트일
private Challenge challenge; // 챌린지 방식 (HTTP, DNS_CLOUDFLARE)
......
......@@ -3,10 +3,7 @@ package com.aolda.itda.entity.certificate;
import com.aolda.itda.entity.BaseTimeEntity;
import com.aolda.itda.entity.user.User;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.*;
import java.time.LocalDateTime;
......@@ -26,13 +23,16 @@ public class Certificate extends BaseTimeEntity {
@Column(length = 64)
private String projectId;
@Setter
@Column(length = 64)
private String domain;
@Column(length = 64)
@Setter
private String email;
private LocalDateTime expiredAt; //인증서 만료일
@Setter
private LocalDateTime expiresAt; //인증서 만료일
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
......@@ -47,22 +47,11 @@ public class Certificate extends BaseTimeEntity {
}
public void setIsDeleted(boolean b) {
this.isDeleted = b;
}
public void setDomain(String domain) {
}
// public void setDescription(String description) {
//
// }
@Transient
private String apiToken;
public void setExpiredAt(LocalDateTime localDateTime) {
}
public void setEmail(String email) {
}
}
......@@ -78,7 +78,7 @@ public class CertificateService {
.domain(dto.getDomain())
.email(dto.getEmail())
.challenge(dto.getChallenge())
.expiredAt(LocalDateTime.now().plusDays(90))
.expiresAt(LocalDateTime.now().plusDays(90))
.isDeleted(false)
.apiToken(dto.getApiToken())
.build();
......@@ -138,10 +138,10 @@ public class CertificateService {
.build();
executeLego(dto);
cert.setExpiredAt(LocalDateTime.now().plusDays(90));
cert.setExpiresAt(LocalDateTime.now().plusDays(90));
certificateRepository.save(cert);
log.info("renewed (id={}, newExpiry={})",
cert.getCertificateId(), cert.getExpiredAt());
cert.getCertificateId(), cert.getExpiresAt());
} catch (Exception e) {
log.error("failed to renew (id={}, domain={}): {}",
cert.getCertificateId(), cert.getDomain(), e.getMessage());
......@@ -161,12 +161,12 @@ public class CertificateService {
/** Entity→DTO 변환 **/
private CertificateDTO toDTO(Certificate cert) {
return CertificateDTO.builder()
.certificateId(cert.getCertificateId())
.id(cert.getCertificateId())
.domain(cert.getDomain())
.email(cert.getEmail())
.challenge(cert.getChallenge())
.expiredAt(cert.getExpiredAt())
.expiresAt(cert.getExpiresAt())
.createdAt(cert.getCreatedAt())
.updatedAt(cert.getUpdatedAt())
.isDeleted(cert.getIsDeleted())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment