251222_04_ENH : RequestBody에 Valid 적용 및 중괄호 스타일 통일

This commit is contained in:
2025-12-22 16:50:36 +09:00
parent cf3adf883b
commit 09e0b4ca05
35 changed files with 209 additions and 124 deletions

View File

@@ -4,7 +4,9 @@ import com.kri.common.datetime.DateTimeUtil;
import com.kri.common.webmvc.RequestUserContext;
import com.kri.contact.server.service.AssignService;
import com.kri.contact.server.service.SystemEventLogService;
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.*;
@@ -20,18 +22,21 @@ public class AssignController {
private final SystemEventLogService systemEventLogService;
private final AssignService assignService;
@Operation(summary = "배정된 외주사 조회")
@GetMapping("/prjct-outsource/{prjctIdx}")
public List<String> getPrjctOutsourceAssign(@PathVariable Long prjctIdx){
public List<String> getPrjctOutsourceAssign(@PathVariable Long prjctIdx) {
return assignService.getPrjctOutsourceAssign(prjctIdx);
}
@Operation(summary = "배정된 컨택원/면접원 조회")
@GetMapping("/prjct-fieldwork/{prjctIdx}")
public List<String> getPrjctFieldworkAssign(@PathVariable Long prjctIdx){
public List<String> getPrjctFieldworkAssign(@PathVariable Long prjctIdx) {
return assignService.getPrjctFieldworkAssign(prjctIdx);
}
@Operation(summary = "컨택원/면접원 배정")
@PutMapping("/prjct-fieldwork/{prjctIdx}")
public void upsertPrjctFieldworkAssign(@PathVariable Long prjctIdx, @RequestBody List<String> assignUserIdList, RequestUserContext ctx){
public void upsertPrjctFieldworkAssign(@PathVariable Long prjctIdx, @RequestBody List<String> assignUserIdList, RequestUserContext ctx) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
assignService.upsertPrjctFieldworkAssign(prjctIdx, assignUserIdList, ctx.getUserId(), now);
systemEventLogService.writeAssignUserProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, assignUserIdList);

View File

@@ -6,6 +6,7 @@ import com.kri.contact.server.dto.LoginRequestDto;
import com.kri.contact.server.dto.LoginResponseDto;
import com.kri.contact.server.service.AuthService;
import com.kri.contact.server.service.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,8 +21,9 @@ public class AuthController {
private final AuthService authService;
private final SystemEventLogService systemEventLogService;
@Operation(summary = "로그인 요청")
@PostMapping("/login")
public LoginResponseDto tryLogin(@RequestBody LoginRequestDto request, RequestUserContext ctx){
public LoginResponseDto tryLogin(@RequestBody LoginRequestDto request, RequestUserContext ctx) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
LoginResponseDto response = authService.tryLogin(request);
@@ -30,8 +32,9 @@ public class AuthController {
return response;
}
@Operation(summary = "로그아웃 요청")
@PostMapping("/logout/{userId}")
public boolean logout(@PathVariable String userId, RequestUserContext ctx){
public boolean logout(@PathVariable String userId, RequestUserContext ctx) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
systemEventLogService.writeLogoutLog(userId, now, ctx.getClientIp());

View File

@@ -7,7 +7,9 @@ import com.kri.contact.server.dto.common.PageResponseDto;
import com.kri.contact.server.service.FileService;
import com.kri.contact.server.service.ProjectService;
import com.kri.contact.server.service.SystemEventLogService;
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.*;
import org.springframework.web.multipart.MultipartFile;
@@ -25,20 +27,23 @@ public class ProjectController {
private final ProjectService projectService;
private final FileService fileService;
@Operation(summary = "프로젝트 조회")
@GetMapping("/{prjctIdx}")
public ProjectInfoDto getProject(@PathVariable Long prjctIdx){
public ProjectInfoDto getProject(@PathVariable Long prjctIdx) {
return projectService.getProject(prjctIdx);
}
@Operation(summary = "상위 프로젝트 조회(생성일자 늦은 순)")
@GetMapping("/top/{topCount}")
public List<ProjectInfoDto> getTopProject(
@PathVariable int topCount,
@RequestParam(required = false) String keyword,
RequestUserContext ctx
){
) {
return projectService.getTopProject(topCount, keyword, ctx.getUserId(), ctx.getUserRole());
}
@Operation(summary = "프로젝트 목록 조회")
@PostMapping("/list")
public PageResponseDto<ProjectInfoDto> searchProject(
@RequestBody ProjectSearchRequestDto req,
@@ -47,14 +52,16 @@ public class ProjectController {
return projectService.searchProject(req, ctx.getUserId(), ctx.getUserRole());
}
@Operation(summary = "프로젝트를 소유하고 있는 모든 부서/실사 목록 조회")
@GetMapping("/owner-list")
public ProjectOwnerResponseDto getOwnerList(RequestUserContext ctx){
public ProjectOwnerResponseDto getOwnerList(RequestUserContext ctx) {
return projectService.getOwnerList(ctx.getUserRole());
}
@Operation(summary = "프로젝트 생성")
@PutMapping()
public ProjectInfoDto createProject(
@RequestBody ProjectCreateRequestDto req,
@Valid @RequestBody ProjectCreateRequestDto req,
RequestUserContext ctx
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
@@ -65,17 +72,19 @@ public class ProjectController {
return prjctInfo;
}
@Operation(summary = "시나리오 이미지 업로드")
@PutMapping("/senario-image/{prjctCd}")
public String uploadContactSenarioImage(@PathVariable String prjctCd, @RequestParam("file") MultipartFile file){
public String uploadContactSenarioImage(@PathVariable String prjctCd, @RequestParam("file") MultipartFile file) {
return fileService.storeTempFile(prjctCd, file);
}
@Operation(summary = "프로젝트 수정")
@PatchMapping("/{prjctIdx}")
public void updateProject(
@PathVariable long prjctIdx,
@RequestBody ProjectUpdateRequestDto req,
@Valid @RequestBody ProjectUpdateRequestDto req,
RequestUserContext ctx
){
) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
String newHtml = fileService.syncOnSave(
@@ -89,8 +98,9 @@ public class ProjectController {
systemEventLogService.writeUpdateProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, req);
}
@Operation(summary = "프로젝트 삭제(소프트 삭제)")
@DeleteMapping("/{prjctIdx}")
public void deleteProject(@PathVariable Long prjctIdx, RequestUserContext ctx){
public void deleteProject(@PathVariable Long prjctIdx, RequestUserContext ctx) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
projectService.deleteProject(prjctIdx, ctx.getUserId(), now);

View File

@@ -5,6 +5,7 @@ import com.kri.contact.server.common.enums.ResultCodeType;
import com.kri.contact.server.dto.ResultCodeDto;
import com.kri.contact.server.service.ResultCodeService;
import com.kri.contact.server.service.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,11 +21,12 @@ public class ResultCodeController {
private final SystemEventLogService systemEventLogService;
private final ResultCodeService resultCodeService;
@Operation(summary = "결과 코드 조회")
@GetMapping("/{prjctIdx}")
public List<ResultCodeDto> getResultCodeList(
@PathVariable long prjctIdx,
@RequestParam(required = false) ResultCodeType resultCdTy
){
) {
return resultCodeService.getResultCode(prjctIdx, resultCdTy);
}
}

View File

@@ -3,6 +3,7 @@ package com.kri.contact.server.controller;
import com.kri.common.webmvc.RequestUserContext;
import com.kri.contact.server.dto.RoleInfoDto;
import com.kri.contact.server.service.RoleService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
@@ -18,8 +19,9 @@ import java.util.List;
public class RoleController {
private final RoleService roleService;
@Operation(summary = "권한 목록 조회")
@GetMapping()
public List<RoleInfoDto> getRoleList(RequestUserContext ctx){
public List<RoleInfoDto> getRoleList(RequestUserContext ctx) {
return roleService.getRoleList(ctx.getUserRole());
}
}

View File

@@ -9,7 +9,9 @@ import com.kri.contact.server.dto.UserInfoDto;
import com.kri.contact.server.dto.systemlog.UploadUserContentDto;
import com.kri.contact.server.service.SystemEventLogService;
import com.kri.contact.server.service.UserService;
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.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -29,20 +31,23 @@ public class UserController {
private final UserService userService;
private final SystemEventLogService systemEventLogService;
@Operation(summary = "ID 가용 여부 검사")
@GetMapping("/check-user-id")
public DataVerificationDto checkUserId(@RequestParam String userId){
public DataVerificationDto checkUserId(@RequestParam String userId) {
return userService.checkUserId(userId);
}
@Operation(summary = "사용자 정보 조회")
@GetMapping("/{userId}")
public UserInfoDto getUser(@PathVariable String userId){
public UserInfoDto getUser(@PathVariable String userId) {
return userService.getUser(userId);
}
@Operation(summary = "사용자 목록 조회")
@GetMapping()
public List<UserInfoDto> getUserList(RequestUserContext ctx){
public List<UserInfoDto> getUserList(RequestUserContext ctx) {
String searchCmpn = ctx.getUserCmpn();
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE){
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE) {
return userService.getUserList();
}
else{
@@ -50,32 +55,36 @@ public class UserController {
}
}
@Operation(summary = "컨택원/면접원 목록 조회")
@GetMapping("fieldwork")
public List<UserInfoDto> getFiledoworkUserList(RequestUserContext ctx){
public List<UserInfoDto> getFiledoworkUserList(RequestUserContext ctx) {
String searchCmpn = ctx.getUserCmpn();
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE){
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE) {
searchCmpn = "";
}
return userService.getFieldworkUserListWithCmpn(searchCmpn);
}
@Operation(summary = "외주사 목록 조회")
@GetMapping("outsource")
List<UserInfoDto> getOutsourceList(){
List<UserInfoDto> getOutsourceList() {
return userService.getOutsourceList();
}
@Operation(summary = "사용자 회사 목록 조회")
@GetMapping("cmpn")
public List<String> getUserCmpnList(RequestUserContext ctx){
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE){
public List<String> getUserCmpnList(RequestUserContext ctx) {
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE) {
return userService.getUserCmpnList();
}
return Collections.emptyList();
}
@Operation(summary = "사용자 생성")
@PutMapping
public void createUser(@RequestBody UserInfoDto userInfo, RequestUserContext ctx){
public void createUser(@Valid @RequestBody UserInfoDto userInfo, RequestUserContext ctx) {
String regId = ctx.getUserId();
String clientIp = ctx.getClientIp();
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
@@ -84,6 +93,7 @@ public class UserController {
systemEventLogService.writeCreateUserLog(regId, now, clientIp, userInfo);
}
@Operation(summary = "사용자 일괄 생성(엑셀 업로드)")
@PostMapping("/excel")
public ExcelUploadResponseDto createUserFromExcel(
@RequestPart("file") MultipartFile file,
@@ -107,8 +117,9 @@ public class UserController {
return result;
}
@Operation(summary = "사용자 일괄 생성 양식 다운로드")
@PostMapping("/excel/template")
public ResponseEntity<byte[]> exportUserTemplate(){
public ResponseEntity<byte[]> exportUserTemplate() {
byte[] bytes = userService.exportUserTemplate();
return ResponseEntity.ok()
@@ -119,8 +130,9 @@ public class UserController {
.body(bytes);
}
@Operation(summary = "사용자 정보 수정")
@PatchMapping()
public void updateUser(@RequestBody UserInfoDto dto, RequestUserContext ctx){
public void updateUser(@Valid @RequestBody UserInfoDto dto, RequestUserContext ctx) {
String modId = ctx.getUserId();
String clientIp = ctx.getClientIp();
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
@@ -129,8 +141,9 @@ public class UserController {
systemEventLogService.writeUpdateUserLog(modId, now, clientIp, dto);
}
@Operation(summary = "사용자 삭제(소프트 삭제)")
@DeleteMapping("/{userId}")
public void deleteUser(@PathVariable String userId, RequestUserContext ctx){
public void deleteUser(@PathVariable String userId, RequestUserContext ctx) {
String regId = ctx.getUserId();
String clientIp = ctx.getClientIp();
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();