260714_01_ENH: 테스트 서버에서 기동 후 중간 테스트를 위한 커밋

This commit is contained in:
2026-07-14 10:01:05 +09:00
parent 88d65bebe0
commit 50ecd6bf6b
162 changed files with 6790 additions and 907 deletions

View File

@@ -2,14 +2,17 @@ package com.kri.contact.server.controller;
import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.feature.web.RequestUserContext;
import com.kri.contact.server.dto.list.ListAssignRequestDto;
import com.kri.contact.server.dto.list.ListAssignResetRequestDto;
import com.kri.contact.server.service.AssignService;
import com.kri.contact.server.service.SystemEventLogService;
import com.kri.contact.server.service.common.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import java.time.LocalDateTime;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
@@ -26,19 +29,19 @@ public class AssignController {
private final SystemEventLogService systemEventLogService;
private final AssignService assignService;
@Operation(summary = "배정된 외주사 조회")
@GetMapping("/prjct-outsource/{prjctIdx}")
public List<String> getPrjctOutsourceAssign(@PathVariable Long prjctIdx) {
return assignService.getPrjctOutsourceAssign(prjctIdx);
}
@Operation(summary = "배정된 컨택원/면접원 조회")
@Operation(summary = "프로젝트 fieldwork 배정 조회")
@GetMapping("/prjct-fieldwork/{prjctIdx}")
public List<String> getPrjctFieldworkAssign(@PathVariable Long prjctIdx) {
return assignService.getPrjctFieldworkAssign(prjctIdx);
}
@Operation(summary = "컨택원/면접원 배정")
@Operation(summary = "프로젝트 회사 배정 조회")
@GetMapping("/prjct-cmpn/{prjctIdx}")
public List<String> getPrjctCmpnAssign(@PathVariable Long prjctIdx) {
return assignService.getPrjctCmpnAssign(prjctIdx);
}
@Operation(summary = "프로젝트 fieldwork 배정")
@PutMapping("/prjct-fieldwork/{prjctIdx}")
public void upsertPrjctFieldworkAssign(
@PathVariable Long prjctIdx,
@@ -50,4 +53,46 @@ public class AssignController {
systemEventLogService.writeAssignUserProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx,
assignUserIdList);
}
@Operation(summary = "프로젝트 회사 배정")
@PutMapping("/prjct-cmpn/{prjctIdx}")
public void upsertPrjctCmpnAssign(
@PathVariable Long prjctIdx,
@Valid @RequestBody List<String> assignCmpnIdList,
RequestUserContext ctx
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
assignService.upsertPrjctCmpnAssign(prjctIdx, assignCmpnIdList, ctx.getUserId(), now);
systemEventLogService.writeAssignCmpnProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx,
assignCmpnIdList);
}
@Operation(summary = "리스트 배정")
@PutMapping("/list/{prjctIdx}/{assignId}")
public Integer upsertListAssign(
@PathVariable Long prjctIdx,
@PathVariable String assignId,
@Valid @RequestBody ListAssignRequestDto req,
RequestUserContext ctx
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
Integer assignCnt = assignService.upsertListAssign(prjctIdx, assignId, req, ctx.getUserId(), now);
systemEventLogService.writeAssignList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, req);
return assignCnt;
}
@Operation(summary = "리스트 배정 초기화")
@DeleteMapping("/list/reset/{prjctIdx}")
public Integer resetListAssign(
@PathVariable Long prjctIdx,
@Valid @RequestBody ListAssignResetRequestDto req,
RequestUserContext ctx
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
Integer resetCnt = assignService.resetListAssign(prjctIdx, req);
systemEventLogService.writeAssignListReset(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, req);
return resetCnt;
}
}

View File

@@ -5,7 +5,7 @@ import com.kri.common.feature.web.RequestUserContext;
import com.kri.contact.server.dto.auth.LoginRequestDto;
import com.kri.contact.server.dto.auth.LoginResponseDto;
import com.kri.contact.server.service.AuthService;
import com.kri.contact.server.service.SystemEventLogService;
import com.kri.contact.server.service.common.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;

View File

@@ -0,0 +1,68 @@
package com.kri.contact.server.controller;
import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.feature.web.RequestUserContext;
import com.kri.contact.server.dto.cmpn.CmpnInfoDto;
import com.kri.contact.server.dto.common.DataVerificationDto;
import com.kri.contact.server.service.CmpnService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import java.time.LocalDateTime;
import java.util.List;
import lombok.RequiredArgsConstructor;
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.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/cmpn")
@RequiredArgsConstructor
@Tag(name = "Cmpn", description = "회사 관리 API")
public class CmpnController {
private final CmpnService cmpnService;
@Operation(summary = "회사 ID 사용 가능 여부 확인")
@GetMapping("/check-cmpn-id")
public DataVerificationDto checkCmpnId(@RequestParam String cmpnId) {
return cmpnService.checkCmpnId(cmpnId);
}
@Operation(summary = "회사 정보 조회")
@GetMapping("/{cmpnId}")
public CmpnInfoDto getCmpn(@PathVariable String cmpnId) {
return cmpnService.getCmpn(cmpnId);
}
@Operation(summary = "회사 목록 조회")
@GetMapping
public List<CmpnInfoDto> getCmpnList() {
return cmpnService.getCmpnList();
}
@Operation(summary = "회사 생성")
@PutMapping
public void createCmpn(
@Valid @RequestBody CmpnInfoDto cmpnInfo,
RequestUserContext ctx
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
cmpnService.createCmpn(cmpnInfo, ctx.getUserId(), now);
}
@Operation(summary = "회사 정보 수정")
@PatchMapping
public void updateCmpn(
@Valid @RequestBody CmpnInfoDto dto,
RequestUserContext ctx
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
cmpnService.updateCmpn(dto, ctx.getUserId(), now);
}
}

View File

@@ -0,0 +1,38 @@
package com.kri.contact.server.controller;
import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.feature.web.RequestUserContext;
import com.kri.contact.server.dto.list.ListCallHistDto;
import com.kri.contact.server.dto.list.ListCallHistRequestDto;
import com.kri.contact.server.service.ListCallHistService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/v1/list-call-hist")
@RequiredArgsConstructor
@Tag(name = "ListCallHistory", description = "List call history API")
public class ListCallHistController {
private final ListCallHistService listCallHistService;
@Operation(summary = "Save list call history")
@PutMapping("/{prjctIdx}/{sid}")
public ListCallHistDto saveCallHistory(
@PathVariable Long prjctIdx,
@PathVariable Integer sid,
@Valid @RequestBody ListCallHistRequestDto request,
RequestUserContext ctx
) {
LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
return listCallHistService.saveCallHistory(prjctIdx, sid, request, ctx.getUserId(), now);
}
}

View File

@@ -3,6 +3,7 @@ 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;
@@ -13,20 +14,30 @@ import com.kri.contact.server.dto.list.ListResetRequestDto;
import com.kri.contact.server.dto.list.ListSearchRequestDto;
import com.kri.contact.server.dto.list.ListSearchWithFullResultDto;
import com.kri.contact.server.dto.list.ListUpdateRequestDto;
import com.kri.contact.server.dto.list.ListUploadFileInfoDto;
import com.kri.contact.server.dto.list.ListUploadHistoryDto;
import com.kri.contact.server.dto.list.ListUploadRequestDto;
import com.kri.contact.server.dto.project.ProjectInfoDto;
import com.kri.contact.server.dto.systemlog.UploadContentDto;
import com.kri.contact.server.service.ListDownloadService;
import com.kri.contact.server.service.ListResetService;
import com.kri.contact.server.service.ListSearchService;
import com.kri.contact.server.service.ListUpdateService;
import com.kri.contact.server.service.ListUploadService;
import com.kri.contact.server.service.ProjectService;
import com.kri.contact.server.service.SystemEventLogService;
import com.kri.contact.server.service.common.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import java.net.URLEncoder;
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;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -56,7 +67,7 @@ public class ListController {
private final SystemEventLogService systemEventLogService;
@Operation(summary = "리스트 정보 조회 With Sid")
@GetMapping("/search/{prjctIdx}/{sid}")
@GetMapping("/search-sid/{prjctIdx}/{sid}")
public ListSearchWithFullResultDto searchListWithSid(
@PathVariable Long prjctIdx,
@PathVariable Integer sid
@@ -65,7 +76,7 @@ public class ListController {
}
@Operation(summary = "리스트 정보 조회 With Filter")
@PostMapping("/search/{prjctIdx}")
@PostMapping("/search-filter/{prjctIdx}")
public PageResponseDto<ListSearchWithFullResultDto> searchListWithFilter(
@PathVariable Long prjctIdx,
@Valid @RequestBody ListSearchRequestDto request
@@ -85,11 +96,29 @@ public class ListController {
return buildExcelResponse(projectInfoDto.getPrjctName() + " upload_template.xlsx", bytes);
}
@Operation(summary = "리스트 업로드 이력 조회")
@GetMapping("/excel/upload-history/{prjctIdx}")
public List<ListUploadHistoryDto> findUploadHistories(@PathVariable Long prjctIdx) {
getProjectOrThrow(prjctIdx);
return listUploadService.findUploadHistories(prjctIdx);
}
@Operation(summary = "리스트 업로드 파일 다운로드")
@PostMapping("/excel/upload-history/file/{prjctIdx}/{listUploadLogId}")
public ResponseEntity<byte[]> downloadUploadFile(
@PathVariable Long prjctIdx,
@PathVariable String listUploadLogId
) {
getProjectOrThrow(prjctIdx);
ListUploadFileInfoDto uploadFile = listUploadService.downloadUploadFile(prjctIdx, listUploadLogId);
return buildExcelResponse(uploadFile.getFileName(), uploadFile.getBytes());
}
@Operation(summary = "리스트 다운로드")
@PostMapping("/excel/download/{prjctIdx}")
public ResponseEntity<byte[]> downloadList(
@PathVariable Long prjctIdx,
@RequestBody(required = false) ListFilterDto listFilter
@Valid @RequestBody(required = false) ListFilterDto listFilter
) {
ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx);
byte[] bytes = listDownloadService.downloadList(prjctIdx, listFilter);
@@ -100,7 +129,7 @@ public class ListController {
@PostMapping("/excel/download/update/{prjctIdx}")
public ResponseEntity<byte[]> downloadListUpdateHistory(
@PathVariable Long prjctIdx,
@RequestBody(required = false) ListFilterDto listFilter
@Valid @RequestBody(required = false) ListFilterDto listFilter
) {
ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx);
byte[] bytes = listDownloadService.downloadSidWithUpdateHist(prjctIdx, listFilter);
@@ -119,7 +148,7 @@ public class ListController {
LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
ExcelUploadResultDto result = listUploadService.uploadExcel(prjctIdx, file, request, ctx.getUserId(), now);
systemEventLogService.writeUploadList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, file.getOriginalFilename());
systemEventLogService.writeUploadList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, UploadContentDto.from(file));
return result;
}
@@ -130,12 +159,46 @@ public class ListController {
@Valid @RequestBody ListUpdateRequestDto request,
RequestUserContext ctx
) {
validateListUpdateRequest(request);
LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
int updateCount = listUpdateService.updateList(prjctIdx, request, ctx.getUserRole(), ctx.getUserId(), now);
systemEventLogService.writeUpdateList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, request);
return updateCount;
}
@Operation(summary = "리스트 별 파일 업로드")
@PostMapping(value = "/item-file/upload/{prjctIdx}/{sid}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public void uploadItemFile(
@PathVariable Long prjctIdx,
@PathVariable Integer sid,
@RequestParam Map<String, MultipartFile> files,
RequestUserContext ctx
) {
getProjectOrThrow(prjctIdx);
LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
listUploadService.uploadItemFile(prjctIdx, sid, files, ctx.getUserRole(), ctx.getUserId(), now);
Map<String, UploadContentDto> contents = files.entrySet().stream()
.filter(e -> e.getValue() != null)
.collect(Collectors.toMap(
Map.Entry::getKey,
e -> UploadContentDto.from(e.getValue())
));
systemEventLogService.writeUploadListItemFiles(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, contents);
}
@Operation(summary = "리스트 별 업로드 파일 다운로드")
@PostMapping("/item-file/download/{prjctIdx}")
public ResponseEntity<byte[]> downloadItemFile(
@PathVariable Long prjctIdx,
@Valid @RequestBody(required = false) ListFilterDto listFilter
){
ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx);
byte[] bytes = listDownloadService.downloadItemFile(prjctIdx, listFilter);
return buildZipResponse(projectInfoDto.getPrjctName() + " item_files.zip", bytes);
}
@Operation(summary = "리스트 초기화")
@DeleteMapping("/{prjctIdx}")
public int resetList(
@@ -162,4 +225,23 @@ public class ListController {
}
return projectInfoDto;
}
private void validateListUpdateRequest(ListUpdateRequestDto request){
if(
CollectionUtil.isEmpty(request.getUpdateContents()) &&
CollectionUtil.isEmpty(request.getUpdateResultCodes())
){
throw BusinessException.badRequest("EMPTY_UPDATE_CONTENT","리스트 수정내용이 없습니다.");
}
}
private ResponseEntity<byte[]> buildZipResponse(String fileName, byte[] bytes) {
String contentDisposition = "attachment; filename*=UTF-8''" +
URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20");
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition)
.contentType(MediaType.parseMediaType("application/zip"))
.body(bytes);
}
}

View File

@@ -3,8 +3,9 @@ package com.kri.contact.server.controller;
import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.feature.web.RequestUserContext;
import com.kri.contact.server.dto.list.ListHeaderDto;
import com.kri.contact.server.dto.list.ListHeaderWithFilterContentDto;
import com.kri.contact.server.service.ListHeaderService;
import com.kri.contact.server.service.SystemEventLogService;
import com.kri.contact.server.service.common.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@@ -24,12 +25,12 @@ import org.springframework.web.bind.annotation.RestController;
@Tag(name = "ListHeader", description = "리스트 헤더 API")
public class ListHeaderController {
ListHeaderService listHeaderService;
SystemEventLogService systemEventLogService;
private final ListHeaderService listHeaderService;
private final SystemEventLogService systemEventLogService;
@Operation(summary = "리스트 헤더 조회")
@GetMapping("/{prjctIdx}")
public List<ListHeaderDto> getListHeader (@PathVariable Long prjctIdx) {
public List<ListHeaderWithFilterContentDto> getListHeader (@PathVariable Long prjctIdx) {
return listHeaderService.getHeader(prjctIdx);
}
@@ -41,7 +42,7 @@ public class ListHeaderController {
RequestUserContext ctx
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
listHeaderService.upsertHeader(prjctIdx, headerList, ctx.getUserId(), now);
listHeaderService.updateListHeader(prjctIdx, headerList, ctx.getUserId(), now);
systemEventLogService.writeUpsertListHeader(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx,
headerList);

View File

@@ -2,30 +2,64 @@ 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.web.BusinessException;
import com.kri.common.feature.web.RequestUserContext;
import com.kri.contact.server.common.enums.ResultCodeType;
import com.kri.contact.server.dto.list.ListEventHistDownloadRequestDto;
import com.kri.contact.server.dto.list.ListEventHistFromSurveyDto;
import com.kri.contact.server.dto.list.ListEventHistInsertRequestDto;
import com.kri.contact.server.dto.list.ListEventHistSurveyMetaDto;
import com.kri.contact.server.dto.list.ListEventHistoryDto;
import com.kri.contact.server.dto.list.ListUpdateHistoryDto;
import com.kri.contact.server.dto.project.ProjectInfoDto;
import com.kri.contact.server.service.ListDownloadService;
import com.kri.contact.server.service.ListHistoryQueryService;
import com.kri.contact.server.service.ListUpdateService;
import com.kri.contact.server.service.ProjectService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import java.time.LocalDateTime;
import java.util.List;
import lombok.RequiredArgsConstructor;
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.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/v1/list")
@RequestMapping("/api/v1/list-hist")
@RequiredArgsConstructor
@Tag(name = "ListHistory", description = "리스트 이력 API")
public class ListHistoryController {
private final ProjectService projectService;
private final ListDownloadService listDownloadService;
private final ListHistoryQueryService listHistoryQueryService;
private final ListUpdateService listUpdateService;
@Operation(summary = "List event history")
@GetMapping("/event/{prjctIdx}/{sid}")
public List<ListEventHistoryDto> findListEventHistories(
@PathVariable Long prjctIdx,
@PathVariable Integer sid
) {
return listHistoryQueryService.findEventHistories(prjctIdx, sid);
}
@Operation(summary = "List update history")
@GetMapping("/update/{prjctIdx}/{sid}")
public List<ListUpdateHistoryDto> findListUpdateHistories(
@PathVariable Long prjctIdx,
@PathVariable Integer sid
) {
return listHistoryQueryService.findUpdateHistories(prjctIdx, sid);
}
@Operation(summary = "리스트 이벤트 이력 다운로드")
@PostMapping("/excel/download/event/{prjctIdx}")
@@ -38,11 +72,52 @@ public class ListHistoryController {
prjctIdx,
request.getListFilter(),
request.getResultCodeTypes(),
request.getSearchBase(),
request.getDateRange()
);
return buildExcelResponse(projectInfoDto.getPrjctName() + " 컨택 이력.xlsx", bytes);
}
@Operation(description = "설문 상태 추가")
@PostMapping("/survey")
public void putSurveyHistory(
@Valid @RequestBody ListEventHistFromSurveyDto request,
RequestUserContext ctx
) {
if (request.getMeta().getRemoteAddr() == null) {
request.getMeta().setRemoteAddr(ctx.getClientIp());
}
String regUser = resolveRegUser(request, ctx);
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
listUpdateService.putSurveyHistory(request, regUser, now);
}
@Operation(description = "리스트 이벤트 이력 추가")
@PutMapping("/event")
public void putInternalEventHistory(
@Valid @RequestBody ListEventHistInsertRequestDto request,
RequestUserContext ctx
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
listUpdateService.putInternalEventHistory(
request,
ctx.getClientIp(),
ctx.getUserId(),
now
);
}
private String resolveRegUser(ListEventHistFromSurveyDto request, RequestUserContext ctx) {
if (ctx.getUserId() != null) {
return ctx.getUserId();
}
ListEventHistSurveyMetaDto meta = request.getMeta();
if (meta != null && meta.getEntryType() != null) {
return meta.getEntryType().name();
}
return "SYSTEM";
}
private ProjectInfoDto getProjectOrThrow(Long prjctIdx) {
ProjectInfoDto projectInfoDto = projectService.getProject(prjctIdx);
if (projectInfoDto == null) {

View File

@@ -0,0 +1,65 @@
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.MessageSendBulkRequestDto;
import com.kri.contact.server.dto.message.MessageSendSingleRequestDto;
import com.kri.contact.server.service.MessageService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
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.RestController;
@RestController
@RequestMapping("/api/v1/message")
@RequiredArgsConstructor
@Tag(name = "Message", description = "Message send API")
public class MessageController {
private final MessageService messageService;
@Operation(summary = "Email single send")
@PostMapping("/email/single/{prjctIdx}")
public void sendEmailSingle(
@PathVariable Long prjctIdx,
@Valid @RequestBody MessageSendSingleRequestDto request,
RequestUserContext ctx
) {
messageService.sendEmailSingle(prjctIdx, request, ctx);
}
@Operation(summary = "Email bulk send")
@PostMapping("/email/bulk/{prjctIdx}")
public MessageBulkSendResponseDto sendEmailBulk(
@PathVariable Long prjctIdx,
@Valid @RequestBody MessageSendBulkRequestDto request,
RequestUserContext ctx
) {
return messageService.sendEmailBulk(prjctIdx, request, ctx);
}
@Operation(summary = "SMS single send")
@PostMapping("/sms/single/{prjctIdx}")
public void sendSmsSingle(
@PathVariable Long prjctIdx,
@Valid @RequestBody MessageSendSingleRequestDto request,
RequestUserContext ctx
) {
messageService.sendSmsSingle(prjctIdx, request, ctx);
}
@Operation(summary = "SMS bulk send")
@PostMapping("/sms/bulk/{prjctIdx}")
public MessageBulkSendResponseDto sendSmsBulk(
@PathVariable Long prjctIdx,
@Valid @RequestBody MessageSendBulkRequestDto request,
RequestUserContext ctx
) {
return messageService.sendSmsBulk(prjctIdx, request, ctx);
}
}

View File

@@ -0,0 +1,54 @@
package com.kri.contact.server.controller;
import com.kri.contact.server.dto.progress.ProgressDateResponseDto;
import com.kri.contact.server.dto.progress.ProgressSearchRequestDto;
import com.kri.contact.server.dto.progress.ProgressUserResponseDto;
import com.kri.contact.server.service.ProgressService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;
import lombok.RequiredArgsConstructor;
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.RestController;
@RestController
@RequestMapping("/api/v1/progress")
@RequiredArgsConstructor
@Tag(name = "Progress", description = "진행 현황 API")
public class ProgressController {
private final ProgressService progressService;
@Operation(summary = "사용자별 컨택 진행 현황")
@PostMapping("/user/{prjctIdx}/{eventTy}")
public List<ProgressUserResponseDto> getUserProgress(
@PathVariable Long prjctIdx,
@PathVariable Short eventTy,
@RequestBody(required = false) ProgressSearchRequestDto request
) {
return progressService.getUserProgress(prjctIdx, eventTy, request);
}
@Operation(summary = "날짜별 전체 컨택 진행 현황")
@PostMapping("/date/{prjctIdx}/{eventTy}")
public List<ProgressDateResponseDto> getDateProgress(
@PathVariable Long prjctIdx,
@PathVariable Short eventTy,
@RequestBody(required = false) ProgressSearchRequestDto request
) {
return progressService.getDateProgress(prjctIdx, eventTy, request);
}
@Operation(summary = "날짜별 마지막 컨택 진행 현황")
@PostMapping("/last-date/{prjctIdx}/{eventTy}")
public List<ProgressDateResponseDto> getLastDateProgress(
@PathVariable Long prjctIdx,
@PathVariable Short eventTy,
@RequestBody(required = false) ProgressSearchRequestDto request
) {
return progressService.getLastDateProgress(prjctIdx, eventTy, request);
}
}

View File

@@ -12,7 +12,7 @@ import com.kri.contact.server.dto.project.ProjectSearchRequestDto;
import com.kri.contact.server.dto.project.ProjectUpdateRequestDto;
import com.kri.contact.server.service.file.ContactScenarioFileService;
import com.kri.contact.server.service.ProjectService;
import com.kri.contact.server.service.SystemEventLogService;
import com.kri.contact.server.service.common.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@@ -54,7 +54,8 @@ public class ProjectController {
@RequestParam(required = false) String keyword,
RequestUserContext ctx
) {
return projectService.getTopProject(topCount, keyword, ctx.getUserId(), ctx.getUserRole());
return projectService.getTopProject(topCount, keyword, ctx.getUserId(), ctx.getUserCmpn(),
ctx.getUserRole());
}
@Operation(summary = "프로젝트 목록 조회")
@@ -63,7 +64,7 @@ public class ProjectController {
@Valid @RequestBody ProjectSearchRequestDto req,
RequestUserContext ctx
) {
return projectService.searchProject(req, ctx.getUserId(), ctx.getUserRole());
return projectService.searchProject(req, ctx.getUserId(), ctx.getUserCmpn(), ctx.getUserRole());
}
@Operation(summary = "프로젝트를 소유하고 있는 모든 부서/실사 목록 조회")

View File

@@ -0,0 +1,56 @@
package com.kri.contact.server.controller;
import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.feature.web.RequestUserContext;
import com.kri.contact.server.dto.reserve.ListReserveDto;
import com.kri.contact.server.dto.reserve.ListReserveRequestDto;
import com.kri.contact.server.service.ReserveService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import java.time.LocalDateTime;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/v1/reserve")
@RequiredArgsConstructor
@Tag(name = "Reserve", description = "List reserve API")
public class ReserveController {
private final ReserveService reserveService;
@Operation(summary = "Reserve list")
@PutMapping
public ListReserveDto reserve(
@Valid @RequestBody ListReserveRequestDto request,
RequestUserContext ctx
) {
LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
return reserveService.reserve(request, ctx.getUserId(), now);
}
@Operation(summary = "Find reserves by user")
@GetMapping("/{prjctIdx}/user/{userId}")
public List<ListReserveDto> findByUser(
@PathVariable Long prjctIdx,
@PathVariable String userId
) {
return reserveService.findByUser(prjctIdx, userId);
}
@Operation(summary = "Find reserves by sid")
@GetMapping("/{prjctIdx}/sid/{sid}")
public List<ListReserveDto> findBySid(
@PathVariable Long prjctIdx,
@PathVariable Integer sid
) {
return reserveService.findBySid(prjctIdx, sid);
}
}

View File

@@ -3,7 +3,7 @@ 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.SystemEventLogService;
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;

View File

@@ -1,13 +1,15 @@
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.web.RequestUserContext;
import com.kri.contact.server.common.consts.ContactConstant;
import com.kri.contact.server.dto.common.DataVerificationDto;
import com.kri.contact.server.dto.excel.ExcelUploadResultDto;
import com.kri.contact.server.dto.systemlog.UploadUserContentDto;
import com.kri.contact.server.dto.systemlog.UploadContentDto;
import com.kri.contact.server.dto.user.UserInfoDto;
import com.kri.contact.server.service.SystemEventLogService;
import com.kri.contact.server.service.common.SystemEventLogService;
import com.kri.contact.server.service.UserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,7 +30,6 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestBody;
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;
@@ -122,12 +123,7 @@ public class UserController {
ExcelUploadResultDto result = userService.createUsersFromExcel(file, regId, now, forceCmpn);
UploadUserContentDto content = new UploadUserContentDto(
file.getOriginalFilename(),
file.getContentType(),
file.getSize()
);
systemEventLogService.writeUploadUserLog(regId, now, clientIp, content);
systemEventLogService.writeUploadUserLog(regId, now, clientIp, UploadContentDto.from(file));
return result;
}
@@ -137,12 +133,7 @@ public class UserController {
public ResponseEntity<byte[]> exportUserTemplate() {
byte[] bytes = userService.exportUserTemplate();
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION,
"attachment; filename=\"user_upload_template.xlsx\"")
.contentType(MediaType.parseMediaType(
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"))
.body(bytes);
return buildExcelResponse("user_upload_template.xlsx", bytes);
}
@Operation(summary = "사용자 정보 수정")