260327_01_ENH: kri.common 라이브러리 리펙토링으로 인한 참조 경로 수정
This commit is contained in:
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.kri.common.http.ExternalApiClient;
|
||||
import com.kri.common.http.ExternalApiResponse;
|
||||
import com.kri.common.feature.http.ExternalApiClient;
|
||||
import com.kri.common.feature.http.ExternalApiResponse;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnErrorDto;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnItemDto;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnRequestDto;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.common.external.pringo.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
@@ -44,4 +44,4 @@ public class PringoJsonReturnRequestDto {
|
||||
throw new IllegalArgumentException("return_key is required.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.common.util;
|
||||
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.dto.template.TemplateBasicDto;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
@@ -168,4 +168,4 @@ public final class TemplateContentSanitizer {
|
||||
public record SanitizedTemplate(SendType type, String title, String body) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.webmvc.page.PageRequestDto;
|
||||
import com.kri.common.webmvc.page.PageResponseDto;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.common.feature.web.page.PageRequestDto;
|
||||
import com.kri.common.feature.web.page.PageResponseDto;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.dto.report.BulkSendInfoDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto;
|
||||
import com.kri.notihub.server.dto.send.BulkSendResponseDto;
|
||||
import com.kri.notihub.server.dto.send.EmailPollQueueResponseDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.notihub.server.dto.send.BizppurioCursorResponseDto;
|
||||
import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto;
|
||||
import com.kri.notihub.server.dto.send.BulkSendResponseDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto;
|
||||
import com.kri.notihub.server.dto.send.BulkSendResponseDto;
|
||||
import com.kri.notihub.server.dto.send.SendRequestBulkDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.dto.template.TemplateBasicDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.dto.report;
|
||||
|
||||
import com.kri.common.excel.ExcelColumn;
|
||||
import com.kri.common.feature.excel.ExcelColumn;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.dto.send;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -38,4 +38,4 @@ public class EmailPollQueueItemDto {
|
||||
.triggerAt(DateTimeUtil.toKstLocalDateTime(Instant.ofEpochMilli(triggerAtEpochMs)))
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.dto.send;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.kri.common.datetime.LenientLocalDateTime;
|
||||
import com.kri.common.feature.datetime.LenientLocalDateTime;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.persistence.entity;
|
||||
|
||||
import com.kri.common.jpa.BaseUuidEntity;
|
||||
import com.kri.common.feature.jpa.BaseUuidEntity;
|
||||
import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
@@ -45,6 +45,7 @@ public class TBulkSendEntity extends BaseUuidEntity {
|
||||
|
||||
@NotNull
|
||||
@Column(name = "is_resve", nullable = false)
|
||||
@Builder.Default
|
||||
private Boolean resve = false;
|
||||
|
||||
@NotNull
|
||||
@@ -118,4 +119,4 @@ public class TBulkSendEntity extends BaseUuidEntity {
|
||||
protected int idLength() {
|
||||
return 32; // cmid가 32면 생략해도 되지만 명시해두면 안전
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,6 +56,7 @@ public class TSendEntity {
|
||||
|
||||
@NotNull
|
||||
@Column(name = "is_resve", nullable = false)
|
||||
@Builder.Default
|
||||
private boolean resve = false;
|
||||
|
||||
@NotNull
|
||||
@@ -261,4 +262,4 @@ public class TSendEntity {
|
||||
.regDt(regDt)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,6 +106,7 @@ public class TTmplatEntity {
|
||||
@NotNull
|
||||
@ColumnDefault("0")
|
||||
@Column(name = "is_del", nullable = false)
|
||||
@Builder.Default
|
||||
private Boolean del = false;
|
||||
|
||||
@Size(max = 32)
|
||||
@@ -156,4 +157,4 @@ public class TTmplatEntity {
|
||||
this.modUser = modUser;
|
||||
this.modDt = modDt;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.scheduler;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.scheduler;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.common.external.pringo.PringoApiClient;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.util.CommonUtil;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.CommonUtil;
|
||||
import com.kri.common.util.NumericUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import com.kri.common.feature.util.NumericUtil;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
|
||||
@@ -2,8 +2,8 @@ package com.kri.notihub.server.service;
|
||||
|
||||
import static org.apache.commons.lang3.StringUtils.firstNonBlank;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.NumericUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.NumericUtil;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.external.pringo.PringoApiClient;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.file.FileUtil;
|
||||
import com.kri.common.util.CommonUtil;
|
||||
import com.kri.common.feature.file.FileUtil;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.DirectoryStream;
|
||||
import java.nio.file.Files;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.excel.ExcelMapper;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.webmvc.page.PageRequestDto;
|
||||
import com.kri.common.webmvc.page.PageResponseDto;
|
||||
import com.kri.common.webmvc.page.Pageables;
|
||||
import com.kri.common.feature.excel.ExcelMapper;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.page.PageRequestDto;
|
||||
import com.kri.common.feature.web.page.PageResponseDto;
|
||||
import com.kri.common.feature.web.page.Pageables;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.dto.report.BulkSendInfoDto;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
|
||||
Reference in New Issue
Block a user