Merge pull request '261007_01_ENH: NotiHub 템플릿·발송 리포트 API를 contact-back으로 통합하고 메시지 발송 경로 변경' (#33) from develop into master
Reviewed-on: #33
This commit is contained in:
18
build.gradle
18
build.gradle
@@ -76,24 +76,6 @@ dependencies {
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||
}
|
||||
|
||||
// === QueryDSL Q클래스 생성 위치 설정 ===
|
||||
def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
|
||||
|
||||
sourceSets {
|
||||
// Q클래스가 있는 디렉토리를 main 소스에 추가
|
||||
main.java.srcDirs += [querydslDir]
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
options.generatedSourceOutputDirectory.set(file(querydslDir))
|
||||
}
|
||||
|
||||
tasks.named('test') {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
|
||||
tasks.named('clean') {
|
||||
doLast {
|
||||
delete querydslDir
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.kri.contact.server.common.external.contactsurvey;
|
||||
|
||||
import com.kri.common.feature.http.ExternalApiClient;
|
||||
import com.kri.common.feature.http.ExternalApiResponse;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.contact.server.common.enums.SurveyType;
|
||||
import java.net.URLEncoder;
|
||||
|
||||
@@ -1,17 +1,57 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.kri.common.feature.http.bypass.BypassClient;
|
||||
import com.kri.common.feature.http.bypass.BypassForwardOptions;
|
||||
import com.kri.common.feature.http.bypass.BypassRequest;
|
||||
import com.kri.common.feature.http.bypass.BypassResponse;
|
||||
import com.kri.common.feature.http.ExternalApiClient;
|
||||
import com.kri.common.feature.http.ExternalApiResponse;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendCreateRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportExcelResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportPageRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportPageResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendRequestBulkDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendRequestSingleDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultLastWithSidDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultSummaryRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultSummaryResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendSingleResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateBasicDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateDetailDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateSummaryDto;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.core.ParameterizedTypeReference;
|
||||
import org.springframework.http.converter.FormHttpMessageConverter;
|
||||
import org.springframework.http.HttpEntity;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.HttpOutputMessage;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.HttpStatusCode;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.LinkedMultiValueMap;
|
||||
import org.springframework.util.MultiValueMap;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.util.UriComponentsBuilder;
|
||||
|
||||
@Component
|
||||
@@ -20,6 +60,7 @@ public class NotiHubApiClient {
|
||||
|
||||
private final ExternalApiClient externalApiClient = new ExternalApiClient();
|
||||
private final ObjectMapper objectMapper;
|
||||
private final BypassClient bypassClient;
|
||||
|
||||
@Value("${kri.api-url.noti-hub}")
|
||||
private String notiHubBaseUrl;
|
||||
@@ -91,6 +132,98 @@ public class NotiHubApiClient {
|
||||
}
|
||||
}
|
||||
|
||||
public ResponseEntity<List<NotiHubTemplateSummaryDto>> getTemplateList(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return relay(request, null, new ParameterizedTypeReference<>() {}, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> getTemplate(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return relay(request, null, NotiHubTemplateDetailDto.class, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> createTemplate(
|
||||
NotiHubTemplateBasicDto template,
|
||||
List<MultipartFile> files,
|
||||
List<String> deleteFileNames,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return saveTemplate(template, files, deleteFileNames, request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> updateTemplate(
|
||||
NotiHubTemplateDetailDto template,
|
||||
List<MultipartFile> files,
|
||||
List<String> deleteFileNames,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return saveTemplate(template, files, deleteFileNames, request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<List<NotiHubBulkSendInfoDto>> getBulkList(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return relay(request, null, new ParameterizedTypeReference<>() {}, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<List<NotiHubSendResultInfoDto>> getSendResult(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return relay(request, null, new ParameterizedTypeReference<>() {}, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubReportPageResponseDto<NotiHubSendResultInfoDto>> getBulkDetail(
|
||||
NotiHubReportPageRequestDto body,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return relay(request, body, new ParameterizedTypeReference<>() {}, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubReportExcelResponseDto> getBulkDetailExcel(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return relay(request, null, NotiHubReportExcelResponseDto.class, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<List<NotiHubSendResultSummaryResponseDto>> getSendResultSummary(
|
||||
NotiHubSendResultSummaryRequestDto body,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return relay(request, body, new ParameterizedTypeReference<>() {}, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<byte[]> getTemplateAttachment(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return forward(request, null, request.getContentType(), ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<String> uploadBodyImage(
|
||||
MultipartFile file,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
|
||||
parts.add("file", toFilePart(file));
|
||||
ResponseEntity<byte[]> response = relayMultipart(request, parts, ctx);
|
||||
byte[] body = response.getBody();
|
||||
return ResponseEntity.status(response.getStatusCode())
|
||||
.headers(response.getHeaders())
|
||||
.body(body == null ? null : new String(body, StandardCharsets.UTF_8));
|
||||
}
|
||||
|
||||
private NotiHubSendSingleResponseDto postSingle(
|
||||
String path,
|
||||
NotiHubSendRequestSingleDto request,
|
||||
@@ -160,4 +293,266 @@ public class NotiHubApiClient {
|
||||
headers.put("Content-Type", "application/json");
|
||||
return headers;
|
||||
}
|
||||
|
||||
private <T> ResponseEntity<T> relay(
|
||||
HttpServletRequest request,
|
||||
Object body,
|
||||
Class<T> responseType,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return relay(request, body, ParameterizedTypeReference.forType(responseType), ctx);
|
||||
}
|
||||
|
||||
private <T> ResponseEntity<T> relay(
|
||||
HttpServletRequest request,
|
||||
Object body,
|
||||
ParameterizedTypeReference<T> responseType,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
ResponseEntity<byte[]> response = forward(request, toJsonBytes(body), request.getContentType(), ctx);
|
||||
return readJsonResponse(response, responseType);
|
||||
}
|
||||
|
||||
private ResponseEntity<NotiHubTemplateDetailDto> saveTemplate(
|
||||
NotiHubTemplateBasicDto template,
|
||||
List<MultipartFile> files,
|
||||
List<String> deleteFileNames,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
|
||||
HttpHeaders templateHeaders = new HttpHeaders();
|
||||
templateHeaders.setContentType(MediaType.APPLICATION_JSON);
|
||||
parts.add("template", new HttpEntity<>(toJsonBytes(template), templateHeaders));
|
||||
|
||||
if (files != null) {
|
||||
files.forEach(file -> parts.add("files", toFilePart(file)));
|
||||
}
|
||||
if (deleteFileNames != null) {
|
||||
deleteFileNames.forEach(fileName -> parts.add("deleteFileNames", fileName));
|
||||
}
|
||||
return readJsonResponse(relayMultipart(request, parts, ctx),
|
||||
ParameterizedTypeReference.forType(NotiHubTemplateDetailDto.class));
|
||||
}
|
||||
|
||||
private byte[] toJsonBytes(Object body) {
|
||||
if (body == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return objectMapper.writeValueAsBytes(body);
|
||||
} catch (JsonProcessingException e) {
|
||||
throw BusinessException.internalError("NOTI_HUB_REQUEST_WRITE_FAILED",
|
||||
"NotiHub request serialization failed.");
|
||||
}
|
||||
}
|
||||
|
||||
private <T> ResponseEntity<T> readJsonResponse(
|
||||
ResponseEntity<byte[]> response,
|
||||
ParameterizedTypeReference<T> responseType
|
||||
) {
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.putAll(response.getHeaders());
|
||||
// JSON serialization changes the bytes; upstream representation headers no longer apply.
|
||||
headers.remove(HttpHeaders.CONTENT_LENGTH);
|
||||
headers.remove(HttpHeaders.CONTENT_ENCODING);
|
||||
headers.remove(HttpHeaders.ETAG);
|
||||
if (headers.getContentType() == null) {
|
||||
headers.setContentType(MediaType.APPLICATION_JSON);
|
||||
}
|
||||
byte[] body = response.getBody();
|
||||
if (body == null || body.length == 0) {
|
||||
return ResponseEntity.status(response.getStatusCode()).headers(headers).build();
|
||||
}
|
||||
try {
|
||||
T result = objectMapper.readValue(body,
|
||||
objectMapper.getTypeFactory().constructType(responseType.getType()));
|
||||
return ResponseEntity.status(response.getStatusCode()).headers(headers).body(result);
|
||||
} catch (IOException e) {
|
||||
throw BusinessException.of(HttpStatus.BAD_GATEWAY, "NOTI_HUB_RESPONSE_READ_FAILED",
|
||||
"NotiHub response deserialization failed.");
|
||||
}
|
||||
}
|
||||
|
||||
private void requireSuccessfulResponse(ResponseEntity<byte[]> response) {
|
||||
if (response.getStatusCode().is2xxSuccessful()) {
|
||||
return;
|
||||
}
|
||||
|
||||
HttpStatus status = HttpStatus.resolve(response.getStatusCode().value());
|
||||
if (status == null) {
|
||||
status = HttpStatus.BAD_GATEWAY;
|
||||
}
|
||||
String code = "NOTI_HUB_ERROR";
|
||||
String message = status.getReasonPhrase();
|
||||
byte[] body = response.getBody();
|
||||
if (body != null && body.length > 0) {
|
||||
try {
|
||||
JsonNode error = objectMapper.readTree(body);
|
||||
if (error != null) {
|
||||
code = error.path("code").asText(code);
|
||||
message = error.path("detail").asText(message);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
// An invalid error body retains the HTTP status and its standard message.
|
||||
}
|
||||
}
|
||||
throw BusinessException.of(status, code, message);
|
||||
}
|
||||
|
||||
private ResponseEntity<byte[]> forward(
|
||||
HttpServletRequest request,
|
||||
byte[] body,
|
||||
String contentType,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
BypassForwardOptions options = BypassForwardOptions.builder()
|
||||
.stripPrefix("/api/v1")
|
||||
.requestCustomizer((incomingRequest, context) ->
|
||||
createNotiHubRequest(incomingRequest, contentType, ctx))
|
||||
.build();
|
||||
|
||||
BypassResponse response;
|
||||
try {
|
||||
response = bypassClient.forward("noti-hub", request, body, options);
|
||||
} catch (BusinessException e) {
|
||||
if ("BYPASS_CALL_FAILED".equals(e.getCode())) {
|
||||
throw BusinessException.of(
|
||||
HttpStatus.BAD_GATEWAY,
|
||||
"NOTI_HUB_CALL_FAILED",
|
||||
"noti-hub에 연결할 수 없습니다."
|
||||
);
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
ResponseEntity<byte[]> result = toResponseEntity(response, request);
|
||||
requireSuccessfulResponse(result);
|
||||
return result;
|
||||
}
|
||||
|
||||
private ResponseEntity<byte[]> relayMultipart(
|
||||
HttpServletRequest request,
|
||||
MultiValueMap<String, Object> parts,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
ByteArrayOutputStream bodyBuffer = new ByteArrayOutputStream();
|
||||
HttpHeaders multipartHeaders = new HttpHeaders();
|
||||
HttpOutputMessage output = new HttpOutputMessage() {
|
||||
@Override
|
||||
public OutputStream getBody() {
|
||||
return bodyBuffer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HttpHeaders getHeaders() {
|
||||
return multipartHeaders;
|
||||
}
|
||||
};
|
||||
|
||||
FormHttpMessageConverter converter = new FormHttpMessageConverter();
|
||||
converter.setCharset(StandardCharsets.UTF_8);
|
||||
|
||||
try {
|
||||
converter.write(parts, MediaType.MULTIPART_FORM_DATA, output);
|
||||
} catch (IOException e) {
|
||||
throw BusinessException.internalError(
|
||||
"NOTI_HUB_REQUEST_READ_FAILED",
|
||||
"noti-hub 요청 파일을 읽을 수 없습니다."
|
||||
);
|
||||
}
|
||||
|
||||
return forward(
|
||||
request,
|
||||
bodyBuffer.toByteArray(),
|
||||
multipartHeaders.getFirst(HttpHeaders.CONTENT_TYPE),
|
||||
ctx
|
||||
);
|
||||
}
|
||||
|
||||
private BypassRequest createNotiHubRequest(
|
||||
BypassRequest incomingRequest,
|
||||
String contentType,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return BypassRequest.builder()
|
||||
.method(incomingRequest.method())
|
||||
.path(toNotiHubPath(incomingRequest.path()))
|
||||
.queryParams(queryWithAuthenticatedUser(incomingRequest.queryParams(), ctx))
|
||||
.headers(createApiKeyHeaders(contentType))
|
||||
.body(incomingRequest.body())
|
||||
.build();
|
||||
}
|
||||
|
||||
private String toNotiHubPath(String path) {
|
||||
String notiHubPath = replacePathPrefix(path, "/message-template", "/template");
|
||||
notiHubPath = replacePathPrefix(notiHubPath, "/message-report", "/report");
|
||||
return replacePathPrefix(notiHubPath, "/report/bulk-detail-excel", "/report/bulk-detail/excel");
|
||||
}
|
||||
|
||||
private String replacePathPrefix(String path, String prefix, String replacement) {
|
||||
if (path.equals(prefix) || path.startsWith(prefix + "/")) {
|
||||
return replacement + path.substring(prefix.length());
|
||||
}
|
||||
return path;
|
||||
}
|
||||
|
||||
private Map<String, List<String>> queryWithAuthenticatedUser(
|
||||
Map<String, List<String>> incomingQuery,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
Map<String, List<String>> query = new LinkedHashMap<>(incomingQuery);
|
||||
replaceUserParameter(query, "userId", ctx.getUserId());
|
||||
replaceUserParameter(query, "userCmpn", ctx.getUserCmpn());
|
||||
replaceUserParameter(query, "userTeam", ctx.getUserTeam());
|
||||
replaceUserParameter(query, "userName", ctx.getUserName());
|
||||
replaceUserParameter(query, "userRole", ctx.getUserRole());
|
||||
replaceUserParameter(query, "clientIp", ctx.getClientIp());
|
||||
replaceUserParameter(query, "authenticated", ctx.isAuthenticated());
|
||||
return query;
|
||||
}
|
||||
|
||||
private Map<String, List<String>> createApiKeyHeaders(String contentType) {
|
||||
Map<String, List<String>> headers = new LinkedHashMap<>();
|
||||
headers.put(apiKeyHeaderName, List.of(apiKey));
|
||||
if (contentType != null) {
|
||||
headers.put(HttpHeaders.CONTENT_TYPE, List.of(contentType));
|
||||
}
|
||||
return headers;
|
||||
}
|
||||
|
||||
private ResponseEntity<byte[]> toResponseEntity(
|
||||
BypassResponse response,
|
||||
HttpServletRequest request
|
||||
) {
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.putAll(response.httpHeaders());
|
||||
|
||||
boolean successful = HttpStatusCode.valueOf(response.statusCode()).is2xxSuccessful();
|
||||
boolean attachmentDownload = request.getRequestURI().endsWith("/attachment");
|
||||
if (successful && attachmentDownload && headers.getContentType() == null) {
|
||||
headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
|
||||
}
|
||||
|
||||
return ResponseEntity.status(response.statusCode())
|
||||
.headers(headers)
|
||||
.body(response.body());
|
||||
}
|
||||
|
||||
private HttpEntity<?> toFilePart(MultipartFile file) {
|
||||
String contentType = file.getContentType();
|
||||
MediaType mediaType = contentType == null
|
||||
? MediaType.APPLICATION_OCTET_STREAM
|
||||
: MediaType.parseMediaType(contentType);
|
||||
|
||||
HttpHeaders fileHeaders = new HttpHeaders();
|
||||
fileHeaders.setContentType(mediaType);
|
||||
return new HttpEntity<>(file.getResource(), fileHeaders);
|
||||
}
|
||||
|
||||
private void replaceUserParameter(Map<String, List<String>> query, String name, Object value) {
|
||||
query.remove(name);
|
||||
if (value != null) {
|
||||
query.put(name, List.of(String.valueOf(value)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
40
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubBulkSendInfoDto.java
vendored
Normal file
40
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubBulkSendInfoDto.java
vendored
Normal file
@@ -0,0 +1,40 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "NotiHub bulk send history")
|
||||
public class NotiHubBulkSendInfoDto extends NotiHubExtensibleDto {
|
||||
|
||||
private String bulkSendKey;
|
||||
|
||||
private String reqstSvc;
|
||||
|
||||
private String prjctCd;
|
||||
|
||||
private Long tmplatIdx;
|
||||
|
||||
private Boolean resve;
|
||||
|
||||
private LocalDateTime sendDt;
|
||||
|
||||
private Integer trgtCnt;
|
||||
|
||||
private Integer sendCnt;
|
||||
|
||||
private Integer succesCnt;
|
||||
|
||||
private Integer failCnt;
|
||||
|
||||
private LocalDateTime completeDt;
|
||||
|
||||
private String regUser;
|
||||
|
||||
private LocalDateTime regDt;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
24
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubExtensibleDto.java
vendored
Normal file
24
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubExtensibleDto.java
vendored
Normal file
@@ -0,0 +1,24 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonAnyGetter;
|
||||
import com.fasterxml.jackson.annotation.JsonAnySetter;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public abstract class NotiHubExtensibleDto {
|
||||
|
||||
private final Map<String, JsonNode> additionalProperties = new LinkedHashMap<>();
|
||||
|
||||
@JsonAnyGetter
|
||||
@Schema(hidden = true)
|
||||
public Map<String, JsonNode> getAdditionalProperties() {
|
||||
return additionalProperties;
|
||||
}
|
||||
|
||||
@JsonAnySetter
|
||||
public void setAdditionalProperty(String name, JsonNode value) {
|
||||
additionalProperties.put(name, value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "NotiHub report Excel download")
|
||||
public class NotiHubReportExcelResponseDto extends NotiHubExtensibleDto {
|
||||
|
||||
private String fileName;
|
||||
|
||||
private String fileBase64;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonAnyGetter;
|
||||
import com.fasterxml.jackson.annotation.JsonAnySetter;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.kri.common.feature.web.page.PageRequestDto;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Schema(description = "NotiHub report page request")
|
||||
public class NotiHubReportPageRequestDto extends PageRequestDto {
|
||||
|
||||
private final Map<String, JsonNode> additionalProperties = new LinkedHashMap<>();
|
||||
|
||||
@JsonAnyGetter
|
||||
@Schema(hidden = true)
|
||||
public Map<String, JsonNode> getAdditionalProperties() {
|
||||
return additionalProperties;
|
||||
}
|
||||
|
||||
@JsonAnySetter
|
||||
public void setAdditionalProperty(String name, JsonNode value) {
|
||||
additionalProperties.put(name, value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonUnwrapped;
|
||||
import com.kri.common.feature.web.page.PageResponseDto;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.List;
|
||||
import lombok.Getter;
|
||||
|
||||
@Schema(description = "NotiHub report page response")
|
||||
public class NotiHubReportPageResponseDto<T> extends NotiHubExtensibleDto {
|
||||
|
||||
@Getter
|
||||
@JsonUnwrapped
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private final PageResponseDto<T> page;
|
||||
|
||||
// The shared response has no public Jackson constructor; adapt without recalculating metadata.
|
||||
@JsonCreator
|
||||
public NotiHubReportPageResponseDto(
|
||||
@JsonProperty("content") List<T> content,
|
||||
@JsonProperty("totalElements") long totalElements,
|
||||
@JsonProperty("totalPages") int totalPages,
|
||||
@JsonProperty("pageIndex") int pageIndex,
|
||||
@JsonProperty("pageSize") int pageSize,
|
||||
@JsonProperty("numberOfElements") int numberOfElements,
|
||||
@JsonProperty("first") boolean first,
|
||||
@JsonProperty("last") boolean last,
|
||||
@JsonProperty("empty") boolean empty
|
||||
) {
|
||||
page = PageResponseDto.<T>builder()
|
||||
.content(content)
|
||||
.totalElements(totalElements)
|
||||
.totalPages(totalPages)
|
||||
.pageIndex(pageIndex)
|
||||
.pageSize(pageSize)
|
||||
.numberOfElements(numberOfElements)
|
||||
.first(first)
|
||||
.last(last)
|
||||
.empty(empty)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
60
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubSendResultInfoDto.java
vendored
Normal file
60
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubSendResultInfoDto.java
vendored
Normal file
@@ -0,0 +1,60 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "NotiHub send result")
|
||||
public class NotiHubSendResultInfoDto extends NotiHubExtensibleDto {
|
||||
|
||||
private String cmid;
|
||||
|
||||
private String bulkSendKey;
|
||||
|
||||
private String itrntPrjctCd;
|
||||
|
||||
private String reqstSvc;
|
||||
|
||||
private String prjctCd;
|
||||
|
||||
private String sid;
|
||||
|
||||
private Short sendTy;
|
||||
|
||||
private Boolean resve;
|
||||
|
||||
private Short resultCode;
|
||||
|
||||
private String resultLabel;
|
||||
|
||||
private String resultViewLabel;
|
||||
|
||||
private Long tmplatIdx;
|
||||
|
||||
private String kkoTmplatCd;
|
||||
|
||||
private String sendEml;
|
||||
|
||||
private String sendTel;
|
||||
|
||||
private String sendNm;
|
||||
|
||||
private LocalDateTime sendDt;
|
||||
|
||||
private String destEml;
|
||||
|
||||
private String destNm;
|
||||
|
||||
private String destTel;
|
||||
|
||||
private String regCmpn;
|
||||
|
||||
private String regUser;
|
||||
|
||||
private LocalDateTime regDt;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "NotiHub send result summary request")
|
||||
public class NotiHubSendResultSummaryRequestDto extends NotiHubExtensibleDto {
|
||||
|
||||
private String bulkSendKey;
|
||||
|
||||
private String itrntPrjctCd;
|
||||
|
||||
private String reqstSvc;
|
||||
|
||||
private String prjctCd;
|
||||
|
||||
private LocalDateTime sendStartDt;
|
||||
|
||||
private LocalDateTime sendEndDt;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.math.BigDecimal;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "NotiHub send result summary")
|
||||
public class NotiHubSendResultSummaryResponseDto extends NotiHubExtensibleDto {
|
||||
|
||||
private Short sendTy;
|
||||
|
||||
private Short sendCorp;
|
||||
|
||||
private Long successCount;
|
||||
|
||||
private Long failCount;
|
||||
|
||||
private Long standByCount;
|
||||
|
||||
private Long totalCount;
|
||||
|
||||
private BigDecimal price;
|
||||
|
||||
private BigDecimal cost;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
60
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubTemplateBasicDto.java
vendored
Normal file
60
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubTemplateBasicDto.java
vendored
Normal file
@@ -0,0 +1,60 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.Email;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "NotiHub template creation request")
|
||||
public class NotiHubTemplateBasicDto extends NotiHubExtensibleDto {
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 32)
|
||||
private String itrntPrjctCd;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "NotiHub SendType code")
|
||||
private Short tmplatTy;
|
||||
|
||||
@Schema(description = "NotiHub TemplatePurpose code", allowableValues = {"0", "1"})
|
||||
private Short tmplatPurpose;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 32)
|
||||
private String tmplatNm;
|
||||
|
||||
@Size(max = 128)
|
||||
private String tmplatTitle;
|
||||
|
||||
@NotBlank
|
||||
private String tmplatBody;
|
||||
|
||||
private String senderKey;
|
||||
|
||||
private String kkoTmplatCd;
|
||||
|
||||
private String nationCd;
|
||||
|
||||
@Schema(accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String atchFl;
|
||||
|
||||
private Short delayTime;
|
||||
|
||||
@Size(max = 16)
|
||||
private String sendTel;
|
||||
|
||||
@Email
|
||||
@Size(max = 64)
|
||||
private String sendEml;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 32)
|
||||
private String sendNm;
|
||||
}
|
||||
30
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubTemplateDetailDto.java
vendored
Normal file
30
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubTemplateDetailDto.java
vendored
Normal file
@@ -0,0 +1,30 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "NotiHub template detail and update request")
|
||||
public class NotiHubTemplateDetailDto extends NotiHubTemplateBasicDto {
|
||||
|
||||
@NotNull
|
||||
private Long tmplatIdx;
|
||||
|
||||
@Schema(accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String regUser;
|
||||
|
||||
@Schema(accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private LocalDateTime regDt;
|
||||
|
||||
@Schema(accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String modUser;
|
||||
|
||||
@Schema(accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private LocalDateTime modDt;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.kri.contact.server.common.external.notihub;
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
19
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubTemplateSummaryDto.java
vendored
Normal file
19
src/main/java/com/kri/contact/server/common/external/notihub/dto/NotiHubTemplateSummaryDto.java
vendored
Normal file
@@ -0,0 +1,19 @@
|
||||
package com.kri.contact.server.common.external.notihub.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "NotiHub template summary")
|
||||
public class NotiHubTemplateSummaryDto extends NotiHubExtensibleDto {
|
||||
|
||||
private Long tmplatIdx;
|
||||
|
||||
private String tmplatNm;
|
||||
|
||||
private Short tmplatPurpose;
|
||||
}
|
||||
@@ -3,7 +3,6 @@ package com.kri.contact.server.controller;
|
||||
import static com.kri.contact.server.common.util.ExcelResponseBuilder.buildExcelResponse;
|
||||
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.CollectionUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.common.feature.web.page.PageResponseDto;
|
||||
@@ -34,7 +33,6 @@ import java.nio.charset.StandardCharsets;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
|
||||
@@ -10,7 +10,6 @@ import com.kri.contact.server.service.ListUpdateService;
|
||||
import com.kri.contact.server.service.ProjectService;
|
||||
import com.kri.contact.server.service.common.SystemEventLogService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
@@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.PatchMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
package com.kri.contact.server.controller;
|
||||
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportExcelResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportPageRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportPageResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultSummaryRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultSummaryResponseDto;
|
||||
import com.kri.contact.server.service.MessageResultService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.validation.Valid;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/message-report")
|
||||
@RequiredArgsConstructor
|
||||
@Tag(name = "Message Report", description = "Message report API")
|
||||
public class MessageReportController {
|
||||
|
||||
private final MessageResultService messageResultService;
|
||||
|
||||
@GetMapping("/bulk-list/{sendTy}/{reqstSvc}/{prjctCd}")
|
||||
public ResponseEntity<List<NotiHubBulkSendInfoDto>> getBulkList(
|
||||
@PathVariable Integer sendTy,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageResultService.getBulkList(request, ctx);
|
||||
}
|
||||
|
||||
@GetMapping("/send-result/{sid}/{prjctCd}/{reqstSvc}")
|
||||
public ResponseEntity<List<NotiHubSendResultInfoDto>> getSendResult(
|
||||
@RequestParam(required = false) Integer channelTy,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageResultService.getSendResult(request, ctx);
|
||||
}
|
||||
|
||||
@PostMapping(value = "/bulk-detail/{bulkSendKey}", consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<NotiHubReportPageResponseDto<NotiHubSendResultInfoDto>> getBulkDetail(
|
||||
@Valid @RequestBody NotiHubReportPageRequestDto body,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageResultService.getBulkDetail(body, request, ctx);
|
||||
}
|
||||
|
||||
@PostMapping("/bulk-detail-excel/{bulkSendKey}")
|
||||
public ResponseEntity<NotiHubReportExcelResponseDto> getBulkDetailExcel(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageResultService.getBulkDetailExcel(request, ctx);
|
||||
}
|
||||
|
||||
@PostMapping(value = "/send-result-summary", consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<NotiHubSendResultSummaryResponseDto>> getSendResultSummary(
|
||||
@Valid @RequestBody NotiHubSendResultSummaryRequestDto body,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageResultService.getSendResultSummary(body, request, ctx);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.kri.contact.server.controller;
|
||||
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.contact.server.dto.message.MessageBulkSendResponseDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendBulkResponseDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendBulkRequestDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendSingleRequestDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendSingleResponseDto;
|
||||
import com.kri.contact.server.service.MessageService;
|
||||
import com.kri.contact.server.service.MessageSendService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
@@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/message")
|
||||
@RequestMapping("/api/v1/message-send")
|
||||
@RequiredArgsConstructor
|
||||
@Tag(name = "Message", description = "Message send API")
|
||||
public class MessageController {
|
||||
public class MessageSendController {
|
||||
|
||||
private final MessageService messageService;
|
||||
private final MessageSendService messageSendService;
|
||||
|
||||
@Operation(summary = "Email single send")
|
||||
@PostMapping("/email/single/{prjctIdx}")
|
||||
@@ -31,17 +31,17 @@ public class MessageController {
|
||||
@Valid @RequestBody MessageSendSingleRequestDto request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageService.sendEmailSingle(prjctIdx, request, ctx);
|
||||
return messageSendService.sendEmailSingle(prjctIdx, request, ctx);
|
||||
}
|
||||
|
||||
@Operation(summary = "Email bulk send")
|
||||
@PostMapping("/email/bulk/{prjctIdx}")
|
||||
public MessageBulkSendResponseDto sendEmailBulk(
|
||||
public MessageSendBulkResponseDto sendEmailBulk(
|
||||
@PathVariable Long prjctIdx,
|
||||
@Valid @RequestBody MessageSendBulkRequestDto request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageService.sendEmailBulk(prjctIdx, request, ctx);
|
||||
return messageSendService.sendEmailBulk(prjctIdx, request, ctx);
|
||||
}
|
||||
|
||||
@Operation(summary = "SMS single send")
|
||||
@@ -51,16 +51,16 @@ public class MessageController {
|
||||
@Valid @RequestBody MessageSendSingleRequestDto request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageService.sendSmsSingle(prjctIdx, request, ctx);
|
||||
return messageSendService.sendSmsSingle(prjctIdx, request, ctx);
|
||||
}
|
||||
|
||||
@Operation(summary = "SMS bulk send")
|
||||
@PostMapping("/sms/bulk/{prjctIdx}")
|
||||
public MessageBulkSendResponseDto sendSmsBulk(
|
||||
public MessageSendBulkResponseDto sendSmsBulk(
|
||||
@PathVariable Long prjctIdx,
|
||||
@Valid @RequestBody MessageSendBulkRequestDto request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageService.sendSmsBulk(prjctIdx, request, ctx);
|
||||
return messageSendService.sendSmsBulk(prjctIdx, request, ctx);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
package com.kri.contact.server.controller;
|
||||
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateBasicDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateDetailDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateSummaryDto;
|
||||
import com.kri.contact.server.service.MessageTemplateService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.validation.Valid;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PatchMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RequestPart;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/message-template")
|
||||
@RequiredArgsConstructor
|
||||
@Tag(name = "Message Template", description = "Message template API")
|
||||
public class MessageTemplateController {
|
||||
|
||||
private final MessageTemplateService messageTemplateService;
|
||||
|
||||
@GetMapping("/list/{chnnlTy}/{itrntPrjctCd}")
|
||||
public ResponseEntity<List<NotiHubTemplateSummaryDto>> getTemplateList(
|
||||
@PathVariable Integer chnnlTy,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageTemplateService.getTemplateList(request, ctx);
|
||||
}
|
||||
|
||||
@GetMapping("/{tmplatIdx:[0-9]+}")
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> getTemplate(
|
||||
@PathVariable Long tmplatIdx,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageTemplateService.getTemplate(request, ctx);
|
||||
}
|
||||
|
||||
@GetMapping("/{tmplatIdx:[0-9]+}/attachment")
|
||||
public ResponseEntity<byte[]> getAttachment(
|
||||
@PathVariable Long tmplatIdx,
|
||||
@RequestParam String fileName,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageTemplateService.getAttachment(request, ctx);
|
||||
}
|
||||
|
||||
@PutMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> createTemplate(
|
||||
@Valid @RequestPart("template") NotiHubTemplateBasicDto template,
|
||||
@RequestPart(value = "files", required = false) List<MultipartFile> files,
|
||||
@RequestParam(value = "deleteFileNames", required = false) List<String> deleteFileNames,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageTemplateService.createTemplate(template, files, deleteFileNames, request, ctx);
|
||||
}
|
||||
|
||||
@PatchMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> updateTemplate(
|
||||
@Valid @RequestPart("template") NotiHubTemplateDetailDto template,
|
||||
@RequestPart(value = "files", required = false) List<MultipartFile> files,
|
||||
@RequestParam(value = "deleteFileNames", required = false) List<String> deleteFileNames,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageTemplateService.updateTemplate(template, files, deleteFileNames, request, ctx);
|
||||
}
|
||||
|
||||
@PutMapping(value = "/body-image/{itrntPrjctCd}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||
public ResponseEntity<String> uploadBodyImage(
|
||||
@RequestPart("file") MultipartFile file,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return messageTemplateService.uploadBodyImage(file, request, ctx);
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,6 @@ package com.kri.contact.server.controller;
|
||||
import com.kri.contact.server.common.enums.ResultCodeType;
|
||||
import com.kri.contact.server.dto.project.ResultCodeDto;
|
||||
import com.kri.contact.server.service.ResultCodeService;
|
||||
import com.kri.contact.server.service.common.SystemEventLogService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import java.util.List;
|
||||
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
@Tag(name = "Result Code", description = "결과 코드 API")
|
||||
public class ResultCodeController {
|
||||
|
||||
private final SystemEventLogService systemEventLogService;
|
||||
private final ResultCodeService resultCodeService;
|
||||
|
||||
@Operation(summary = "결과 코드 조회")
|
||||
|
||||
@@ -18,7 +18,6 @@ import java.time.LocalDateTime;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.kri.contact.server.common.enums.ListAssignType;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.kri.contact.server.common.enums.ListAssignType;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.kri.contact.server.dto.list;
|
||||
import com.kri.contact.server.common.enums.ResultCodeType;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@@ -4,8 +4,6 @@ import com.kri.common.feature.web.page.PageRequestDto;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.contact.server.dto.list;
|
||||
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubSendResultLastWithSidDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultLastWithSidDto;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -10,7 +10,7 @@ import lombok.Getter;
|
||||
@Getter
|
||||
@Builder
|
||||
@Schema(description = "MessageBulkSendResponseDto")
|
||||
public class MessageBulkSendResponseDto {
|
||||
public class MessageSendBulkResponseDto {
|
||||
|
||||
@Schema(description = "bulkSendKey")
|
||||
private String bulkSendKey;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.contact.server.dto.message;
|
||||
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubSendSingleResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendSingleResponseDto;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.Map;
|
||||
import lombok.Builder;
|
||||
|
||||
@@ -6,7 +6,6 @@ import com.kri.contact.server.dto.list.ListHeaderDto;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.EmbeddedId;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Lob;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
@@ -5,7 +5,6 @@ import com.kri.contact.server.persistence.entity.id.TListItemEntityId;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.EmbeddedId;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Lob;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
@@ -8,7 +8,6 @@ import jakarta.persistence.Table;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
package com.kri.contact.server.persistence.entity;
|
||||
|
||||
import io.hypersistence.utils.hibernate.type.json.JsonType;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Map;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
import org.hibernate.annotations.Type;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.kri.contact.server.persistence.entity.TListEntity;
|
||||
import com.kri.contact.server.persistence.entity.id.TListEntityId;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
|
||||
@@ -5,7 +5,6 @@ import java.io.IOException;
|
||||
import java.nio.file.DirectoryStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.attribute.BasicFileAttributes;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
|
||||
@@ -13,13 +13,10 @@ import com.kri.contact.server.common.enums.ListIsUse;
|
||||
import com.kri.contact.server.common.enums.ListSearchResponseType;
|
||||
import com.kri.contact.server.common.enums.ResultCodeType;
|
||||
import com.kri.contact.server.common.external.notihub.ChannelType;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubApiClient;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubSendResultLastWithSidDto;
|
||||
import com.kri.contact.server.dto.common.DateRangeDto;
|
||||
import com.kri.contact.server.dto.list.ListContactResultDto;
|
||||
import com.kri.contact.server.dto.list.ListFilterDto;
|
||||
import com.kri.contact.server.dto.list.ListHeaderDto;
|
||||
import com.kri.contact.server.dto.list.ListResultBaseDto;
|
||||
import com.kri.contact.server.dto.list.ListSearchBaseDto;
|
||||
import com.kri.contact.server.dto.list.ListSearchExternalDto;
|
||||
import com.kri.contact.server.dto.list.ListSearchRequestDto;
|
||||
|
||||
@@ -41,7 +41,6 @@ import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListItemRow
|
||||
import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListRowInsert;
|
||||
import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.TmpSpecialRow;
|
||||
import com.kri.contact.server.persistence.repository.CmpnRepository;
|
||||
import com.kri.contact.server.persistence.repository.ListRepository;
|
||||
import com.kri.contact.server.persistence.repository.ListHeaderRepository;
|
||||
import com.kri.contact.server.persistence.repository.ListItemFileRepository;
|
||||
import com.kri.contact.server.persistence.repository.ListUploadLogRepository;
|
||||
@@ -72,7 +71,6 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
@RequiredArgsConstructor
|
||||
public class ListUploadService {
|
||||
|
||||
private final ListRepository listRepository;
|
||||
private final ListHeaderRepository listHeaderRepository;
|
||||
private final ListItemFileRepository listItemFileRepository;
|
||||
private final CmpnRepository cmpnRepository;
|
||||
|
||||
@@ -2,48 +2,34 @@ package com.kri.contact.server.service;
|
||||
|
||||
import static com.kri.contact.server.common.consts.ContactConstant.REQUEST_SERVICE;
|
||||
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.contact.server.common.enums.ListHeaderType;
|
||||
import com.kri.contact.server.common.enums.ListIsUse;
|
||||
import com.kri.contact.server.common.external.notihub.ChannelType;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportExcelResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportPageRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubReportPageResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultSummaryRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendResultSummaryResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubApiClient;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubBulkSendCreateRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubBulkSendResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubDestInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubSendRequestBulkDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubSendRequestSingleDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubTemplateDto;
|
||||
import com.kri.contact.server.dto.list.ListHeaderDto;
|
||||
import com.kri.contact.server.dto.list.ListSendResultDto;
|
||||
import com.kri.contact.server.dto.message.MessageBulkSendResponseDto;
|
||||
import com.kri.contact.server.dto.message.MessageFailedChunkDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendBulkRequestDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendSingleRequestDto;
|
||||
import com.kri.contact.server.dto.project.ProjectInfoDto;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class MessageResultService {
|
||||
|
||||
private final NotiHubApiClient notiHubApiClient;
|
||||
|
||||
public Map<String, ListSendResultDto> findSendResultMap(
|
||||
ChannelType channelTy,
|
||||
String prjctCd,
|
||||
@@ -70,4 +56,41 @@ public class MessageResultService {
|
||||
LinkedHashMap::new
|
||||
));
|
||||
}
|
||||
|
||||
public ResponseEntity<List<NotiHubBulkSendInfoDto>> getBulkList(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return notiHubApiClient.getBulkList(request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<List<NotiHubSendResultInfoDto>> getSendResult(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return notiHubApiClient.getSendResult(request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubReportPageResponseDto<NotiHubSendResultInfoDto>> getBulkDetail(
|
||||
NotiHubReportPageRequestDto body,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return notiHubApiClient.getBulkDetail(body, request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubReportExcelResponseDto> getBulkDetailExcel(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return notiHubApiClient.getBulkDetailExcel(request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<List<NotiHubSendResultSummaryResponseDto>> getSendResultSummary(
|
||||
NotiHubSendResultSummaryRequestDto body,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return notiHubApiClient.getSendResultSummary(body, request, ctx);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,16 +10,15 @@ import com.kri.contact.server.common.enums.ChannelType;
|
||||
import com.kri.contact.server.common.enums.ListHeaderType;
|
||||
import com.kri.contact.server.common.enums.ListIsUse;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubApiClient;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubBulkSendCreateRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubBulkSendResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubDestInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubSendRequestBulkDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubSendRequestSingleDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubSendSingleResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubTemplateDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendCreateRequestDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubBulkSendResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubDestInfoDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendRequestBulkDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendRequestSingleDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubSendSingleResponseDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateDto;
|
||||
import com.kri.contact.server.dto.list.ListHeaderDto;
|
||||
import com.kri.contact.server.dto.list.ListSendResultDto;
|
||||
import com.kri.contact.server.dto.message.MessageBulkSendResponseDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendBulkResponseDto;
|
||||
import com.kri.contact.server.dto.message.MessageFailedChunkDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendBulkRequestDto;
|
||||
import com.kri.contact.server.dto.message.MessageSendSingleRequestDto;
|
||||
@@ -27,7 +26,6 @@ import com.kri.contact.server.dto.message.MessageSendSingleResponseDto;
|
||||
import com.kri.contact.server.dto.project.ProjectInfoDto;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
@@ -46,7 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class MessageService {
|
||||
public class MessageSendService {
|
||||
private static final int BULK_SEND_CHUNK_SIZE = 1_000;
|
||||
private static final Pattern TEMPLATE_PARAM_PATTERN = Pattern.compile("(?:\\[\\$|#\\{)([^\\]}]+)(?:]|})");
|
||||
|
||||
@@ -74,12 +72,12 @@ public class MessageService {
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public MessageBulkSendResponseDto sendEmailBulk(Long prjctIdx, MessageSendBulkRequestDto request, RequestUserContext ctx) {
|
||||
public MessageSendBulkResponseDto sendEmailBulk(Long prjctIdx, MessageSendBulkRequestDto request, RequestUserContext ctx) {
|
||||
return sendBulk(prjctIdx, request, ctx, ChannelType.EMAIL);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public MessageBulkSendResponseDto sendSmsBulk(Long prjctIdx, MessageSendBulkRequestDto request, RequestUserContext ctx) {
|
||||
public MessageSendBulkResponseDto sendSmsBulk(Long prjctIdx, MessageSendBulkRequestDto request, RequestUserContext ctx) {
|
||||
return sendBulk(prjctIdx, request, ctx, ChannelType.SMS);
|
||||
}
|
||||
|
||||
@@ -133,7 +131,7 @@ public class MessageService {
|
||||
return MessageSendSingleResponseDto.from(response);
|
||||
}
|
||||
|
||||
private MessageBulkSendResponseDto sendBulk(
|
||||
private MessageSendBulkResponseDto sendBulk(
|
||||
Long prjctIdx,
|
||||
MessageSendBulkRequestDto request,
|
||||
RequestUserContext ctx,
|
||||
@@ -183,7 +181,7 @@ public class MessageService {
|
||||
}
|
||||
}
|
||||
|
||||
return MessageBulkSendResponseDto.builder()
|
||||
return MessageSendBulkResponseDto.builder()
|
||||
.bulkSendKey(bulkSendKey)
|
||||
.targetCount(destInfos.size())
|
||||
.requestCount(requestCount)
|
||||
@@ -0,0 +1,81 @@
|
||||
package com.kri.contact.server.service;
|
||||
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateBasicDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateDetailDto;
|
||||
import com.kri.contact.server.common.external.notihub.dto.NotiHubTemplateSummaryDto;
|
||||
import com.kri.contact.server.common.external.notihub.NotiHubApiClient;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class MessageTemplateService {
|
||||
|
||||
private final NotiHubApiClient notiHubApiClient;
|
||||
|
||||
public ResponseEntity<List<NotiHubTemplateSummaryDto>> getTemplateList(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return notiHubApiClient.getTemplateList(request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> getTemplate(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return notiHubApiClient.getTemplate(request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<byte[]> getAttachment(
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
return notiHubApiClient.getTemplateAttachment(request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> createTemplate(
|
||||
NotiHubTemplateBasicDto template,
|
||||
List<MultipartFile> files,
|
||||
List<String> deleteFileNames,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
validateTemplateManager(ctx);
|
||||
return notiHubApiClient.createTemplate(template, files, deleteFileNames, request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<NotiHubTemplateDetailDto> updateTemplate(
|
||||
NotiHubTemplateDetailDto template,
|
||||
List<MultipartFile> files,
|
||||
List<String> deleteFileNames,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
validateTemplateManager(ctx);
|
||||
return notiHubApiClient.updateTemplate(template, files, deleteFileNames, request, ctx);
|
||||
}
|
||||
|
||||
public ResponseEntity<String> uploadBodyImage(
|
||||
MultipartFile file,
|
||||
HttpServletRequest request,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
validateTemplateManager(ctx);
|
||||
return notiHubApiClient.uploadBodyImage(file, request, ctx);
|
||||
}
|
||||
|
||||
|
||||
private void validateTemplateManager(RequestUserContext ctx) {
|
||||
Integer role = ctx.getUserRole();
|
||||
if (role == null || role < 1000 || role >= 4000) {
|
||||
throw BusinessException.forbidden("MESSAGE_TEMPLATE_FORBIDDEN", "템플릿을 관리할 권한이 없습니다.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.kri.contact.server.common.enums.SystemEventType;
|
||||
import com.kri.contact.server.dto.list.ListAssignRequestDto;
|
||||
import com.kri.contact.server.dto.list.ListAssignResetRequestDto;
|
||||
import com.kri.contact.server.dto.list.ListFilterDto;
|
||||
import com.kri.contact.server.dto.list.ListHeaderDto;
|
||||
import com.kri.contact.server.dto.list.ListResetRequestDto;
|
||||
import com.kri.contact.server.dto.list.ListUpdateRequestDto;
|
||||
|
||||
@@ -33,6 +33,18 @@ springdoc:
|
||||
operations-sorter: method
|
||||
|
||||
kri:
|
||||
http:
|
||||
bypass:
|
||||
enabled: true
|
||||
connect-timeout: 10s
|
||||
request-timeout: 30s
|
||||
targets:
|
||||
noti-hub:
|
||||
base-url: ${kri.api-url.noti-hub}
|
||||
allowed-paths:
|
||||
- /message-template
|
||||
- /message-template/**
|
||||
- /message-report/**
|
||||
auth:
|
||||
apikey:
|
||||
key: "4B726963-436F6E74616374-53657276696365-402531213230"
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
package com.kri.contact.server;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
@SpringBootTest
|
||||
class ContactServerApplicationTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user