From 7f249dec86ab1ac96995a464c791768b52e05bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 30 Jul 2025 11:52:34 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/aop/LoginFailAspect.java | 14 --- .../application/aop/LoginSuccessAspect.java | 11 --- .../application/aop/RoleUpdateAspect.java | 30 ------ .../security/AdminAuthFailEvent.java | 12 --- .../domain/GetNoticeUploadFile.java | 3 +- .../java/app/module/admin/EnableJsonUTF8.java | 30 ------ .../initData/InitAdminUserRoleTestData.java | 26 ----- .../security/AdminAuthFailHandlerTest.java | 72 -------------- .../security/AdminDetailsServiceTest.java | 71 -------------- .../dao/AdminCreateUpdateDaoTest.java | 55 ----------- .../resources/application-override.properties | 11 --- .../adapters/persistence/entity/Admin.java | 35 ------- .../persistence/entity/AdminHasRole.java | 18 ---- .../persistence/entity/FrontUser.java | 53 ---------- .../persistence/entity/FrontUserHasRole.java | 18 ---- .../entity/FrontUserHasUploadFile.java | 22 ----- .../persistence/entity/Household.java | 50 ---------- .../entity/NoticeHasUploadFile.java | 22 ----- .../persistence/entity/OperationLog.java | 28 ------ .../persistence/entity/PersistentLogins.java | 23 ----- .../persistence/entity/UriHasRole.java | 18 ---- .../persistence/repository/AdminRepo.java | 8 -- .../repository/OperationLogRepo.java | 8 -- .../persistence/repository/RoleRepo.java | 14 --- .../persistence/repository/UICodeRepo.java | 8 -- .../persistence/repository/URIRepo.java | 8 -- .../repository/UploadFileRepo.java | 8 -- .../config/application/enums/UiCodeType.java | 12 --- .../application/util/AESEncryptUtil.java | 96 ------------------- .../adapters/persistence/CreateFileDao.java | 2 +- .../persistence/CreateFileMapper.java | 2 +- .../file/model}/UploadFile.java | 2 +- .../persistence/LoggedInUserSaveDao.java | 2 +- .../persistence/LoggedInUserSaveMapper.java | 2 +- .../persistence/model}/LoggedInUser.java | 8 +- .../persistence/OperationLogListDao.java | 35 ------- .../persistence/OperationLogMapper.java | 17 ---- .../domain/OperationLogElement.java | 42 -------- .../domain/OperationLogListFilterCommand.java | 16 ---- .../port/in/OperationLogListPortIn.java | 11 --- .../port/in/OperationLogListService.java | 22 ----- .../port/out/OperationLogListPortOut.java | 11 --- .../persistence/OperationLogSaveDao.java | 26 ----- .../persistence/OperationLogSaveMapper.java | 9 -- .../domain/OperationLogSaveCommand.java | 25 ----- .../port/in/OperationLogSavePortIn.java | 8 -- .../port/in/OperationLogSaveService.java | 18 ---- .../port/out/OperationLogSavePortOut.java | 8 -- .../adapters/persistence/RoleSaveDao.java | 2 +- .../adapters/persistence/RoleSaveMapper.java | 2 +- .../uicode/model}/UICode.java | 4 +- .../adapters/persistence/UICodeSaveDao.java | 2 +- .../persistence/UICodeSaveMapper.java | 2 +- .../persistence/UICodeTopTierDao.java | 2 +- .../persistence/UICodeTopTierMapper.java | 2 +- .../URICurrentMatchingService.java | 2 +- .../adapters/persistence/GetUrisDao.java | 4 +- .../ports/application/domain/URIElement.java | 2 +- .../entity => usecase/uri/model}/Role.java | 2 +- .../uri/model}/RoleHasPrivilege.java | 2 +- .../entity => usecase/uri/model}/URI.java | 2 +- .../save/adapters/persistence/URISaveDao.java | 2 +- .../adapters/persistence/UriSaveMapper.java | 2 +- .../ports/application/URIViewService.java | 2 +- .../adapters/persistence/CreateUserDao.java | 60 ------------ .../persistence/CreateUserMapper.java | 11 --- .../model/SaveFrontUserHasRoleParam.java | 21 ---- .../createUser/ports/CreateUserPortIn.java | 11 --- .../createUser/ports/CreateUserPortOut.java | 11 --- .../ports/application/CreateUserService.java | 25 ----- .../ports/application/domain/CreateUser.java | 22 ----- .../application/domain/CreateUserCmd.java | 25 ----- .../adapters/persistence/FindUserDao.java | 51 ---------- .../adapters/persistence/FindUserMapper.java | 18 ---- .../persistence/model/FindUserDto.java | 27 ------ .../user/findUser/ports/FindUserPortIn.java | 11 --- .../user/findUser/ports/FindUserPortOut.java | 11 --- .../ports/application/FindUserService.java | 51 ---------- .../application/domain/FindProfileImages.java | 20 ---- .../ports/application/domain/FindUser.java | 33 ------- .../ports/application/domain/FindUserCmd.java | 15 --- .../application/domain/FindUserPrivilege.java | 17 ---- .../application/domain/FindUserRole.java | 20 ---- .../adapters/persistence/GetRolesDao.java | 21 ---- .../adapters/persistence/GetRolesMapper.java | 12 --- .../user/getRoles/ports/GetRolesPortIn.java | 11 --- .../user/getRoles/ports/GetRolesPortOut.java | 11 --- .../ports/application/GetRolesService.java | 22 ----- .../ports/application/domain/GetRoles.java | 22 ----- .../ports/application/domain/GetRolesCmd.java | 16 ---- .../adapters/persistence/GetUsersDao.java | 56 ----------- .../adapters/persistence/GetUsersMapper.java | 19 ---- .../persistence/model/GetUsersDto.java | 25 ----- .../user/getUsers/ports/GetUsersPortIn.java | 11 --- .../user/getUsers/ports/GetUsersPortOut.java | 11 --- .../ports/application/GetUsersService.java | 22 ----- .../ports/application/domain/GetUsers.java | 30 ------ .../ports/application/domain/GetUsersCmd.java | 16 ---- .../application/domain/GetUsersPrivilege.java | 13 --- .../application/domain/GetUsersRole.java | 17 ---- .../persistence/UpdateFrontUserDao.java | 56 ----------- .../persistence/UpdateFrontUserMapper.java | 13 --- .../UpdateFrontUserHasUploadFileParam.java | 20 ---- .../model/UpdateFrontUserParam.java | 18 ---- .../ports/UpdateFrontUserPortIn.java | 8 -- .../ports/UpdateFrontUserPortOut.java | 8 -- .../application/UpdateFrontUserService.java | 54 ----------- .../domain/UpdateFrontUserInCmd.java | 19 ---- .../domain/UpdateFrontUserOutCmd.java | 29 ------ .../adapters/persistence/UpdateUserDao.java | 52 ---------- .../persistence/UpdateUserMapper.java | 13 --- .../model/UpdateFrontUserByAdminParam.java | 18 ---- .../model/UpdateFrontUserHasRoleParam.java | 20 ---- .../ports/UpdateUserPortIn.java | 8 -- .../ports/UpdateUserPortOut.java | 8 -- .../ports/application/UpdateUserService.java | 19 ---- .../application/domain/UpdateUserCmd.java | 22 ----- .../persistence/SaveUserPrivilegeDao.java | 2 +- .../persistence/SaveUserPrivilegeMapper.java | 2 +- .../persistence/model}/Privilege.java | 2 +- .../adapters/persistence/SaveUserRoleDao.java | 2 +- .../persistence/SaveUserRoleMapper.java | 2 +- .../loggedinuser/LoggedInUserSaveMapper.xml | 4 +- .../operationlog/OperationLogMapper.xml | 62 ------------ .../operationlog/OperationLogSaveMapper.xml | 26 ----- .../mappers/uicode/UICodeTopTierMapper.xml | 6 +- .../domain/GetNoticeUploadFile.java | 3 +- 127 files changed, 40 insertions(+), 2337 deletions(-) delete mode 100644 admin/src/test/java/app/module/admin/EnableJsonUTF8.java delete mode 100644 admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java delete mode 100644 admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java delete mode 100644 admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java delete mode 100644 admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java delete mode 100644 admin/src/test/resources/application-override.properties delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasRole.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasUploadFile.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/OperationLog.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/repository/AdminRepo.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/repository/OperationLogRepo.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/repository/UICodeRepo.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/repository/URIRepo.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/repository/UploadFileRepo.java delete mode 100644 core/src/main/java/app/module/core/config/application/enums/UiCodeType.java delete mode 100644 core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java rename core/src/main/java/app/module/core/{config/adapters/persistence/entity => usecase/file/model}/UploadFile.java (90%) rename core/src/main/java/app/module/core/{config/adapters/persistence/entity => usecase/loggedinuser/save/adapter/persistence/model}/LoggedInUser.java (54%) delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogListFilterCommand.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListService.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/list/application/port/out/OperationLogListPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/save/application/domain/OperationLogSaveCommand.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSavePortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSaveService.java delete mode 100644 core/src/main/java/app/module/core/usecase/operationlog/save/application/port/out/OperationLogSavePortOut.java rename core/src/main/java/app/module/core/{config/adapters/persistence/entity => usecase/uicode/model}/UICode.java (82%) rename core/src/main/java/app/module/core/{config/adapters/persistence/entity => usecase/uri/model}/Role.java (93%) rename core/src/main/java/app/module/core/{config/adapters/persistence/entity => usecase/uri/model}/RoleHasPrivilege.java (86%) rename core/src/main/java/app/module/core/{config/adapters/persistence/entity => usecase/uri/model}/URI.java (94%) delete mode 100644 core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserCmd.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserPrivilege.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRolesCmd.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/GetUsersService.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersCmd.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/UpdateUserService.java delete mode 100644 core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java rename core/src/main/java/app/module/core/{config/adapters/persistence/entity => usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model}/Privilege.java (85%) delete mode 100644 core/src/main/resources/mappers/operationlog/OperationLogMapper.xml delete mode 100644 core/src/main/resources/mappers/operationlog/OperationLogSaveMapper.xml diff --git a/admin/src/main/java/app/module/admin/config/application/aop/LoginFailAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/LoginFailAspect.java index 202aa9bc..74302d3f 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/LoginFailAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/LoginFailAspect.java @@ -1,11 +1,6 @@ package app.module.admin.config.application.aop; -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.enums.OperationLogType; -import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.MessageUtil; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.aspectj.lang.JoinPoint; @@ -18,21 +13,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class LoginFailAspect { - private final OperationLogSavePortIn operationLogSavePortIn; private final MessageUtil messageUtil; @After("@annotation(app.module.admin.config.application.aop.LoginFailOperateLog)") public void operate(JoinPoint joinPoint) throws Throwable { Object[] args = joinPoint.getArgs(); HttpServletRequest request = (HttpServletRequest) args[0]; - String targetId = request.getParameter("username"); - operationLogSavePortIn.connect( - new OperationLogSaveCommand( - AppType.ADMIN, - OperationLogType.LOGIN_FAIL, - targetId, - CommonUtil.getClientIP(request), - messageUtil.getMessage("operate.login.fail", targetId))); } } diff --git a/admin/src/main/java/app/module/admin/config/application/aop/LoginSuccessAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/LoginSuccessAspect.java index fca4668c..6d7d251b 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/LoginSuccessAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/LoginSuccessAspect.java @@ -4,8 +4,6 @@ import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.OperationLogType; import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.MessageUtil; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -20,8 +18,6 @@ import org.springframework.stereotype.Component; @Slf4j @RequiredArgsConstructor public class LoginSuccessAspect { - - private final OperationLogSavePortIn operationLogSavePortIn; private final MessageUtil messageUtil; @After("@annotation(app.module.admin.config.application.aop.LoginSuccessOperateLog)") @@ -31,12 +27,5 @@ public class LoginSuccessAspect { HttpServletRequest request = (HttpServletRequest) args[0]; Authentication authentication = (Authentication) args[2]; - operationLogSavePortIn.connect( - new OperationLogSaveCommand( - AppType.ADMIN, - OperationLogType.LOGIN_SUCCESS, - null, - CommonUtil.getClientIP(request), - messageUtil.getMessage("operate.login.success", authentication.getName()))); } } diff --git a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java index f54a3dfa..22b770de 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java @@ -5,8 +5,6 @@ import app.module.core.config.application.enums.OperationLogType; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.aspectj.lang.ProceedingJoinPoint; @@ -27,7 +25,6 @@ import java.util.Optional; public class RoleUpdateAspect { private final AdminViewPortIn adminViewPortIn; - private final OperationLogSavePortIn operationLogSavePortIn; @Around( "execution(* app.module.core.usecase.admin.saveAdmin.ports.application.SaveAdminService.connect(..))") @@ -54,34 +51,7 @@ public class RoleUpdateAspect { // .map(adminUserWithRole -> adminUserWithRole.getRole().getId()) // .collect(Collectors.toList()); - boolean createLog = false; - if (beforeAdmin.isPresent()) { - List beforeRoles = - beforeAdmin.stream().map(r -> r.getRole().getId()).toList(); - if (beforeRoles.size() != currentRoles.size() - || currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) { - createLog = true; - } - } else if (!currentRoles.isEmpty()) { - createLog = true; - } - - if (createLog) { - String operatorId = Optional.ofNullable(CommonUtil.getLoginUsername()) - .orElse("init data"); - HttpServletRequest request = CommonUtil.getRequest(); - - operationLogSavePortIn.connect( - new OperationLogSaveCommand( - AppType.ADMIN, - OperationLogType.ROLE_UPDATE, - adminId, - request != null ? CommonUtil.getClientIP(request) : null, - String.format( - "`%s` grants [%s] permissions to `%s`", - operatorId, StringUtils.join(currentRoles, ", "), adminId))); - } return joinPoint.proceed(); } diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java index 7e892c83..09a87d5c 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java @@ -7,8 +7,6 @@ import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.status.ports.AdminUpdateAccountLockPortIn; import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,7 +29,6 @@ public class AdminAuthFailEvent { private final AdminViewPortIn adminViewPortIn; private final AdminUpdateLoginFailPortIn updateLoginFailPortIn; private final AdminUpdateAccountLockPortIn updateAccountLockPortIn; - private final OperationLogSavePortIn operationLogSavePortIn; private final MessageUtil messageUtil; @Value("${app.admin.auth.fail.permit}") private int failPermit; @@ -61,15 +58,6 @@ public class AdminAuthFailEvent { request.getSession(), messageUtil.getMessage("security.auth.fail.exceed", failPermit)); - // 계정 잠금 로그 기록 - operationLogSavePortIn.connect( - new OperationLogSaveCommand( - AppType.ADMIN, - OperationLogType.ACCOUNT_LOCKED, - adminUserViewInfo.getId(), - CommonUtil.getClientIP(request), - messageUtil.getMessage( - "operate.account.locked", adminUserViewInfo.getId()))); } }); } diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java index a8101264..03d90e4c 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain; import app.module.core.config.application.enums.FileUploadType; +import app.module.core.usecase.file.model.UploadFile; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,7 +10,7 @@ import java.io.Serializable; import java.time.LocalDateTime; /** - * DTO for {@link app.module.core.config.adapters.persistence.entity.UploadFile} + * DTO for {@link UploadFile} */ @Data @AllArgsConstructor diff --git a/admin/src/test/java/app/module/admin/EnableJsonUTF8.java b/admin/src/test/java/app/module/admin/EnableJsonUTF8.java deleted file mode 100644 index 89f8d8d4..00000000 --- a/admin/src/test/java/app/module/admin/EnableJsonUTF8.java +++ /dev/null @@ -1,30 +0,0 @@ -package app.module.admin; - -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; -import org.springframework.web.filter.CharacterEncodingFilter; - -import java.lang.annotation.*; - -/** - * MockMvc `application/json` 타입 전송 시 UTF-8 설정 어노테이션 - * - * @author Youngmok Kim - * @version 1.0 2022-06-27 - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@AutoConfigureMockMvc -@Import(EnableJsonUTF8.Config.class) -public @interface EnableJsonUTF8 { - - class Config { - - @Bean - public CharacterEncodingFilter characterEncodingFilter() { - return new CharacterEncodingFilter("UTF-8", true); - } - } -} diff --git a/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java b/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java deleted file mode 100644 index e8512087..00000000 --- a/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java +++ /dev/null @@ -1,26 +0,0 @@ -package app.module.admin.config.initData; - -import app.module.core.config.adapters.persistence.repository.RoleRepo; -import lombok.RequiredArgsConstructor; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.env.Environment; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -public class InitAdminUserRoleTestData implements ApplicationRunner { - - private final RoleRepo roleRepo; - private final Environment env; - - @Override - public void run(ApplicationArguments args) { - if (!env.getProperty("admin.initData.test", Boolean.class)) { - return; - } - -// roleRepo.save(new Role("ROLE_SUPER")); -// roleRepo.save(new Role("ROLE_STAFF")); - } -} diff --git a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java deleted file mode 100644 index 37207ff8..00000000 --- a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java +++ /dev/null @@ -1,72 +0,0 @@ -package app.module.admin.config.security; - -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import app.module.core.usecase.admin.view.ports.AdminViewPortIn; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.web.servlet.MockMvc; - -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; - -@SpringBootTest -@TestPropertySource("classpath:application-override.properties") -@AutoConfigureMockMvc -@TestInstance(Lifecycle.PER_CLASS) -class AdminAuthFailHandlerTest { - - static { - System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true"); - } - - @Autowired - MockMvc mockMvc; - @Autowired - AdminViewPortIn adminViewPortIn; - @Autowired - SaveAdminPortIn saveAdminPortIn; - - @Value("${app.admin.auth.fail.permit}") - Integer loginFailPermit; - - String testUsername = "testUser"; - - @BeforeAll - public void beforeAll() { - /* saveAdminPortIn.connect( - 1L, - testUsername, - "test.1@#$", - null, - false, - Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));*/ - } - - @Test - @DisplayName("operate - 계정 잠김") - void onAuthenticationFailure() throws Exception { - String badPassword = "bad-password.1@#$"; - String goodPassword = "test.1@#$"; - - for (int i = 0; i < loginFailPermit; i++) { - mockMvc.perform(formLogin().user(testUsername).password(badPassword)); - } - - assertTrue( - adminViewPortIn.connect(testUsername).orElseThrow().getAccountLocked(), - String.format("%s 회 이상 로그인 실패로 계정이 잠김처리되어야 한다.", loginFailPermit)); - - mockMvc - .perform(formLogin().user(testUsername).password(goodPassword)) - .andExpect(unauthenticated()); - } -} diff --git a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java deleted file mode 100644 index 68dba740..00000000 --- a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package app.module.admin.config.security; - -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.web.servlet.MockMvc; - -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; - -@SpringBootTest -@TestPropertySource("classpath:application-override.properties") -@AutoConfigureMockMvc -@TestInstance(Lifecycle.PER_CLASS) -class AdminDetailsServiceTest { - - static { - System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true"); - } - - @Autowired - MockMvc mockMvc; - @Autowired - SaveAdminPortIn saveAdminPortIn; - - String username = "test"; - String password = "test.1@#$"; - String oldUsername = "admin_for_old_password_test"; - - @BeforeAll - public void beforeAll() { - /* saveAdminPortIn.connect( - 1L, - username, - password, - null, - false, - Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));*/ - - - } - - @Test - @DisplayName("operate - 로그인 성공") - void operate1() throws Exception { - mockMvc.perform(formLogin().user(username).password(password)).andExpect(authenticated()); - } - - @Test - @DisplayName("operate - 로그인 실패") - void operate2() throws Exception { - String badPassword = "bad-password.1@#$"; - mockMvc.perform(formLogin().user(username).password(badPassword)) - .andExpect(unauthenticated()); - } - - // @Test - // @DisplayName("operate - 패스워드 유효기간 지남") - // void operate3() throws Exception { - // - // mockMvc.perform(formLogin().user(oldUsername).password(password)).andExpect(unauthenticated()); - // } -} diff --git a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java deleted file mode 100644 index e06fd722..00000000 --- a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package app.module.admin.feature.admin.repository.dao; - -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - - - -@Slf4j -class AdminCreateUpdateDaoTest { - - static { - System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true"); - } - -/* @Autowired - SaveAdminPortOut adminCreateUpdateDao; - @Autowired - AdminViewPortIn adminViewPortIn; - @Autowired - SaveAdminPortIn saveAdminPortIn;*/ - - @Test - @DisplayName("operate - AdminCreateDao") - void operate() { - - /* saveAdminPortIn.connect( - 1L, - "admin_for_createDao_test", - "test.1@#$", - null, - false, - Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); - - adminViewPortIn - .connect("admin_for_createDao_test") - .ifPresent( - retrieveUser -> - assertEquals( - Arrays.asList("ROLE_SUPER", "ROLE_STAFF").size(), - retrieveUser.getRoles().size())); - - saveAdminPortIn.connect( - 2L, - "admin_for_createDao_test", - "test.1@#$", - null, - false, - List.of("ROLE_STAFF")); - assertEquals( - 1, - adminViewPortIn.connect("admin_for_createDao_test").orElseThrow().getRoles().size(), - "기존 권한들을 (내부적으로) 삭제하고 새로이 추가 등록되기에 withRoles 의 size 는 1이다.");*/ - } -} diff --git a/admin/src/test/resources/application-override.properties b/admin/src/test/resources/application-override.properties deleted file mode 100644 index 939ee5c2..00000000 --- a/admin/src/test/resources/application-override.properties +++ /dev/null @@ -1,11 +0,0 @@ -# disable JNDI lookup -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration -spring.profiles.active=local -spring.jpa.hibernate.ddl-auto=create -spring.datasource.url=jdbc:h2:~/test; -spring.datasource.username=sa -spring.datasource.password= -spring.datasource.driver-class-name=org.h2.Driver -spring.jpa.properties.hibernate.show_sql=true -logging.level.org.hibernate.type.descriptor.sql=trace -admin.initData.test=true diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java deleted file mode 100644 index 8b88d203..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java +++ /dev/null @@ -1,35 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class Admin extends AuditEntity { - private Long seq; - - private String id; - - private String password; - - private String email; - - private LocalDateTime passwordUpdatedAt; - - private Boolean accountDisabled; - - private Integer loginFailCnt; - - private Boolean accountLocked; - - public Admin(String id) { - this.id = id; - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java deleted file mode 100644 index 29feec3b..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.*; - -@Getter -@Setter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class AdminHasRole extends AuditEntity { - - private Long id; - - private String adminId; - - private String roleId; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java deleted file mode 100644 index 79d30c10..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java +++ /dev/null @@ -1,53 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class FrontUser extends AuditEntity { - - private String id; - - private String password; - - private String email; - - private String nickname; - - private SignUpType signUpType; - - private LocalDateTime passwordUpdatedAt; - - private Boolean accountDisabled; - - private Integer loginFailCnt; - - private Boolean accountLocked; - -// private String roleId; - - private String uploadFileId; - - public FrontUser(String id) { - this.id = id; - } - - public FrontUser(String id, String email, String nickname, Boolean accountDisabled, - Integer loginFailCnt, Boolean accountLocked) { - this.id = id; - this.email = email; - this.nickname = nickname; - this.accountDisabled = accountDisabled; - this.loginFailCnt = loginFailCnt; - this.accountLocked = accountLocked; - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasRole.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasRole.java deleted file mode 100644 index c5a539c3..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasRole.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -public class FrontUserHasRole extends AuditEntity { - - private Long id; - - private String frontUSerId; - - private String roleId; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasUploadFile.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasUploadFile.java deleted file mode 100644 index 7ebc8e03..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasUploadFile.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class FrontUserHasUploadFile extends AuditEntity { - - private String frontUserId; - - private Long uploadFilesId; - - public FrontUserHasUploadFile(String frontUserId) { - this.frontUserId = frontUserId; - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java deleted file mode 100644 index 6e36bd4a..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java +++ /dev/null @@ -1,50 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class Household extends AuditEntity { - - private Long id; - - private String householdNum; - - private String ownerName; - - private Integer ownerAge; - - private String tel; - - private String phone; - - private String password; - - private String region; - - private String city; - - private String addressDetail; - - private Integer industryLargeCode; - - private Integer industryMiddleCode; - - private Integer industrySmallCode; - - private Integer scaleCode; - - private Integer employmentType; - - private Boolean isPanel; - - private String memo; - - private String dropReason; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java deleted file mode 100644 index 9b1a58e6..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class NoticeHasUploadFile extends AuditEntity { - - private Long noticeId; - - private Long uploadFilesId; - - public NoticeHasUploadFile(Long noticeId) { - this.noticeId = noticeId; - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/OperationLog.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/OperationLog.java deleted file mode 100644 index 75653666..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/OperationLog.java +++ /dev/null @@ -1,28 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.enums.OperationLogType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class OperationLog extends AuditEntity { - - private Long id; - - private AppType appType; - - private OperationLogType operationLogType; - - private String targetId; - - private String ip; - - private String taskDesc; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java deleted file mode 100644 index f95f5bf4..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java +++ /dev/null @@ -1,23 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -/** - * Spring Security - Remember me 기능을 위한 엔티티 - */ -@Getter -@Setter -public class PersistentLogins extends AuditEntity { - - private String series; - - private String username; - - private String token; - - private Date lastUsed; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java deleted file mode 100644 index 6fa946b1..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.*; - -@Getter -@Setter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class UriHasRole extends AuditEntity { - - private Long id; - - private String uriId; - - private String roleId; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/AdminRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/AdminRepo.java deleted file mode 100644 index 99ad2e8c..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/AdminRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface AdminRepo { - -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/OperationLogRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/OperationLogRepo.java deleted file mode 100644 index d61943d8..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/OperationLogRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface OperationLogRepo { - -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java deleted file mode 100644 index e2a02270..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import app.module.core.config.adapters.persistence.entity.Role; -import app.module.core.config.application.enums.AppType; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.data.domain.Sort; - -import java.util.List; - -@Mapper -public interface RoleRepo { - - List findAllByAppType(AppType appType, Sort sort); -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/UICodeRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/UICodeRepo.java deleted file mode 100644 index 23348df6..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/UICodeRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UICodeRepo { - -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/URIRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/URIRepo.java deleted file mode 100644 index 73b55c98..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/URIRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface URIRepo { - -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/UploadFileRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/UploadFileRepo.java deleted file mode 100644 index b5a4b2e6..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/UploadFileRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UploadFileRepo { - -} diff --git a/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java b/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java deleted file mode 100644 index b2baacfa..00000000 --- a/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.core.config.application.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum UiCodeType { - REGION_MAIN("code.region.main"), - REGION_SUB("code.region.sub"); - private final String code; -} diff --git a/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java b/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java deleted file mode 100644 index 5dde50c5..00000000 --- a/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java +++ /dev/null @@ -1,96 +0,0 @@ -package app.module.core.config.application.util; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import java.nio.charset.StandardCharsets; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.Base64; - -@Slf4j -@Component -public class AESEncryptUtil { - - @Value("${aes.secret-key}") - private String key; - - @Value("${encrypt.aes.iv}") - private String iv; - - private static final String AES_ALGORITHM = "AES/CBC/PKCS5PADDING"; - public static final String ENCRYPT_IV = "0123456789ABCDEF"; - - public String encrypt(String text) - throws NoSuchPaddingException, NoSuchAlgorithmException, BadPaddingException, - IllegalBlockSizeException, InvalidAlgorithmParameterException, InvalidKeyException { - Cipher cipher = Cipher.getInstance(getTransformation()); - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), "AES"); - IvParameterSpec ivParamSpec = new IvParameterSpec(iv.getBytes()); - cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivParamSpec); - - byte[] encrypted = cipher.doFinal(text.getBytes(StandardCharsets.UTF_8)); - return Base64.getEncoder().encodeToString(encrypted); - } - - public String decrypt(String cipherText) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, - InvalidKeyException, BadPaddingException, IllegalBlockSizeException { - Cipher cipher = Cipher.getInstance(getTransformation()); - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), "AES"); - IvParameterSpec ivParamSpec = new IvParameterSpec(iv.getBytes()); - cipher.init(Cipher.DECRYPT_MODE, keySpec, ivParamSpec); - - byte[] decodedBytes = Base64.getDecoder().decode(cipherText); - byte[] decrypted = cipher.doFinal(decodedBytes); - return new String(decrypted, StandardCharsets.UTF_8); - } - - - public byte[] encryptAesCbc(byte[] plainData) { - if (plainData == null || plainData.length == 0) { - throw new IllegalArgumentException("데이터는 null이거나 비어 있을 수 없습니다."); - } - - try { - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES"); - IvParameterSpec ivSpec = new IvParameterSpec(ENCRYPT_IV.getBytes(StandardCharsets.UTF_8)); - Cipher cipher = Cipher.getInstance(AES_ALGORITHM); - cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); - return org.apache.commons.codec.binary.Base64.encodeBase64(cipher.doFinal(plainData)); - } catch (Exception e) { - log.error("바이너리 데이터 암호화 실패", e); - throw new RuntimeException("바이너리 데이터 암호화 실패", e); - } - } - - public byte[] decryptAesCbc(byte[] cipherData) { - if (cipherData == null || cipherData.length == 0) { - throw new IllegalArgumentException("암호문은 null이거나 비어 있을 수 없습니다."); - } - - try { - byte[] encrypted = org.apache.commons.codec.binary.Base64.decodeBase64(cipherData); - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES"); - IvParameterSpec ivSpec = new IvParameterSpec(ENCRYPT_IV.getBytes(StandardCharsets.UTF_8)); - Cipher cipher = Cipher.getInstance(AES_ALGORITHM); - cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec); - return cipher.doFinal(encrypted); - } catch (Exception e) { - log.error("바이너리 데이터 복호화 실패", e); - throw new RuntimeException("바이너리 데이터 복호화 실패", e); - } - } - - private String getTransformation() { - return "AES/CBC/PKCS5Padding"; - } -} diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java index 3de8502b..b0a57a6f 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.file.createFile.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UploadFile; +import app.module.core.usecase.file.model.UploadFile; import app.module.core.config.application.enums.FileStorageType; import app.module.core.usecase.file.createFile.ports.CreateFilePortOut; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile; diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileMapper.java b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileMapper.java index b031aef7..5abbb20b 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileMapper.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.file.createFile.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UploadFile; +import app.module.core.usecase.file.model.UploadFile; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java b/core/src/main/java/app/module/core/usecase/file/model/UploadFile.java similarity index 90% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java rename to core/src/main/java/app/module/core/usecase/file/model/UploadFile.java index 42d06f28..1bab2526 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java +++ b/core/src/main/java/app/module/core/usecase/file/model/UploadFile.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.file.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.FileUploadType; diff --git a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java index 47d42c27..987aaf86 100644 --- a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.loggedinuser.save.adapter.persistence; -import app.module.core.config.adapters.persistence.entity.LoggedInUser; +import app.module.core.usecase.loggedinuser.save.adapter.persistence.model.LoggedInUser; import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortOut; import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveMapper.java b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveMapper.java index 2a8732a4..5b0864a5 100644 --- a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.loggedinuser.save.adapter.persistence; -import app.module.core.config.adapters.persistence.entity.LoggedInUser; +import app.module.core.usecase.loggedinuser.save.adapter.persistence.model.LoggedInUser; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/model/LoggedInUser.java similarity index 54% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java rename to core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/model/LoggedInUser.java index cd328306..88485e6a 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java +++ b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/model/LoggedInUser.java @@ -1,20 +1,18 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.loggedinuser.save.adapter.persistence.model; -import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; import lombok.*; import java.time.LocalDateTime; /** - * 동시접속 사용자 체크를 위한 기록용 엔티티 + * 사용자 로그 */ -@Builder @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class LoggedInUser extends AuditEntity { +public class LoggedInUser { private AppType appType; diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java b/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java deleted file mode 100644 index 49ad29fc..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java +++ /dev/null @@ -1,35 +0,0 @@ -package app.module.core.usecase.operationlog.list.adapter.persistence; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import app.module.core.usecase.operationlog.list.application.port.out.OperationLogListPortOut; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.ListUtils; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -@RequiredArgsConstructor -class OperationLogListDao implements OperationLogListPortOut { - - private final OperationLogMapper operationLogMapper; - - @Override - public Page connect( - Pageable pageable, OperationLogListFilterCommand operationLogListFilterCommand) { - - // 로그 목록 조회 - List contents = ListUtils.emptyIfNull( - operationLogMapper.getLogs(pageable, operationLogListFilterCommand)); - - return new PageImpl<>( - contents, - pageable, - contents.isEmpty() ? 0 : contents.get(0).getTotal() - ); - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java b/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java deleted file mode 100644 index adca345e..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.operationlog.list.adapter.persistence; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; - -import java.util.List; - -@Mapper -public interface OperationLogMapper { - List getLogs( - @Param("pageable") Pageable pageable, - @Param("cmd") OperationLogListFilterCommand cmd - ); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java deleted file mode 100644 index cde4c942..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java +++ /dev/null @@ -1,42 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.domain; - -import app.module.core.config.application.component.AuditOutput; -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.enums.OperationLogType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -public class OperationLogElement implements AuditOutput { - private String createdBy; - private LocalDateTime createdAt; - // 고유키 - private Long id; - // App 타입 - private AppType appType; - // 수행 작업 타입 - private OperationLogType operationLogType; - // 타겟 계정 - private String targetId; - // 접속 아이피 - private String ip; - // 수행 내용 설명 - private String taskDesc; - // 총개수 - Long total; - - @Override - public String getUpdatedBy() { - return null; - } - - @Override - public LocalDateTime getUpdatedAt() { - return null; - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogListFilterCommand.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogListFilterCommand.java deleted file mode 100644 index 75698944..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogListFilterCommand.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.domain; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class OperationLogListFilterCommand { - - private String searchField; - private String searchValue; - private String searchAppType; - private String searchOperationType; -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListPortIn.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListPortIn.java deleted file mode 100644 index 94015040..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.port.in; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -public interface OperationLogListPortIn { - - Page connect(Pageable pageable, OperationLogListFilterCommand condition); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListService.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListService.java deleted file mode 100644 index 8286af30..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListService.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.port.in; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import app.module.core.usecase.operationlog.list.application.port.out.OperationLogListPortOut; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class OperationLogListService implements OperationLogListPortIn { - - private final OperationLogListPortOut portOut; - - @Override - public Page connect( - Pageable pageable, OperationLogListFilterCommand condition) { - return portOut.connect(pageable, condition); - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/out/OperationLogListPortOut.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/out/OperationLogListPortOut.java deleted file mode 100644 index cbff12f1..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/out/OperationLogListPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.port.out; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -public interface OperationLogListPortOut { - - Page connect(Pageable pageable, OperationLogListFilterCommand condition); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveDao.java b/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveDao.java deleted file mode 100644 index 97bc9edc..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveDao.java +++ /dev/null @@ -1,26 +0,0 @@ -package app.module.core.usecase.operationlog.save.adapter.persistence; - -import app.module.core.config.adapters.persistence.entity.OperationLog; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.out.OperationLogSavePortOut; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class OperationLogSaveDao implements OperationLogSavePortOut { - - private final OperationLogSaveMapper mapper; - - @Override - public void connect(OperationLogSaveCommand saveCommand) { - mapper.insertOperationLog(new OperationLog( - null, - saveCommand.getAppType(), - saveCommand.getOperationLogType(), - saveCommand.getTargetId(), - saveCommand.getIp(), - saveCommand.getTaskDesc() - )); - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveMapper.java b/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveMapper.java deleted file mode 100644 index 1cff444c..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.core.usecase.operationlog.save.adapter.persistence; - -import app.module.core.config.adapters.persistence.entity.OperationLog; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface OperationLogSaveMapper { - void insertOperationLog(OperationLog log); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/application/domain/OperationLogSaveCommand.java b/core/src/main/java/app/module/core/usecase/operationlog/save/application/domain/OperationLogSaveCommand.java deleted file mode 100644 index 00043e9f..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/application/domain/OperationLogSaveCommand.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.usecase.operationlog.save.application.domain; - -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.enums.OperationLogType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -public class OperationLogSaveCommand { - - // App 타입 - private AppType appType; - // 수행 작업 타입 - private OperationLogType operationLogType; - // 타겟 계정 - private String targetId; - - // 접속 아이피 - private String ip; - // 수행 내용 설명 - private String taskDesc; -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSavePortIn.java b/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSavePortIn.java deleted file mode 100644 index 91ff00dc..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSavePortIn.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.operationlog.save.application.port.in; - -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; - -public interface OperationLogSavePortIn { - - void connect(OperationLogSaveCommand saveCommand); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSaveService.java b/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSaveService.java deleted file mode 100644 index 6ff2fd99..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSaveService.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.operationlog.save.application.port.in; - -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.out.OperationLogSavePortOut; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class OperationLogSaveService implements OperationLogSavePortIn { - - private final OperationLogSavePortOut operationLogSavePortout; - - @Override - public void connect(OperationLogSaveCommand saveCommand) { - operationLogSavePortout.connect(saveCommand); - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/out/OperationLogSavePortOut.java b/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/out/OperationLogSavePortOut.java deleted file mode 100644 index cef8f2ca..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/out/OperationLogSavePortOut.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.operationlog.save.application.port.out; - -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; - -public interface OperationLogSavePortOut { - - void connect(OperationLogSaveCommand saveCommand); -} diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java index 52d71432..9cbe2be9 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.role.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeDeleteParam; diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveMapper.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveMapper.java index de2d3a4e..3fd0dff1 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.role.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeDeleteParam; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam; import org.apache.ibatis.annotations.Mapper; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java b/core/src/main/java/app/module/core/usecase/uicode/model/UICode.java similarity index 82% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java rename to core/src/main/java/app/module/core/usecase/uicode/model/UICode.java index 3ce8ee01..4efa5f56 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java +++ b/core/src/main/java/app/module/core/usecase/uicode/model/UICode.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.uicode.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import lombok.AllArgsConstructor; @@ -10,7 +10,7 @@ import lombok.Setter; @Setter @RequiredArgsConstructor @AllArgsConstructor -public class UICode extends AuditEntity { +public class UICode { private String id; diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java index a31ec87f..ddd17a8a 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uicode.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UICode; +import app.module.core.usecase.uicode.model.UICode; import app.module.core.usecase.uicode.save.ports.UICodeSavePortOut; import app.module.core.usecase.uicode.save.ports.application.domain.UICodeSaveCommand; import app.module.core.usecase.uicode.view.adapters.persistence.UICodeViewMapper; diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveMapper.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveMapper.java index 8b5ee972..71befefe 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uicode.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UICode; +import app.module.core.usecase.uicode.model.UICode; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java index dfcfd939..07169cdb 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uicode.toptier.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UICode; +import app.module.core.usecase.uicode.model.UICode; import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortOut; import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTopTier; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java index 9a92296c..222a67fb 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uicode.toptier.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UICode; +import app.module.core.usecase.uicode.model.UICode; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java index 505b5420..b8754daf 100644 --- a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java +++ b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.currentmatch.ports.application; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.uri.currentmatch.ports.URICurrentMatchingPortIn; diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java index 6d2ebef9..4de2ffcf 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java @@ -1,7 +1,7 @@ package app.module.core.usecase.uri.getUris.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; -import app.module.core.config.adapters.persistence.entity.RoleHasPrivilege; +import app.module.core.usecase.uri.model.Role; +import app.module.core.usecase.uri.model.RoleHasPrivilege; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetRolesDto; import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetUrisDto; diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java index 49a64940..5fc346b4 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.getUris.ports.application.domain; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java b/core/src/main/java/app/module/core/usecase/uri/model/Role.java similarity index 93% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java rename to core/src/main/java/app/module/core/usecase/uri/model/Role.java index 9b001646..bb2602e6 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java +++ b/core/src/main/java/app/module/core/usecase/uri/model/Role.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.uri.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java b/core/src/main/java/app/module/core/usecase/uri/model/RoleHasPrivilege.java similarity index 86% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java rename to core/src/main/java/app/module/core/usecase/uri/model/RoleHasPrivilege.java index 1f8f4109..96e56ab7 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java +++ b/core/src/main/java/app/module/core/usecase/uri/model/RoleHasPrivilege.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.uri.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java b/core/src/main/java/app/module/core/usecase/uri/model/URI.java similarity index 94% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java rename to core/src/main/java/app/module/core/usecase/uri/model/URI.java index e10ef5d7..f0ea9698 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java +++ b/core/src/main/java/app/module/core/usecase/uri/model/URI.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.uri.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java index 991e9cf6..3b923c35 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.URI; +import app.module.core.usecase.uri.model.URI; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleDeleteParam; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleSaveParam; diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java index c32d5a9c..6b985547 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.URI; +import app.module.core.usecase.uri.model.URI; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleDeleteParam; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleSaveParam; import org.apache.ibatis.annotations.Mapper; diff --git a/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java b/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java index 40687f72..7d8737c1 100644 --- a/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java +++ b/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.view.ports.application; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; import app.module.core.usecase.uri.view.ports.URIViewPortIn; diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java deleted file mode 100644 index 5af5fd60..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java +++ /dev/null @@ -1,60 +0,0 @@ -package app.module.core.usecase.user.createUser.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.user.createUser.adapters.persistence.model.SaveFrontUserHasRoleParam; -import app.module.core.usecase.user.createUser.ports.CreateUserPortOut; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.Optional; - -@Repository -@RequiredArgsConstructor -class CreateUserDao implements CreateUserPortOut { - - private final CreateUserMapper mapper; - - @Override - @Transactional - public Optional operate(CreateUserCmd cmd) { - - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - mapper.insertFrontUser( - new FrontUser( - cmd.getId(), - cmd.getPassword(), - cmd.getEmail(), - cmd.getNickname(), - cmd.getSignUpType(), - LocalDateTime.now(), - cmd.isAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked(), - null - )); - - if(CollectionUtils.isNotEmpty(cmd.getRoles())) { - mapper.insertFrontUserHasRoles(new SaveFrontUserHasRoleParam( - cmd.getId(), cmd.getRoles(), now, userId, now, userId, false - )); - } - - return Optional.of(new CreateUser( - cmd.getId(), - cmd.getPassword(), - cmd.getEmail(), - cmd.isAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked(), - cmd.getRoles() - )); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserMapper.java b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserMapper.java deleted file mode 100644 index aaea5c46..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.createUser.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.usecase.user.createUser.adapters.persistence.model.SaveFrontUserHasRoleParam; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CreateUserMapper { - void insertFrontUser(FrontUser user); - void insertFrontUserHasRoles(SaveFrontUserHasRoleParam param); -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java deleted file mode 100644 index f6f5a1b5..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java +++ /dev/null @@ -1,21 +0,0 @@ -package app.module.core.usecase.user.createUser.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -public class SaveFrontUserHasRoleParam { - private String userId; - private Set roleIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private boolean deleted; -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java deleted file mode 100644 index 7d6fb3f3..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.createUser.ports; - -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; - -import java.util.Optional; - -public interface CreateUserPortIn { - - Optional operate(CreateUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java deleted file mode 100644 index 5e842578..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.createUser.ports; - -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; - -import java.util.Optional; - -public interface CreateUserPortOut { - - Optional operate(CreateUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java deleted file mode 100644 index 37a01e5d..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.usecase.user.createUser.ports.application; - -import app.module.core.usecase.user.createUser.ports.CreateUserPortIn; -import app.module.core.usecase.user.createUser.ports.CreateUserPortOut; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -@Service -@RequiredArgsConstructor -class CreateUserService implements CreateUserPortIn { - - private final CreateUserPortOut portOut; - private final BCryptPasswordEncoder passwordEncoder; - - @Override - public Optional operate(CreateUserCmd command) { - command.setPassword(passwordEncoder.encode(command.getPassword())); - return portOut.operate(command); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java deleted file mode 100644 index f42225a3..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.createUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateUser { - private String id; - private String password; - private String email; - private boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java deleted file mode 100644 index 46ac6445..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.usecase.user.createUser.ports.application.domain; - -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateUserCmd { - private String id; - private String password; - private String email; - private String nickname; - private SignUpType signUpType; - private boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java deleted file mode 100644 index c5e19d6f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java +++ /dev/null @@ -1,51 +0,0 @@ -package app.module.core.usecase.user.findUser.adapters.persistence; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.application.enums.FileUploadType; -import app.module.core.usecase.user.findUser.adapters.persistence.model.FindUserDto; -import app.module.core.usecase.user.findUser.ports.FindUserPortOut; -import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Optional; -import java.util.Set; - -@Repository -@RequiredArgsConstructor -class FindUserDao implements FindUserPortOut { - - private final FindUserMapper mapper; - - @Override - @Transactional - public Optional operate(FindUserCmd command) { - String id = command.getId(); - - FindUserDto dto = mapper.findUserById(id); - List roles = mapper.findRolesWithPrivilegesByUserId(id); - FindProfileImages image = mapper.findProfileImageByUserId(id, FileUploadType.PRIVATE.name()); - - return Optional.of(new FindUser( - dto.getId(), - dto.getPassword(), - dto.getEmail(), - dto.getNickname(), - dto.getSignUpType(), - dto.getPasswordUpdatedAt(), - dto.getAccountDisabled(), - dto.getLoginFailCnt(), - dto.getAccountLocked(), - dto.getCreatedAt(), - dto.getCreatedBy(), - dto.getUpdatedAt(), - dto.getUpdatedBy(), - Set.copyOf(roles), - image - )); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java deleted file mode 100644 index d1d2f43c..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.user.findUser.adapters.persistence; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.usecase.user.findUser.adapters.persistence.model.FindUserDto; -import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface FindUserMapper { - FindUserDto findUserById(String id); - List findRolesWithPrivilegesByUserId(String userId); - FindProfileImages findProfileImageByUserId( - @Param("userId") String userId, - @Param("fileUploadType") String fileUploadType); -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java deleted file mode 100644 index b89174b5..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package app.module.core.usecase.user.findUser.adapters.persistence.model; - -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -public class FindUserDto { - private String id; - private String password; - private String email; - private String nickname; - private SignUpType signUpType; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java deleted file mode 100644 index df97bbf9..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.findUser.ports; - -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; - -import java.util.Optional; - -public interface FindUserPortIn { - - Optional operate(FindUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java deleted file mode 100644 index 1a21eb90..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.findUser.ports; - -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; - -import java.util.Optional; - -public interface FindUserPortOut { - - Optional operate(FindUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java deleted file mode 100644 index 7c85a835..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java +++ /dev/null @@ -1,51 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application; - -import app.module.core.config.application.enums.FileStorageType; -import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; -import app.module.core.usecase.user.findUser.ports.FindUserPortIn; -import app.module.core.usecase.user.findUser.ports.FindUserPortOut; -import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -@Service -@RequiredArgsConstructor -class FindUserService implements FindUserPortIn { - - private final FindUserPortOut portOut; - private final FileUrlPortIn fileUrlPortIn; - - @Value("${path.upload.storage}") - private String uploadStorageType; - - @Override - public Optional operate(FindUserCmd command) { - return portOut - .operate(command) - .flatMap( - findUser -> { - FindProfileImages profileImg = findUser.getUploadFile(); - - if (profileImg != null) { - // 참조 URL 전달 - profileImg.setReferURL( - fileUrlPortIn.getInline( - FileStorageType.valueOf(uploadStorageType), - profileImg.getPath(), - profileImg.getName())); - - // attachment URL 전달 - profileImg.setAttachmentURL( - fileUrlPortIn.getAttachment( - FileStorageType.valueOf(uploadStorageType), profileImg.getId())); - } - - return Optional.of(findUser); - }); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java deleted file mode 100644 index 0f6299e4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import app.module.core.config.application.enums.FileUploadType; -import lombok.*; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -public class FindProfileImages { - private Long id; - private FileUploadType type; - private String path; - private String name; - private String originName; - private Long fileLength; - private String referURL; - private String attachmentURL; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java deleted file mode 100644 index 74e7631a..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java +++ /dev/null @@ -1,33 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class FindUser { - private String id; - private String password; - private String email; - private String nickname; - private SignUpType signUpType; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private Set roles; - private FindProfileImages uploadFile; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserCmd.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserCmd.java deleted file mode 100644 index 5e36de37..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserCmd.java +++ /dev/null @@ -1,15 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class FindUserCmd { - - private String id; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserPrivilege.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserPrivilege.java deleted file mode 100644 index d0604b85..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserPrivilege.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class FindUserPrivilege { - - private String id; - private String description; - private Integer orderNo; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java deleted file mode 100644 index efb8b4c4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class FindUserRole { - - private String id; - private String description; - private Integer orderNo; - private Set privileges; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java b/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java deleted file mode 100644 index ab7d5af3..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java +++ /dev/null @@ -1,21 +0,0 @@ -package app.module.core.usecase.user.getRoles.adapters.persistence; - -import app.module.core.usecase.user.getRoles.ports.GetRolesPortOut; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -@RequiredArgsConstructor -class GetRolesDao implements GetRolesPortOut { - - private final GetRolesMapper mapper; - - @Override - public List operate(GetRolesCmd command) { - return mapper.findByAppType(command); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java b/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java deleted file mode 100644 index dd3d158f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.core.usecase.user.getRoles.adapters.persistence; - -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface GetRolesMapper { - List findByAppType(GetRolesCmd cmd); -} diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java deleted file mode 100644 index 7ce9107c..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports; - -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; - -import java.util.List; - -public interface GetRolesPortIn { - - List operate(GetRolesCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java deleted file mode 100644 index a5fc84ca..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports; - -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; - -import java.util.List; - -public interface GetRolesPortOut { - - List operate(GetRolesCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java deleted file mode 100644 index 8c5fa4f0..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports.application; - -import app.module.core.usecase.user.getRoles.ports.GetRolesPortIn; -import app.module.core.usecase.user.getRoles.ports.GetRolesPortOut; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@RequiredArgsConstructor -class GetRolesService implements GetRolesPortIn { - - private final GetRolesPortOut portOut; - - @Override - public List operate(GetRolesCmd command) { - return portOut.operate(command); - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java deleted file mode 100644 index be90704f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetRoles { - private String id; - private String description; - private Integer orderNo; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRolesCmd.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRolesCmd.java deleted file mode 100644 index 36becaf6..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRolesCmd.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports.application.domain; - -import app.module.core.config.application.enums.AppType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetRolesCmd { - - private AppType appType; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java deleted file mode 100644 index 95574a6a..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java +++ /dev/null @@ -1,56 +0,0 @@ -package app.module.core.usecase.user.getUsers.adapters.persistence; - -import app.module.core.usecase.user.getUsers.adapters.persistence.model.GetUsersDto; -import app.module.core.usecase.user.getUsers.ports.GetUsersPortOut; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersRole; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.stream.Collectors; - -@Repository -@RequiredArgsConstructor -class GetUsersDao implements GetUsersPortOut { - - private final GetUsersMapper mapper; - - @Override - @Transactional - public Page operate(Pageable pageable, GetUsersCmd command) { - // 사용자 목록 조회 - List users = mapper.getUsers(command, pageable); - - // 사용자의 역할 목록 얻기 - List roles = - mapper.findRolesWithPrivilegesByUserIds(users.stream().map(GetUsersDto::getId).toList()); - - return new PageImpl<>( - users.stream() - .map(user -> new GetUsers( - user.getId(), - user.getEmail(), - user.getNickname(), - user.getSignUpType(), - user.getPasswordUpdatedAt(), - user.getAccountDisabled(), - user.getLoginFailCnt(), - user.getAccountLocked(), - user.getCreatedAt(), - user.getCreatedBy(), - user.getUpdatedAt(), - user.getUpdatedBy(), - roles.stream() - .filter(r -> r.getUserId().equals(user.getId())) - .collect(Collectors.toSet()) - )).toList(), - pageable, - users.isEmpty() ? 0 : users.get(0).getTotal()); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java deleted file mode 100644 index 45259c75..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.core.usecase.user.getUsers.adapters.persistence; - -import app.module.core.usecase.user.getUsers.adapters.persistence.model.GetUsersDto; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersRole; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; - -import java.util.List; - -@Mapper -public interface GetUsersMapper { - List getUsers( - @Param("cmd") GetUsersCmd cmd, - @Param("pageable") Pageable pageable); - - List findRolesWithPrivilegesByUserIds(@Param("ids") List ids); -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java deleted file mode 100644 index 213906ea..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.usecase.user.getUsers.adapters.persistence.model; - -import app.module.core.config.application.enums.SignUpType; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -public class GetUsersDto { - private String id; - private String email; - private String nickname; - private SignUpType signUpType; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private Long total; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortIn.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortIn.java deleted file mode 100644 index bf5d5868..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports; - -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -public interface GetUsersPortIn { - - Page operate(Pageable pageable, GetUsersCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortOut.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortOut.java deleted file mode 100644 index 84d5e6ad..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports; - -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -public interface GetUsersPortOut { - - Page operate(Pageable pageable, GetUsersCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/GetUsersService.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/GetUsersService.java deleted file mode 100644 index acf0a1e4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/GetUsersService.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application; - -import app.module.core.usecase.user.getUsers.ports.GetUsersPortIn; -import app.module.core.usecase.user.getUsers.ports.GetUsersPortOut; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetUsersService implements GetUsersPortIn { - - private final GetUsersPortOut portOut; - - @Override - public Page operate(Pageable pageable, GetUsersCmd command) { - return portOut.operate(pageable, command); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java deleted file mode 100644 index 1d64e9e5..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java +++ /dev/null @@ -1,30 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application.domain; - -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetUsers { - private String id; - private String email; - private String nickname; - private SignUpType signUpType; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersCmd.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersCmd.java deleted file mode 100644 index 1d9a3fea..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersCmd.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetUsersCmd { - private final String searchField; - private final String searchValue; - private final String searchRole; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java deleted file mode 100644 index 29c5c2ac..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java +++ /dev/null @@ -1,13 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application.domain; - -import lombok.*; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -public class GetUsersPrivilege { - private String id; - private String description; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java deleted file mode 100644 index 58d077f4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application.domain; - -import lombok.*; - -import java.util.Set; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -public class GetUsersRole { - private String id; - private String userId; - private String description; - private Set privileges; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java deleted file mode 100644 index 54b14c34..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java +++ /dev/null @@ -1,56 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserHasUploadFileParam; -import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserParam; -import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortOut; -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserOutCmd; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; - -import java.time.LocalDateTime; - -@Repository -@RequiredArgsConstructor -class UpdateFrontUserDao implements UpdateFrontUserPortOut { - - private final UpdateFrontUserMapper mapper; - - @Override - public void operate(UpdateFrontUserOutCmd cmd) { - String userId = cmd.getId(); - String loginUser = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - // 사용자 기본 정보 수정 - mapper.updateFrontUser( - new FrontUser( - userId, - cmd.getPassword(), - cmd.getEmail(), - cmd.getNickname(), - cmd.getSignUpType(), - cmd.getPasswordUpdatedAt(), - cmd.getAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked(), - null - ) - ); - - // 업로드 파일 매핑 재처리 - if (CollectionUtils.isNotEmpty(cmd.getFileMappingId())) { - // 파일 삭제 - mapper.deleteFrontUserHasUploadFiles( - new UpdateFrontUserParam(userId, now, loginUser, now, loginUser)); - // 저장 - mapper.insertFrontUserHasUploadFiles( - new UpdateFrontUserHasUploadFileParam( - userId, - cmd.getFileMappingId().stream().map(Long::parseLong).toList(), - now, loginUser, now, loginUser)); - } - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java deleted file mode 100644 index 0b0fd8b6..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserHasUploadFileParam; -import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserParam; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UpdateFrontUserMapper { - void updateFrontUser(FrontUser user); - void deleteFrontUserHasUploadFiles(UpdateFrontUserParam param); - void insertFrontUserHasUploadFiles(UpdateFrontUserHasUploadFileParam param); -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java deleted file mode 100644 index d41d8e2b..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.List; - -@Getter -@Setter -@AllArgsConstructor -public class UpdateFrontUserHasUploadFileParam { - private String userId; - private List fileIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java deleted file mode 100644 index 0b399dd3..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -public class UpdateFrontUserParam { - private String userId; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortIn.java deleted file mode 100644 index c6b01056..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortIn.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports; - -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserInCmd; - -public interface UpdateFrontUserPortIn { - - void operate(UpdateFrontUserInCmd inCommand); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortOut.java deleted file mode 100644 index bb89956f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortOut.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports; - -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserOutCmd; - -public interface UpdateFrontUserPortOut { - - void operate(UpdateFrontUserOutCmd outCommand); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java deleted file mode 100644 index aae83b3c..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java +++ /dev/null @@ -1,54 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports.application; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.user.findUser.ports.FindUserPortIn; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortIn; -import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortOut; -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserInCmd; -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserOutCmd; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.stereotype.Service; -import org.thymeleaf.util.StringUtils; - -import java.time.LocalDateTime; -import java.util.stream.Collectors; - -@Service -@RequiredArgsConstructor -class UpdateFrontUserService implements UpdateFrontUserPortIn { - - private final UpdateFrontUserPortOut portOut; - private final FindUserPortIn findUserPortIn; - private final BCryptPasswordEncoder passwordEncoder; - - @Override - public void operate(UpdateFrontUserInCmd cmd) { - FindUser findUser = - findUserPortIn.operate(new FindUserCmd(CommonUtil.getLoginUsername())).orElseThrow(); - - portOut.operate( - new UpdateFrontUserOutCmd( - findUser.getId(), - StringUtils.isEmptyOrWhitespace(cmd.getPassword()) - ? findUser.getPassword() - : passwordEncoder.encode(cmd.getPassword()), - StringUtils.isEmptyOrWhitespace(cmd.getPassword()) - ? findUser.getPasswordUpdatedAt() - : LocalDateTime.now(), - cmd.getEmail(), - cmd.getNickname(), - findUser.getSignUpType(), - cmd.getFileMappingId(), - findUser.getAccountDisabled(), - findUser.getLoginFailCnt(), - findUser.getAccountLocked(), - CollectionUtils.emptyIfNull(findUser.getRoles()).stream() - .map(CoreRole::getId) - .collect(Collectors.toSet()))); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java deleted file mode 100644 index 7c486f0f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateFrontUserInCmd { - private String password; - private String email; - private String nickname; - private List fileMappingId; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java deleted file mode 100644 index 5eb189fb..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java +++ /dev/null @@ -1,29 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports.application.domain; - -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateFrontUserOutCmd { - private String id; - private String password; - private LocalDateTime passwordUpdatedAt; - private String email; - private String nickname; - private SignUpType signUpType; - private List fileMappingId; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java deleted file mode 100644 index 1c38ec8c..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java +++ /dev/null @@ -1,52 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserByAdminParam; -import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserHasRoleParam; -import app.module.core.usecase.user.updateUserByAdmin.ports.UpdateUserPortOut; -import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; - -@Repository -@RequiredArgsConstructor -class UpdateUserDao implements UpdateUserPortOut { - - private final UpdateUserMapper mapper; - - @Override - @Transactional - public void operate(UpdateUserCmd cmd) { - String userId = cmd.getId(); - String loginUser = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - // 관리자의 사용자 정보 수정 - mapper.updateFrontUser( - new FrontUser( - userId, - cmd.getEmail(), - cmd.getNickname(), - cmd.getAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked() - ) - ); - - // 기존 역할 삭제 - mapper.deleteFrontUserHasRoles( - new UpdateFrontUserByAdminParam(userId, now, loginUser, now, loginUser)); - - // 새로운 역할 등록 - if (CollectionUtils.isNotEmpty(cmd.getRoles())) { - mapper.insertFrontUserHasRoles( - new UpdateFrontUserHasRoleParam( - userId, cmd.getRoles().stream().toList(), now, loginUser, now, loginUser)); - } - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserMapper.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserMapper.java deleted file mode 100644 index a5270926..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserByAdminParam; -import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserHasRoleParam; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UpdateUserMapper { - void updateFrontUser(FrontUser user); - void deleteFrontUserHasRoles(UpdateFrontUserByAdminParam param); - void insertFrontUserHasRoles(UpdateFrontUserHasRoleParam param); -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java deleted file mode 100644 index c973b888..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -public class UpdateFrontUserByAdminParam { - private String userId; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java deleted file mode 100644 index 4b3df653..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.List; - -@Getter -@Setter -@AllArgsConstructor -public class UpdateFrontUserHasRoleParam { - private String userId; - List roleIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortIn.java deleted file mode 100644 index f7932f26..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortIn.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.ports; - -import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; - -public interface UpdateUserPortIn { - - void operate(UpdateUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortOut.java deleted file mode 100644 index 1f2a2f1b..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortOut.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.ports; - -import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; - -public interface UpdateUserPortOut { - - void operate(UpdateUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/UpdateUserService.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/UpdateUserService.java deleted file mode 100644 index 9f6a16a4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/UpdateUserService.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.ports.application; - -import app.module.core.usecase.user.updateUserByAdmin.ports.UpdateUserPortIn; -import app.module.core.usecase.user.updateUserByAdmin.ports.UpdateUserPortOut; -import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class UpdateUserService implements UpdateUserPortIn { - - private final UpdateUserPortOut portOut; - - @Override - public void operate(UpdateUserCmd command) { - portOut.operate(command); - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java deleted file mode 100644 index 7a72457d..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateUserCmd { - private String id; - private String email; - private String nickname; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java index 3a35702c..5ac2aa02 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Privilege; +import app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence.model.Privilege; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userPrivilege.getUserPrivilege.adapters.persistence.GetUserPrivilegeMapper; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege; diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java index f7f4076b..36e0c86b 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Privilege; +import app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence.model.Privilege; import app.module.core.config.application.enums.AppType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/Privilege.java similarity index 85% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java rename to core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/Privilege.java index 942c5d7c..6172ed5c 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/Privilege.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java index 66759342..a7a5f5e4 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.role.view.adapters.persistence.RoleViewMapper; diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java index c3030a1c..df4f90ed 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model.RoleHasPrivilegeDeleteParam; import app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model.RoleHasPrivilegeSaveParam; diff --git a/core/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml b/core/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml index 655bafe3..4cea5e5a 100644 --- a/core/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml +++ b/core/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml @@ -4,7 +4,7 @@ - + INSERT INTO logged_in_user ( id, @@ -23,7 +23,7 @@ ) - + UPDATE logged_in_user SET clientip = #{clientIP}, diff --git a/core/src/main/resources/mappers/operationlog/OperationLogMapper.xml b/core/src/main/resources/mappers/operationlog/OperationLogMapper.xml deleted file mode 100644 index 01c8b258..00000000 --- a/core/src/main/resources/mappers/operationlog/OperationLogMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/src/main/resources/mappers/operationlog/OperationLogSaveMapper.xml b/core/src/main/resources/mappers/operationlog/OperationLogSaveMapper.xml deleted file mode 100644 index 0e786788..00000000 --- a/core/src/main/resources/mappers/operationlog/OperationLogSaveMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO operation_log ( - id, - app_type, - operation_log_type, - target_id, - ip, - task_desc, - - ) VALUES ( - nextval('operation_log_seq'), - #{appType}, - #{operationLogType}, - #{targetId}, - #{ip}, - #{taskDesc}, - - ) - - \ No newline at end of file diff --git a/core/src/main/resources/mappers/uicode/UICodeTopTierMapper.xml b/core/src/main/resources/mappers/uicode/UICodeTopTierMapper.xml index 4c443d9e..344fd681 100644 --- a/core/src/main/resources/mappers/uicode/UICodeTopTierMapper.xml +++ b/core/src/main/resources/mappers/uicode/UICodeTopTierMapper.xml @@ -4,7 +4,7 @@