diff --git a/application.yml b/application.yml index 653932c..34423b2 100644 --- a/application.yml +++ b/application.yml @@ -9,6 +9,11 @@ spring: # 아무 설정 없을 때 기본으로 쓸 프로파일 default: local + servlet: + multipart: + max-file-size: 20MB + max-request-size: 20MB + logging: file: path: ./logs diff --git a/settings.gradle b/settings.gradle index 096502d..af709c7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'server' +rootProject.name = 'contact-server' diff --git a/src/main/java/com/kri/contact/server/common/consts/AppConstant.java b/src/main/java/com/kri/contact/server/common/consts/AppConstant.java index 338f998..21b33c5 100644 --- a/src/main/java/com/kri/contact/server/common/consts/AppConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/AppConstant.java @@ -3,6 +3,8 @@ package com.kri.contact.server.common.consts; public final class AppConstant { private AppConstant(){} + public static final String DEFAULT_COMPANY_NAME = "KRI"; + public static final int OUTSOURCE_USER_ROLE = 4000; public static final int FIELDWORK_USER_ROLE = 9000; } 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 c62e8c1..77e88e2 100644 --- a/src/main/java/com/kri/contact/server/controller/AssignController.java +++ b/src/main/java/com/kri/contact/server/controller/AssignController.java @@ -21,7 +21,18 @@ public class AssignController { private final AssignService assignService; @GetMapping("/prjct-outsource/{prjctIdx}") - public List getPrjctOutsourceAssign(@PathVariable Long prjctIdx, RequestUserContext ctx){ + public List getPrjctOutsourceAssign(@PathVariable Long prjctIdx){ return assignService.getPrjctOutsourceAssign(prjctIdx); } + + @GetMapping("/prjct-fieldwork/{prjctIdx}") + public List getPrjctFieldworkAssign(@PathVariable Long prjctIdx){ + return assignService.getPrjctFieldworkAssign(prjctIdx); + } + + @PutMapping("/prjct-fieldwork/{prjctIdx}") + public void upsertPrjctFieldworkAssign(@PathVariable Long prjctIdx, @RequestBody List assignUserIdList, RequestUserContext ctx){ + assignService.upsertPrjctFieldworkAssign(prjctIdx, assignUserIdList, ctx.getUserId()); + systemEventLogService.writeAssignUserProject(ctx.getUserId(), ctx.getClientIp(), prjctIdx, assignUserIdList); + } } 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 ce1eb85..42b21f0 100644 --- a/src/main/java/com/kri/contact/server/controller/UserController.java +++ b/src/main/java/com/kri/contact/server/controller/UserController.java @@ -40,16 +40,27 @@ public class UserController { @GetMapping() public List getUserList(RequestUserContext ctx){ + String searchCmpn = ctx.getUserCmpn(); + if(ctx.getUserRole() < AppConstant.OUTSOURCE_USER_ROLE){ + return userService.getUserList(); + } + else{ + return userService.getFieldworkUserListWithCmpn(searchCmpn); + } + } + + @GetMapping("fieldwork") + public List getFiledoworkUserList(RequestUserContext ctx){ String searchCmpn = ctx.getUserCmpn(); if(ctx.getUserRole() < AppConstant.OUTSOURCE_USER_ROLE){ searchCmpn = ""; } - return userService.getUserListWithCmpn(searchCmpn); + return userService.getFieldworkUserListWithCmpn(searchCmpn); } @GetMapping("outsource") - List getOutsourceList(RequestUserContext ctx){ + List getOutsourceList(){ return userService.getOutsourceList(); } diff --git a/src/main/java/com/kri/contact/server/dto/systemlog/ProjectIdxContentDto.java b/src/main/java/com/kri/contact/server/dto/systemlog/ProjectIdxContentDto.java deleted file mode 100644 index cb63f1f..0000000 --- a/src/main/java/com/kri/contact/server/dto/systemlog/ProjectIdxContentDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.kri.contact.server.dto.systemlog; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -@AllArgsConstructor -public class ProjectIdxContentDto { - public Long prjctIdx; -} diff --git a/src/main/java/com/kri/contact/server/dto/systemlog/UserIdContentDto.java b/src/main/java/com/kri/contact/server/dto/systemlog/UserIdContentDto.java deleted file mode 100644 index 4d3a94b..0000000 --- a/src/main/java/com/kri/contact/server/dto/systemlog/UserIdContentDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.kri.contact.server.dto.systemlog; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -@AllArgsConstructor -public class UserIdContentDto { - private String userId; -} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java index 1bf1cbb..4e0990d 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java @@ -17,6 +17,8 @@ public interface UserRepository extends JpaRepository, JpaSpe List findByDelFalse(); + List findByUserRoleGreaterThanEqualAndDelFalse(Integer userRoleCd); + List findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn, Integer userRoleCd); @Query(""" 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 f3006f9..e8004c7 100644 --- a/src/main/java/com/kri/contact/server/service/AssignService.java +++ b/src/main/java/com/kri/contact/server/service/AssignService.java @@ -26,6 +26,14 @@ public class AssignService { ); } + public List getPrjctFieldworkAssign(Long prjctIdx){ + return projectAssignRepository.findAssignUserIdByPrjctIdxAndRoleRange( + prjctIdx, + AppConstant.FIELDWORK_USER_ROLE, + AppConstant.FIELDWORK_USER_ROLE + 1000 + ); + } + @Transactional public void upsertPrjctOutsourceAssign(Long prjctIdx, List assignUserIdList, String regUser){ projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange( @@ -34,6 +42,21 @@ public class AssignService { AppConstant.OUTSOURCE_USER_ROLE + 1000 ); + insertPrjctAssign(prjctIdx, assignUserIdList, regUser); + } + + @Transactional + public void upsertPrjctFieldworkAssign(Long prjctIdx, List assignUserIdList, String regUser){ + projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange( + prjctIdx, + AppConstant.FIELDWORK_USER_ROLE, + AppConstant.FIELDWORK_USER_ROLE + 1000 + ); + + insertPrjctAssign(prjctIdx, assignUserIdList, regUser); + } + + private void insertPrjctAssign(Long prjctIdx, List assignUserIdList, String regUser){ if (assignUserIdList == null || assignUserIdList.isEmpty()) { return; } 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 9317a9f..99e994c 100644 --- a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java +++ b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java @@ -2,15 +2,12 @@ package com.kri.contact.server.service; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.contact.server.dto.*; -import com.kri.contact.server.dto.systemlog.ProjectIdxContentDto; import com.kri.contact.server.dto.systemlog.UploadUserContentDto; -import com.kri.contact.server.dto.systemlog.UserIdContentDto; import com.kri.contact.server.common.enums.SystemEventType; import com.kri.contact.server.persistence.entity.TSysEventLogEntity; import com.kri.contact.server.persistence.repository.SystemEventLogRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -24,13 +21,27 @@ public class SystemEventLogService { private final SystemEventLogRepository systemEventLogRepository; public void writeLoginLog(String userId, String clientIp) { - UserIdContentDto content = new UserIdContentDto(userId); - writeSystemLog(SystemEventType.LOGIN, "Login", null, userId, clientIp, content); + writeSystemLog( + SystemEventType.LOGIN, + "Login", + null, + userId, + clientIp, + "userId", + userId + ); } public void writeLogoutLog(String userId, String clientIp) { - UserIdContentDto content = new UserIdContentDto(userId); - writeSystemLog(SystemEventType.LOGOUT, "Logout", null, userId, clientIp, content); + writeSystemLog( + SystemEventType.LOGOUT, + "Logout", + null, + userId, + clientIp, + "userId", + userId + ); } public void writeCreatUserLog(String regId, String clientIp, UserInfoDto userInfo){ @@ -46,8 +57,15 @@ public class SystemEventLogService { } public void writeDeleteUserLog(String regId, String clientIp, String userId){ - UserIdContentDto content = new UserIdContentDto(userId); - writeSystemLog(SystemEventType.DELETE_USER, "Delete User", null, regId, clientIp, content); + writeSystemLog( + SystemEventType.DELETE_USER, + "Delete User", + null, + regId, + clientIp, + "userId", + userId + ); } public void writeCreateProject(String regId, String clientIp, Long prjctIdx, ProjectCreateRequestDto req){ @@ -59,12 +77,30 @@ public class SystemEventLogService { } public void writeDeleteProject(String regId, String clientIp, Long prjctIdx){ - ProjectIdxContentDto content = new ProjectIdxContentDto(prjctIdx); - writeSystemLog(SystemEventType.DELETE_PROJECT, "Delete Project", prjctIdx, regId, clientIp, content); + writeSystemLog( + SystemEventType.DELETE_PROJECT, + "Delete Project", + prjctIdx, + regId, + clientIp, + "prjctIdx", + prjctIdx + ); } - @Transactional - protected void writeSystemLog( + public void writeAssignUserProject(String regId, String clientIp, Long prjctIdx, List assignUserIdList){ + writeSystemLog( + SystemEventType.ASSIGN_PROJECT_USER, + "Assign Project FW User", + prjctIdx, + regId, + clientIp, + "assignUserIdList", + assignUserIdList + ); + } + + protected void writeSystemLog( SystemEventType eventType, String title, Long prjctIdx, @@ -74,6 +110,30 @@ public class SystemEventLogService { ) { Map contentMap = toMap(objectMapper, content); + saveLog(eventType, title, prjctIdx, regId, clientIp, contentMap); + } + + protected void writeSystemLog( + SystemEventType eventType, + String title, + Long prjctIdx, + String regId, + String clientIp, + String contentKey, + T content + ) { + Map contentMap = Map.of(contentKey, content); + saveLog(eventType, title, prjctIdx, regId, clientIp, contentMap); + } + + private void saveLog( + SystemEventType eventType, + String title, + Long prjctIdx, + String regId, + String clientIp, + Map contentMap + ){ TSysEventLogEntity log = TSysEventLogEntity.builder() .eventTy(eventType.getCode()) .logTitle(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 35a319c..08011c5 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -155,10 +155,16 @@ public class UserService { ); } - public List getUserListWithCmpn(String searchCmpn){ + public List getUserList(){ + return userRepository.findByDelFalse().stream() + .map(UserInfoDto::from) + .toList(); + } + + public List getFieldworkUserListWithCmpn(String searchCmpn){ List userList; if(searchCmpn == null || searchCmpn.isBlank()){ - userList = userRepository.findByDelFalse(); + userList = userRepository.findByUserRoleGreaterThanEqualAndDelFalse(AppConstant.FIELDWORK_USER_ROLE); } else{ userList = userRepository.findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(searchCmpn, AppConstant.FIELDWORK_USER_ROLE);