From 09e0b4ca05493809ddeef92c6568e3cee0e94449 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 22 Dec 2025 16:50:36 +0900 Subject: [PATCH] =?UTF-8?q?251222=5F04=5FENH=20:=20RequestBody=EC=97=90=20?= =?UTF-8?q?Valid=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F=20=EC=A4=91=EA=B4=84?= =?UTF-8?q?=ED=98=B8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/consts/ContactConstant.java | 2 +- .../intranet/IntranetExtensionApiClient.java | 2 +- .../server/controller/AssignController.java | 13 +++++-- .../server/controller/AuthController.java | 7 +++- .../server/controller/ProjectController.java | 26 +++++++++---- .../controller/ResultCodeController.java | 4 +- .../server/controller/RoleController.java | 4 +- .../server/controller/UserController.java | 39 ++++++++++++------- .../contact/server/dto/LoginResponseDto.java | 2 +- .../server/dto/ProjectCreateRequestDto.java | 10 +++++ .../contact/server/dto/ProjectInfoDto.java | 24 +++++++++++- .../server/dto/ProjectUpdateRequestDto.java | 2 + .../kri/contact/server/dto/ResultCodeDto.java | 2 +- .../kri/contact/server/dto/RoleInfoDto.java | 2 +- .../kri/contact/server/dto/UserInfoDto.java | 20 +++++++++- .../persistence/entity/TListEntity.java | 4 +- .../persistence/entity/TListHeaderEntity.java | 4 +- .../persistence/entity/TListItemEntity.java | 6 +-- .../entity/TListItemUploadEntity.java | 6 +-- .../entity/TPrjctAssignEntity.java | 12 +++--- .../entity/TPrjctAssignEntityId.java | 8 ++-- .../persistence/entity/TPrjctEntity.java | 12 +++--- .../persistence/entity/TResultCodeEntity.java | 14 +++---- .../entity/TResultCodeEntityId.java | 2 +- .../entity/TRoleFuncMapEntity.java | 4 +- .../entity/TSysEventLogEntity.java | 4 +- .../persistence/entity/TUserEntity.java | 2 +- .../contact/server/service/AssignService.java | 10 ++--- .../contact/server/service/AuthService.java | 4 +- .../contact/server/service/FileService.java | 2 +- .../server/service/ProjectService.java | 14 +++---- .../server/service/ResultCodeService.java | 6 +-- .../contact/server/service/RoleService.java | 4 +- .../server/service/SystemEventLogService.java | 18 ++++----- .../contact/server/service/UserService.java | 38 +++++++++--------- 35 files changed, 209 insertions(+), 124 deletions(-) diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index 1b0f613..98349cd 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -1,7 +1,7 @@ package com.kri.contact.server.common.consts; public final class ContactConstant { - private ContactConstant(){} + private ContactConstant() {} public static final String DEFAULT_COMPANY_NAME = "KRI"; diff --git a/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java b/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java index 2acec6d..4a7faf4 100644 --- a/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java +++ b/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java @@ -50,7 +50,7 @@ public class IntranetExtensionApiClient { } } - public List getUserIdArray(){ + public List getUserIdArray() { String url = String.format("%s/api/v1/user/user-id-list", intranetExtensionBaseUrl); Map headers = new HashMap<>(); headers.put(apiKeyHeaderName, apiKey); diff --git a/src/main/java/com/kri/contact/server/controller/AssignController.java b/src/main/java/com/kri/contact/server/controller/AssignController.java index b519909..3e63b81 100644 --- a/src/main/java/com/kri/contact/server/controller/AssignController.java +++ b/src/main/java/com/kri/contact/server/controller/AssignController.java @@ -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 getPrjctOutsourceAssign(@PathVariable Long prjctIdx){ + public List getPrjctOutsourceAssign(@PathVariable Long prjctIdx) { return assignService.getPrjctOutsourceAssign(prjctIdx); } - + + @Operation(summary = "배정된 컨택원/면접원 조회") @GetMapping("/prjct-fieldwork/{prjctIdx}") - public List getPrjctFieldworkAssign(@PathVariable Long prjctIdx){ + public List getPrjctFieldworkAssign(@PathVariable Long prjctIdx) { return assignService.getPrjctFieldworkAssign(prjctIdx); } + @Operation(summary = "컨택원/면접원 배정") @PutMapping("/prjct-fieldwork/{prjctIdx}") - public void upsertPrjctFieldworkAssign(@PathVariable Long prjctIdx, @RequestBody List assignUserIdList, RequestUserContext ctx){ + public void upsertPrjctFieldworkAssign(@PathVariable Long prjctIdx, @RequestBody List assignUserIdList, RequestUserContext ctx) { final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); assignService.upsertPrjctFieldworkAssign(prjctIdx, assignUserIdList, ctx.getUserId(), now); systemEventLogService.writeAssignUserProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, assignUserIdList); diff --git a/src/main/java/com/kri/contact/server/controller/AuthController.java b/src/main/java/com/kri/contact/server/controller/AuthController.java index 72910b3..0546df7 100644 --- a/src/main/java/com/kri/contact/server/controller/AuthController.java +++ b/src/main/java/com/kri/contact/server/controller/AuthController.java @@ -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()); diff --git a/src/main/java/com/kri/contact/server/controller/ProjectController.java b/src/main/java/com/kri/contact/server/controller/ProjectController.java index 705cf15..2305117 100644 --- a/src/main/java/com/kri/contact/server/controller/ProjectController.java +++ b/src/main/java/com/kri/contact/server/controller/ProjectController.java @@ -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 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 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); diff --git a/src/main/java/com/kri/contact/server/controller/ResultCodeController.java b/src/main/java/com/kri/contact/server/controller/ResultCodeController.java index d0b8af9..3384649 100644 --- a/src/main/java/com/kri/contact/server/controller/ResultCodeController.java +++ b/src/main/java/com/kri/contact/server/controller/ResultCodeController.java @@ -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 getResultCodeList( @PathVariable long prjctIdx, @RequestParam(required = false) ResultCodeType resultCdTy - ){ + ) { return resultCodeService.getResultCode(prjctIdx, resultCdTy); } } diff --git a/src/main/java/com/kri/contact/server/controller/RoleController.java b/src/main/java/com/kri/contact/server/controller/RoleController.java index 0a77632..6929154 100644 --- a/src/main/java/com/kri/contact/server/controller/RoleController.java +++ b/src/main/java/com/kri/contact/server/controller/RoleController.java @@ -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 getRoleList(RequestUserContext ctx){ + public List getRoleList(RequestUserContext ctx) { return roleService.getRoleList(ctx.getUserRole()); } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/controller/UserController.java b/src/main/java/com/kri/contact/server/controller/UserController.java index 58f2adc..12c75b4 100644 --- a/src/main/java/com/kri/contact/server/controller/UserController.java +++ b/src/main/java/com/kri/contact/server/controller/UserController.java @@ -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 getUserList(RequestUserContext ctx){ + public List 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 getFiledoworkUserList(RequestUserContext ctx){ + public List 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 getOutsourceList(){ + List getOutsourceList() { return userService.getOutsourceList(); } + @Operation(summary = "사용자 회사 목록 조회") @GetMapping("cmpn") - public List getUserCmpnList(RequestUserContext ctx){ - if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE){ + public List 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 exportUserTemplate(){ + public ResponseEntity 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(); diff --git a/src/main/java/com/kri/contact/server/dto/LoginResponseDto.java b/src/main/java/com/kri/contact/server/dto/LoginResponseDto.java index a3370b2..eb51cc2 100644 --- a/src/main/java/com/kri/contact/server/dto/LoginResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/LoginResponseDto.java @@ -16,7 +16,7 @@ public class LoginResponseDto { @Schema(description = "사용자 정보") private JwtUserClaimsDto user; - public static LoginResponseDto from(String accessToken, JwtUserClaimsDto jwtUserClaims){ + public static LoginResponseDto from(String accessToken, JwtUserClaimsDto jwtUserClaims) { return LoginResponseDto.builder() .accessToken(accessToken) .user(jwtUserClaims) diff --git a/src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java b/src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java index 454bfa1..a6a7a99 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java @@ -1,6 +1,8 @@ package com.kri.contact.server.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import lombok.*; @Getter @@ -9,15 +11,23 @@ import lombok.*; @AllArgsConstructor @Schema(description = "프로젝트 생성 요청") public class ProjectCreateRequestDto { + @Size(max = 128) + @NotBlank @Schema(description = "프로젝트 명") private String prjctName; + @Size(max = 32) + @NotBlank @Schema(description = "인트라넷 프로젝트 코드") private String itrntPrjctCd; + @Size(max = 32) + @NotBlank @Schema(description = "담당 그룹") private String ownerDept; + @Size(max = 16) + @NotBlank @Schema(description = "담당 실사") private String ownerFw; } diff --git a/src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java b/src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java index 2dd92c6..cbcc285 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java @@ -5,6 +5,9 @@ import com.kri.contact.server.common.enums.ProjectStatus; import com.kri.contact.server.common.enums.SurveyType; import com.kri.contact.server.persistence.entity.TPrjctEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.*; import java.time.LocalDateTime; @@ -16,45 +19,63 @@ import java.time.LocalDateTime; @AllArgsConstructor @Schema(description = "프로젝트 정보") public class ProjectInfoDto { + @NotNull @Schema(description = "프로젝트 고유 번호") private Long prjctIdx; + @Size(max = 32) + @NotBlank @Schema(description = "프로젝트 코드") private String prjctCd; + @NotNull @Schema(description = "프로젝트 진행 상태") private ProjectStatus prjctStatus; + @Size(max = 128) + @NotBlank @Schema(description = "프로젝트 명") private String prjctName; + @Size(max = 32) + @NotBlank @Schema(description = "인트라넷 프로젝트 코드") private String itrntPrjctCd; + @Size(max = 32) + @NotBlank @Schema(description = "담당 그룹") private String ownerDept; + @Size(max = 16) + @NotBlank @Schema(description = "담당 실사") private String ownerFw; + @NotNull @Schema(description = "설문지 타입") private SurveyType surveyTy; + @Size(max = 32) @Schema(description = "내부 설문 시스템 프로젝트 코드") private String surveyPrjctCd; + @Size(max = 128) @Schema(description = "설문 URL") private String surveyUrl; + @NotNull @Schema(description = "면접원 확인사항 여부") private Boolean ff; + @NotNull @Schema(description = "컨택 시나리오 사용 여부") private Boolean useContactSenario; @Schema(description = "컨택 시나리오") private String contactSenario; + @Size(max = 32) @Schema(description = "등록자", accessMode = Schema.AccessMode.READ_ONLY) @JsonProperty(access = JsonProperty.Access.READ_ONLY) private String regUser; @@ -63,6 +84,7 @@ public class ProjectInfoDto { @JsonProperty(access = JsonProperty.Access.READ_ONLY) private LocalDateTime regDt; + @Size(max = 32) @Schema(description = "수정자", accessMode = Schema.AccessMode.READ_ONLY) @JsonProperty(access = JsonProperty.Access.READ_ONLY) private String modUser; @@ -71,7 +93,7 @@ public class ProjectInfoDto { @JsonProperty(access = JsonProperty.Access.READ_ONLY) private LocalDateTime modDt; - public static ProjectInfoDto from(TPrjctEntity entity){ + public static ProjectInfoDto from(TPrjctEntity entity) { return ProjectInfoDto.builder() .prjctIdx(entity.getPrjctIdx()) .prjctCd(entity.getPrjctCd()) diff --git a/src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java b/src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java index 25a99a2..995c6b5 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java @@ -1,6 +1,7 @@ package com.kri.contact.server.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.springframework.web.bind.annotation.RequestBody; @@ -11,6 +12,7 @@ import java.util.List; @Setter @Schema(description = "프로젝트 수정 요청") public class ProjectUpdateRequestDto { + @NotNull @Schema(description = "프로젝트 정보") private ProjectInfoDto projectInfo; diff --git a/src/main/java/com/kri/contact/server/dto/ResultCodeDto.java b/src/main/java/com/kri/contact/server/dto/ResultCodeDto.java index 642025e..1ae2ea7 100644 --- a/src/main/java/com/kri/contact/server/dto/ResultCodeDto.java +++ b/src/main/java/com/kri/contact/server/dto/ResultCodeDto.java @@ -29,7 +29,7 @@ public class ResultCodeDto { @Schema(description = "결과 코드 라벨") private String resultCdLbl; - public static ResultCodeDto from(TResultCodeEntity entity){ + public static ResultCodeDto from(TResultCodeEntity entity) { return ResultCodeDto.builder() .resultCdUUID(UUID.randomUUID().toString()) .prjctIdx(entity.getPrjctIdx()) diff --git a/src/main/java/com/kri/contact/server/dto/RoleInfoDto.java b/src/main/java/com/kri/contact/server/dto/RoleInfoDto.java index ba704d2..ebb7055 100644 --- a/src/main/java/com/kri/contact/server/dto/RoleInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/RoleInfoDto.java @@ -40,7 +40,7 @@ public class RoleInfoDto { private LocalDateTime modDt; - public static RoleInfoDto from(TRoleEntity roleEntity){ + public static RoleInfoDto from(TRoleEntity roleEntity) { return RoleInfoDto.builder() .roleCd(roleEntity.getRoleCd()) .roleNm(roleEntity.getRoleNm()) diff --git a/src/main/java/com/kri/contact/server/dto/UserInfoDto.java b/src/main/java/com/kri/contact/server/dto/UserInfoDto.java index d2ba52d..2221e8f 100644 --- a/src/main/java/com/kri/contact/server/dto/UserInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/UserInfoDto.java @@ -5,6 +5,9 @@ import com.kri.common.datetime.DateTimeUtil; import com.kri.contact.server.dto.excel.UserUploadDto; import com.kri.contact.server.persistence.entity.TUserEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.*; import java.time.LocalDateTime; @@ -16,27 +19,39 @@ import java.time.LocalDateTime; @AllArgsConstructor @Schema(description = "사용자 정보") public class UserInfoDto { + @Size(max = 32) + @NotBlank @Schema(description = "사용자 ID") private String userId; + @Size(max = 128) + @NotBlank @Schema(description = "사용자 PW") private String userPw; + @Size(max = 32) + @NotBlank @Schema(description = "사용자 이름") private String userName; + @Size(max = 32) + @NotBlank @Schema(description = "사용자 소속 회사") private String userCmpn; + @Size(max = 32) + @NotBlank @Schema(description = "사용자 소속 팀") private String userTeam = "S101"; + @NotNull @Schema(description = "사용자 권한") private Integer userRole; @Schema(description = "메모") private String memo; + @Size(max = 32) @Schema(description = "등록자", accessMode = Schema.AccessMode.READ_ONLY) @JsonProperty(access = JsonProperty.Access.READ_ONLY) private String regUser; @@ -45,6 +60,7 @@ public class UserInfoDto { @JsonProperty(access = JsonProperty.Access.READ_ONLY) private LocalDateTime regDt; + @Size(max = 32) @Schema(description = "수정자", accessMode = Schema.AccessMode.READ_ONLY) @JsonProperty(access = JsonProperty.Access.READ_ONLY) private String modUser; @@ -53,7 +69,7 @@ public class UserInfoDto { @JsonProperty(access = JsonProperty.Access.READ_ONLY) private LocalDateTime modDt; - public static UserInfoDto from(TUserEntity entity){ + public static UserInfoDto from(TUserEntity entity) { return UserInfoDto.builder() .userId(entity.getUserId()) .userName(entity.getUserNm()) @@ -68,7 +84,7 @@ public class UserInfoDto { .build(); } - public static UserInfoDto from(UserUploadDto dto, Integer userRole, String regUser){ + public static UserInfoDto from(UserUploadDto dto, Integer userRole, String regUser) { return UserInfoDto.builder() .userId(dto.getUserId()) .userPw(dto.getUserPw()) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java index 31db44e..b4f12c8 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java @@ -45,11 +45,11 @@ public class TListEntity { @Column(name = "mod_dt", insertable = false) private LocalDateTime modDt; - public Long getPrjctIdx(){ + public Long getPrjctIdx() { return id.getPrjctIdx(); } - public Integer getSid(){ + public Integer getSid() { return id.getSid(); } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java index a23e45f..c040d2f 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java @@ -66,11 +66,11 @@ public class TListHeaderEntity { @Column(name = "mod_dt", insertable = false) private LocalDateTime modDt; - public Long getPrjctIdx(){ + public Long getPrjctIdx() { return id.getPrjctIdx(); } - public Integer getListHderId(){ + public Integer getListHderId() { return id.getListHderId(); } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntity.java index a99dab4..695d8dd 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntity.java @@ -39,15 +39,15 @@ public class TListItemEntity { @Column(name = "mod_dt", insertable = false) private LocalDateTime modDt; - public Long getPrjctIdx(){ + public Long getPrjctIdx() { return id.getPrjctIdx(); } - public Integer getSid(){ + public Integer getSid() { return id.getSid(); } - public Integer getListHderId(){ + public Integer getListHderId() { return id.getListHderId(); } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntity.java index b047eae..d5426e6 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntity.java @@ -48,15 +48,15 @@ public class TListItemUploadEntity { @Column(name = "mod_dt", insertable = false) private LocalDateTime modDt; - public Long getPrjctIdx(){ + public Long getPrjctIdx() { return id.getPrjctIdx(); } - public Integer getSid(){ + public Integer getSid() { return id.getSid(); } - public Integer getListHderId(){ + public Integer getListHderId() { return id.getListHderId(); } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java index 28c8e6b..1c3d2f5 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java @@ -6,17 +6,17 @@ import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.ColumnDefault; import java.time.LocalDateTime; -@Builder @Getter @Setter @Entity +@Builder +@NoArgsConstructor +@AllArgsConstructor @Table(name = "t_prjct_assign") public class TPrjctAssignEntity { @EmbeddedId @@ -40,11 +40,11 @@ public class TPrjctAssignEntity { .build(); } - public Long getPrjctIdx(){ + public Long getPrjctIdx() { return id.getPrjctIdx(); } - public String getUserId(){ + public String getUserId() { return id.getUserId(); } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java index a7685c5..f351d27 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java @@ -4,18 +4,18 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import org.hibernate.Hibernate; import java.io.Serializable; import java.util.Objects; -@Builder @Getter @Setter @Embeddable +@Builder +@NoArgsConstructor +@AllArgsConstructor public class TPrjctAssignEntityId implements Serializable { private static final long serialVersionUID = -263674621497298216L; @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java index ae76602..320151b 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java @@ -8,17 +8,17 @@ import com.kri.contact.server.dto.ProjectInfoDto; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.ColumnDefault; import java.time.LocalDateTime; -@Builder @Getter @Setter @Entity +@Builder +@NoArgsConstructor +@AllArgsConstructor @Table(name = "t_prjct") public class TPrjctEntity { @Id @@ -112,7 +112,7 @@ public class TPrjctEntity { @Column(name = "del_dt") private LocalDateTime delDt; - public static TPrjctEntity fromDto(ProjectInfoDto dto){ + public static TPrjctEntity fromDto(ProjectInfoDto dto) { return TPrjctEntity.builder() .prjctCd(dto.getPrjctCd()) .prjctStatus(dto.getPrjctStatus().getCode()) @@ -131,7 +131,7 @@ public class TPrjctEntity { .build(); } - public static TPrjctEntity create(ProjectCreateRequestDto req, String prjctCd, String regUser, LocalDateTime regDt){ + public static TPrjctEntity create(ProjectCreateRequestDto req, String prjctCd, String regUser, LocalDateTime regDt) { return TPrjctEntity.builder() .prjctCd(prjctCd) .prjctNm(req.getPrjctName()) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java index 05cceb9..dca13db 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java @@ -9,17 +9,17 @@ import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.ColumnDefault; import java.time.LocalDateTime; -@Builder @Getter @Setter @Entity +@Builder +@NoArgsConstructor +@AllArgsConstructor @Table(name = "t_result_code") public class TResultCodeEntity { @EmbeddedId @@ -40,15 +40,15 @@ public class TResultCodeEntity { @Column(name = "reg_dt", nullable = false) private LocalDateTime regDt; - public Long getPrjctIdx(){ + public Long getPrjctIdx() { return id.getPrjctIdx(); } - public ResultCodeType getResultCdTy(){ + public ResultCodeType getResultCdTy() { return id.getResultCdTy(); } - public Short getResultCd(){ + public Short getResultCd() { return id.getResultCd(); } diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java index aab5a65..990f36f 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java @@ -12,10 +12,10 @@ import org.hibernate.Hibernate; import java.io.Serializable; import java.util.Objects; -@Builder @Getter @Setter @Embeddable +@Builder @NoArgsConstructor @AllArgsConstructor public class TResultCodeEntityId implements Serializable { diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java index bb407bb..4c8468f 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java @@ -30,11 +30,11 @@ public class TRoleFuncMapEntity { @Column(name = "reg_dt", nullable = false) private LocalDateTime regDt; - public Integer getRoleCd(){ + public Integer getRoleCd() { return id.getRoleCd(); } - public Long getFuncCd(){ + public Long getFuncCd() { return id.getFuncCd(); } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TSysEventLogEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TSysEventLogEntity.java index fd5440d..33e3b06 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TSysEventLogEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TSysEventLogEntity.java @@ -13,11 +13,11 @@ import org.hibernate.annotations.Type; import java.time.LocalDateTime; import java.util.Map; -@Builder @Getter @Setter @Entity -@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Builder +@NoArgsConstructor @AllArgsConstructor @Table(name = "t_sys_event_log") public class TSysEventLogEntity { diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java index 43e128f..7751af8 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java @@ -10,10 +10,10 @@ import org.hibernate.annotations.ColumnDefault; import java.time.LocalDateTime; -@Builder @Getter @Setter @Entity +@Builder @NoArgsConstructor @AllArgsConstructor @Table(name = "t_user") diff --git a/src/main/java/com/kri/contact/server/service/AssignService.java b/src/main/java/com/kri/contact/server/service/AssignService.java index b4b7e8e..537bdf3 100644 --- a/src/main/java/com/kri/contact/server/service/AssignService.java +++ b/src/main/java/com/kri/contact/server/service/AssignService.java @@ -17,7 +17,7 @@ public class AssignService { private final ProjectAssignRepository projectAssignRepository; - public List getPrjctOutsourceAssign(Long prjctIdx){ + public List getPrjctOutsourceAssign(Long prjctIdx) { return projectAssignRepository.findAssignUserIdByPrjctIdxAndRoleRange( prjctIdx, ContactConstant.OUTSOURCE_USER_ROLE, @@ -25,7 +25,7 @@ public class AssignService { ); } - public List getPrjctFieldworkAssign(Long prjctIdx){ + public List getPrjctFieldworkAssign(Long prjctIdx) { return projectAssignRepository.findAssignUserIdByPrjctIdxAndRoleRange( prjctIdx, ContactConstant.FIELDWORK_USER_ROLE, @@ -34,7 +34,7 @@ public class AssignService { } @Transactional - public void upsertPrjctOutsourceAssign(Long prjctIdx, List assignUserIdList, String regUser, LocalDateTime regDt){ + public void upsertPrjctOutsourceAssign(Long prjctIdx, List assignUserIdList, String regUser, LocalDateTime regDt) { projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange( prjctIdx, ContactConstant.OUTSOURCE_USER_ROLE, @@ -45,7 +45,7 @@ public class AssignService { } @Transactional - public void upsertPrjctFieldworkAssign(Long prjctIdx, List assignUserIdList, String regUser, LocalDateTime regDt){ + public void upsertPrjctFieldworkAssign(Long prjctIdx, List assignUserIdList, String regUser, LocalDateTime regDt) { projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange( prjctIdx, ContactConstant.FIELDWORK_USER_ROLE, @@ -55,7 +55,7 @@ public class AssignService { insertPrjctAssign(prjctIdx, assignUserIdList, regUser, regDt); } - private void insertPrjctAssign(Long prjctIdx, List assignUserIdList, String regUser, LocalDateTime regDt){ + private void insertPrjctAssign(Long prjctIdx, List assignUserIdList, String regUser, LocalDateTime regDt) { if (assignUserIdList == null || assignUserIdList.isEmpty()) { return; } diff --git a/src/main/java/com/kri/contact/server/service/AuthService.java b/src/main/java/com/kri/contact/server/service/AuthService.java index e376329..49f7f7e 100644 --- a/src/main/java/com/kri/contact/server/service/AuthService.java +++ b/src/main/java/com/kri/contact/server/service/AuthService.java @@ -18,11 +18,11 @@ public class AuthService { private final IntranetExtensionApiClient intranetExtensionApiClient; - public LoginResponseDto tryLogin(LoginRequestDto request){ + public LoginResponseDto tryLogin(LoginRequestDto request) { SearchLoginInfoResponseDto loginInfoResponse = intranetExtensionApiClient.searchLoginInfo(request); JwtUserClaimsDto claims; - if(loginInfoResponse != null){ + if(loginInfoResponse != null) { claims = JwtUserClaimsDto.builder() .userId(loginInfoResponse.getUserId()) .userCmpn(loginInfoResponse.getUserCmpn()) diff --git a/src/main/java/com/kri/contact/server/service/FileService.java b/src/main/java/com/kri/contact/server/service/FileService.java index ca2908c..6b80a2a 100644 --- a/src/main/java/com/kri/contact/server/service/FileService.java +++ b/src/main/java/com/kri/contact/server/service/FileService.java @@ -105,7 +105,7 @@ public class FileService { // body 안의 HTML만 반환 (불필요한 wrapper 제거) returnHtml = doc.body().html(); } - catch (IOException e){ + catch (IOException e) { log.warn("temp 파일 이동 실패: {}", rawHtml, e); } diff --git a/src/main/java/com/kri/contact/server/service/ProjectService.java b/src/main/java/com/kri/contact/server/service/ProjectService.java index 589160b..0ee0f74 100644 --- a/src/main/java/com/kri/contact/server/service/ProjectService.java +++ b/src/main/java/com/kri/contact/server/service/ProjectService.java @@ -49,11 +49,11 @@ public class ProjectService { } } - public ProjectInfoDto getProject(Long prjctIdx){ + public ProjectInfoDto getProject(Long prjctIdx) { return ProjectInfoDto.from(projectRepository.findByPrjctIdxAndDelFalse(prjctIdx)); } - public List getTopProject(int topCount, String keyword, String userId, Integer userRole){ + public List getTopProject(int topCount, String keyword, String userId, Integer userRole) { Specification spec = ProjectSpecs.keywordLike(keyword) .and(ProjectSpecs.isDelFalse()); @@ -105,7 +105,7 @@ public class ProjectService { return PageResponseDto.from(page); } - public ProjectOwnerResponseDto getOwnerList(Integer userRole){ + public ProjectOwnerResponseDto getOwnerList(Integer userRole) { ProjectOwnerResponseDto responseDto = new ProjectOwnerResponseDto(); responseDto.setOwnerDeptList(this.getOwnerDeptList(userRole)); @@ -133,7 +133,7 @@ public class ProjectService { } @Transactional - public void updateProject(long prjctIdx, ProjectUpdateRequestDto req, String modUser, LocalDateTime modDt){ + public void updateProject(long prjctIdx, ProjectUpdateRequestDto req, String modUser, LocalDateTime modDt) { // dirty checking 업데이트 TPrjctEntity entity = projectRepository.findById(prjctIdx) .orElseThrow(() -> @@ -148,17 +148,17 @@ public class ProjectService { } @Transactional - public void deleteProject(Long prjctIdx, String delUser, LocalDateTime delDt){ + public void deleteProject(Long prjctIdx, String delUser, LocalDateTime delDt) { int deleteCount = projectRepository.softDeleteByPrjctIdx(prjctIdx, delUser, delDt); - if(deleteCount == 0){ + if(deleteCount == 0) { throw BusinessException.notFound("PROJECT_NOT_FOUND", "프로젝트를 찾을 수 없습니다.") .with("prjctIdx", prjctIdx); } } /***************************private************************************/ - private String makePrjctCd(String itrntPrjctCd){ + private String makePrjctCd(String itrntPrjctCd) { String prefix = itrntPrjctCd + "_"; List sameItrnt = projectRepository.findByItrntPrjctCd(itrntPrjctCd); diff --git a/src/main/java/com/kri/contact/server/service/ResultCodeService.java b/src/main/java/com/kri/contact/server/service/ResultCodeService.java index e6a4cbe..703719f 100644 --- a/src/main/java/com/kri/contact/server/service/ResultCodeService.java +++ b/src/main/java/com/kri/contact/server/service/ResultCodeService.java @@ -22,7 +22,7 @@ public class ResultCodeService { private final ResultCodeRepository resultCodeRepository; - public void copyResultCodeFromDefault(long prjctIdx, String regUser, LocalDateTime regDt){ + public void copyResultCodeFromDefault(long prjctIdx, String regUser, LocalDateTime regDt) { List defaultCodeList = resultCodeRepository.findDefault(); List copyCodeList = defaultCodeList.stream() @@ -32,7 +32,7 @@ public class ResultCodeService { resultCodeRepository.saveAll(copyCodeList); } - public List getResultCode(long prjctIdx, ResultCodeType resultCdTy){ + public List getResultCode(long prjctIdx, ResultCodeType resultCdTy) { if (resultCdTy == null) { return resultCodeRepository.findByIdPrjctIdx(prjctIdx).stream() .map(ResultCodeDto::from) @@ -45,7 +45,7 @@ public class ResultCodeService { } @Transactional - public void updateResultCode(long prjctIdx, List resultCodeDtoList, String modUser, LocalDateTime modDt){ + public void updateResultCode(long prjctIdx, List resultCodeDtoList, String modUser, LocalDateTime modDt) { if (resultCodeDtoList != null && !resultCodeDtoList.isEmpty()) { Map> dtoGroupByType = resultCodeDtoList.stream() .filter(dto -> dto.getResultCdTy() != null) diff --git a/src/main/java/com/kri/contact/server/service/RoleService.java b/src/main/java/com/kri/contact/server/service/RoleService.java index e3c56ac..4a08a33 100644 --- a/src/main/java/com/kri/contact/server/service/RoleService.java +++ b/src/main/java/com/kri/contact/server/service/RoleService.java @@ -14,13 +14,13 @@ public class RoleService { private final RoleRepository roleRepository; - public List getRoleList(){ + public List getRoleList() { return roleRepository.findAll().stream() .map(RoleInfoDto::from) .toList(); } - public List getRoleList(Integer roleCd){ + public List getRoleList(Integer roleCd) { Integer searchRoleCd = roleCd < ContactConstant.OUTSOURCE_USER_ROLE ? ContactConstant.OUTSOURCE_USER_ROLE : ContactConstant.FIELDWORK_USER_ROLE; diff --git a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java index ef82f8a..438364e 100644 --- a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java +++ b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java @@ -48,19 +48,19 @@ public class SystemEventLogService { ); } - public void writeCreateUserLog(String regId, LocalDateTime regDt, String clientIp, UserInfoDto userInfo){ + public void writeCreateUserLog(String regId, LocalDateTime regDt, String clientIp, UserInfoDto userInfo) { writeSystemLog(SystemEventType.CREATE_USER, "Create User", null, regId, regDt, clientIp, userInfo); } - public void writeUploadUserLog(String regId, LocalDateTime regDt, String clientIp, UploadUserContentDto content){ + public void writeUploadUserLog(String regId, LocalDateTime regDt, String clientIp, UploadUserContentDto content) { writeSystemLog(SystemEventType.UPLOAD_USER, "Upload User", null, regId, regDt, clientIp, content); } - public void writeUpdateUserLog(String regId, LocalDateTime regDt, String clientIp, UserInfoDto userInfo){ + public void writeUpdateUserLog(String regId, LocalDateTime regDt, String clientIp, UserInfoDto userInfo) { writeSystemLog(SystemEventType.UPDATE_USER, "Update User", null, regId, regDt, clientIp, userInfo); } - public void writeDeleteUserLog(String regId, LocalDateTime regDt, String clientIp, String userId){ + public void writeDeleteUserLog(String regId, LocalDateTime regDt, String clientIp, String userId) { writeSystemLog( SystemEventType.DELETE_USER, "Delete User", @@ -73,15 +73,15 @@ public class SystemEventLogService { ); } - public void writeCreateProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, ProjectCreateRequestDto req){ + public void writeCreateProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, ProjectCreateRequestDto req) { writeSystemLog(SystemEventType.CREATE_PROJECT, "Create Project", prjctIdx, regId, regDt, clientIp, req); } - public void writeUpdateProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, ProjectUpdateRequestDto req){ + public void writeUpdateProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, ProjectUpdateRequestDto req) { writeSystemLog(SystemEventType.UPDATE_PROJECT, "Update Project", prjctIdx, regId, regDt, clientIp, req); } - public void writeDeleteProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx){ + public void writeDeleteProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx) { writeSystemLog( SystemEventType.DELETE_PROJECT, "Delete Project", @@ -94,7 +94,7 @@ public class SystemEventLogService { ); } - public void writeAssignUserProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, List assignUserIdList){ + public void writeAssignUserProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, List assignUserIdList) { writeSystemLog( SystemEventType.ASSIGN_PROJECT_USER, "Assign Project FW User", @@ -143,7 +143,7 @@ public class SystemEventLogService { LocalDateTime regDt, String clientIp, Map contentMap - ){ + ) { TSysEventLogEntity log = TSysEventLogEntity.of( eventType, title, diff --git a/src/main/java/com/kri/contact/server/service/UserService.java b/src/main/java/com/kri/contact/server/service/UserService.java index 1a8fde1..7cb979b 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -34,14 +34,14 @@ public class UserService { private final UserRepository userRepository; @Transactional - public void createUser(UserInfoDto userInfo, String regUser, LocalDateTime regDt){ + public void createUser(UserInfoDto userInfo, String regUser, LocalDateTime regDt) { List roleList = roleService.getRoleList(); List intranetUserList = intranetExtensionApiClient.getUserIdArray(); userInfo.setUserId(userInfo.getUserId().toLowerCase()); List failList = validateUserDto(userInfo, roleList, intranetUserList).stream().filter(dto -> !dto.isSuccess()).toList(); - if(!failList.isEmpty()){ + if(!failList.isEmpty()) { DataVerificationDto firstFail = failList.get(0); throw BusinessException.badRequest("WRONG_USER_DATA", firstFail.getErrMessage()); } @@ -82,7 +82,7 @@ public class UserService { .orElse(null); UserInfoDto dto = UserInfoDto.from(uploadDto, roleCd, regUser); - if(!forceCmpn.isBlank()){ + if(!forceCmpn.isBlank()) { dto.setUserCmpn(forceCmpn); } @@ -119,7 +119,7 @@ public class UserService { ); } - public byte[] exportUserTemplate(){ + public byte[] exportUserTemplate() { try (Workbook workbook = ExcelMapper.writeToWorkbook(Collections.emptyList(), UserUploadDto.class); ByteArrayOutputStream out = new ByteArrayOutputStream()) { @@ -136,7 +136,7 @@ public class UserService { return this.verifyUserId(userId, intranetUserList); } - public UserInfoDto getUser(String userId){ + public UserInfoDto getUser(String userId) { TUserEntity user = userRepository.findByUserIdAndDelFalse(userId) .orElseThrow(() -> BusinessException.notFound("USER_NOT_FOUND", "사용자가 없습니다.") @@ -148,7 +148,7 @@ public class UserService { return userInfoDto; } - public TUserEntity getUser(String userId, String userPw){ + public TUserEntity getUser(String userId, String userPw) { return userRepository.findByUserIdAndUserPwAndDelFalse(userId, userPw) .orElseThrow(() -> BusinessException.notFound("USER_NOT_FOUND", "사용자가 없습니다.") @@ -156,15 +156,15 @@ public class UserService { ); } - public List getUserList(){ + public List getUserList() { return userRepository.findByDelFalse().stream() .map(UserInfoDto::from) .toList(); } - public List getFieldworkUserListWithCmpn(String searchCmpn){ + public List getFieldworkUserListWithCmpn(String searchCmpn) { List userList; - if(searchCmpn == null || searchCmpn.isBlank()){ + if(searchCmpn == null || searchCmpn.isBlank()) { userList = userRepository.findByUserRoleGreaterThanEqualAndDelFalse(ContactConstant.FIELDWORK_USER_ROLE); } else{ @@ -176,7 +176,7 @@ public class UserService { .toList(); } - public List getOutsourceList(){ + public List getOutsourceList() { List userList = userRepository.findByRoleRangeAndDelFalse( ContactConstant.OUTSOURCE_USER_ROLE, ContactConstant.OUTSOURCE_USER_ROLE + 1000 @@ -187,12 +187,12 @@ public class UserService { .toList(); } - public List getUserCmpnList(){ + public List getUserCmpnList() { return userRepository.findDistinctUserCmpnAndDelFalse(); } @Transactional - public void updateUser(UserInfoDto dto, String modUser, LocalDateTime modDt){ + public void updateUser(UserInfoDto dto, String modUser, LocalDateTime modDt) { // dirty checking 업데이트 TUserEntity entity = userRepository.findByUserIdAndDelFalse(dto.getUserId()) .orElseThrow(() -> @@ -204,18 +204,18 @@ public class UserService { } @Transactional - public void deleteUser(String userId, String delUser){ + public void deleteUser(String userId, String delUser) { int deleteCount = userRepository.softDeleteByUserId(userId, delUser, DateTimeUtil.nowKstLocalDateTime()); - if(deleteCount == 0){ + if(deleteCount == 0) { throw BusinessException.notFound("USER_NOT_FOUND", "사용자를 찾을 수 없습니다.") .with("userId", userId); } } /*******************************private*******************************/ - private DataVerificationDto verifyUserId(String userId, List intranetUserList){ - if(userId == null || userId.isBlank()){ + private DataVerificationDto verifyUserId(String userId, List intranetUserList) { + if(userId == null || userId.isBlank()) { return new DataVerificationDto(false, "사용자 ID", "사용자 ID가 비었습니다."); } if (userId.length() < 3 || userId.length() > 16 ) { @@ -224,10 +224,10 @@ public class UserService { if (!userId.matches("^[a-z가-힣][a-z0-9가-힣]+$")) { return new DataVerificationDto(false,"사용자 ID", "사용자 ID는 한글, 영소문자, 숫자만 허용합니다."); } - if(userRepository.existsByUserIdAndDelFalse(userId)){ + if(userRepository.existsByUserIdAndDelFalse(userId)) { return new DataVerificationDto(false,"사용자 ID", "이미 사용중인 ID입니다."); } - if(intranetUserList.contains(userId) || intranetUserList.contains(String.format("%s@kric.com", userId))){ + if(intranetUserList.contains(userId) || intranetUserList.contains(String.format("%s@kric.com", userId))) { return new DataVerificationDto(false,"사용자 ID", "이미 사용중인 직원 ID입니다."); } @@ -325,7 +325,7 @@ public class UserService { List validateUserList = this.validateUserDto(dto, roleList, intranetUserList); validateUserList.forEach(validateResult -> { - if(!validateResult.isSuccess()){ + if(!validateResult.isSuccess()) { errors.add(UserUploadErrorDto.of( rowNumber, validateResult.getFieldName(),