diff --git a/README.md b/README.md index 95a2aeed..d86001dd 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,7 @@ usecase/ -Dspring.profiles.active=prod -Dserver.port=8081 -Dfile.encoding=UTF-8 +-Dspring.sql.init.mode=never -Djava.net.preferIPv4Stack=true -Dlogging.level.org.springframework.security=DEBUG -Daes.secret-key=092HW829O0A0AVR0 @@ -62,6 +63,7 @@ usecase/ -Dpath.upload.tmpdir=/home/etribe/data/upload/tmp -Djasypt.encryptor.password=ko-research -Djasypt.encryptor.algorithm=PBEWITHHMACSHA512ANDAES_256 + ```` ## ๐Ÿ’ป ๋กœ์ปฌ ๊ตฌ๋™ ์‹œ ํ•„์ˆ˜ ์„ค์ • @@ -89,6 +91,72 @@ usecase/ * ์šด์˜ DB์— ์ง์ ‘ ์ ‘๊ทผํ•˜์—ฌ ๊ฐœ๋ฐœํ•˜์ง€ ์•Š๋„๋ก ์ฃผ์˜๊ฐ€ ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค * `Jasypt`๋กœ ์•”ํ˜ธํ™”๋œ DB ๊ณ„์ • ์ •๋ณด๊ฐ€ ์žˆ๋Š” ๊ฒฝ์šฐ, ๋กœ์ปฌ ๋น„๋ฐ€๋ฒˆํ˜ธ ๋ณตํ˜ธํ™”๋ฅผ ์œ„ํ•œ `encryptor.password`๊ฐ€ ๋ฐ˜๋“œ์‹œ ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค. +-- +๋‹ค์Œ์€ `-Dspring.sql.init.mode=always` ์˜ต์…˜ ๊ด€๋ จ ๋‚ด์šฉ์„ **์ธ์ˆ˜์ธ๊ณ„ ๋ฌธ์„œ** ํ˜•์‹์œผ๋กœ ์ •๋ฆฌํ•œ ์˜ˆ์‹œ์ž…๋‹ˆ๋‹ค. ์šด์˜ ํ™˜๊ฒฝ์—์„œ์˜ ์œ„ํ—˜์„ฑ๊นŒ์ง€ ๊ฐ•์กฐํ•ด์„œ ์ž‘์„ฑํ–ˆ์Šต๋‹ˆ๋‹ค. + +--- + +## โš™๏ธ ๋กœ์ปฌ DB ์ดˆ๊ธฐํ™” ๋ฐ `initData` ์ ์šฉ ๋ฐฉ๋ฒ• + +### โœ… +Spring Boot ํ”„๋กœ์ ํŠธ์—์„œ๋Š” `initData` SQL ์Šคํฌ๋ฆฝํŠธ๋ฅผ ํ†ตํ•ด ๋กœ์ปฌ DB์— ์ดˆ๊ธฐ ๋ฐ์ดํ„ฐ๋ฅผ ์‚ฝ์ž…ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ์ด๋ฅผ ์œ„ํ•ด **VM ์˜ต์…˜ ์„ค์ •์ด ๋ฐ˜๋“œ์‹œ ํ•„์š”**ํ•ฉ๋‹ˆ๋‹ค. + +--- + +### ๐Ÿ› ๏ธ ์ ์šฉ ๋ฐฉ๋ฒ• + +1. **VM ์˜ต์…˜ ์ถ”๊ฐ€** + + ``` + -Dspring.sql.init.mode=always + ``` + +2. **์„œ๋ฒ„ ์žฌ๊ธฐ๋™** + + * ์œ„ ์˜ต์…˜์„ ์ ์šฉํ•˜๊ณ  ์„œ๋ฒ„๋ฅผ ์žฌ๊ธฐ๋™ํ•˜๋ฉด ๋‹ค์Œ๊ณผ ๊ฐ™์€ ๋™์ž‘์ด ์ˆ˜ํ–‰๋ฉ๋‹ˆ๋‹ค: + + * **๋ชจ๋“  ํ…Œ์ด๋ธ” DROP** + * **์Šคํ‚ค๋งˆ ์žฌ์ƒ์„ฑ (CREATE)** + * **`01.init-data.sql` ๋“ฑ์˜ ์ดˆ๊ธฐํ™” SQL ์‹คํ–‰** + +3. **์ดˆ๊ธฐํ™” ์™„๋ฃŒ ํ›„ ํ•„์ˆ˜ ์ž‘์—…โ€ผ๏ธ** + + ``` + VM ์˜ต์…˜์„ ๋ฐ˜๋“œ์‹œ ์•„๋ž˜์™€ ๊ฐ™์ด ๋ณ€๊ฒฝ: + -Dspring.sql.init.mode=never + ``` + + * ๊ณ„์† `always` ์ƒํƒœ๋กœ ๋‘๋ฉด, ์„œ๋ฒ„ ๊ธฐ๋™ ์‹œ๋งˆ๋‹ค ๋ฐ์ดํ„ฐ๊ฐ€ **๋ชจ๋‘ ์‚ญ์ œ๋จ** โš ๏ธโš ๏ธโš ๏ธ + +--- + +### โš ๏ธ ์šด์˜ ํ™˜๊ฒฝ ์ฃผ์˜์‚ฌํ•ญ + +> ๐Ÿ’ฅ **์šด์˜ ์„œ๋ฒ„์—๋Š” ์ ˆ๋Œ€ `-Dspring.sql.init.mode=always` ์„ค์ •์„ ์‚ฌ์šฉํ•˜์ง€ ๋งˆ์„ธ์š”!!** +> ์ด ์„ค์ •์€ ๋ชจ๋“  ํ…Œ์ด๋ธ”๊ณผ ๋ฐ์ดํ„ฐ๋ฅผ ์ œ๊ฑฐํ•˜๊ณ  ๋‹ค์‹œ ์ƒ์„ฑํ•˜๋ฏ€๋กœ, +> ์šด์˜ DB์— ์ ์šฉ ์‹œ **์น˜๋ช…์ ์ธ ๋ฐ์ดํ„ฐ ์†์‹ค**์ด ๋ฐœ์ƒํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. + +--- + +### โ„น๏ธ ์˜ต์…˜ ์„ค๋ช… + +| ์˜ต์…˜๊ฐ’ | ์„ค๋ช… | +| -------- | ----------------------------- | +| `never` | SQL ์ดˆ๊ธฐํ™” ์Šคํฌ๋ฆฝํŠธ **์‹คํ–‰ํ•˜์ง€ ์•Š์Œ** (๊ธฐ๋ณธ) | +| `always` | SQL ์ดˆ๊ธฐํ™” ์Šคํฌ๋ฆฝํŠธ **ํ•ญ์ƒ ์‹คํ–‰ํ•จ** | + +--- + +### ๐Ÿ“ ์ดˆ๊ธฐํ™” ์Šคํฌ๋ฆฝํŠธ ์œ„์น˜ ์˜ˆ์‹œ + +* `core/src/main/resources/sql/schema/02_create-table.sql` (DDL) +* `core/src/main/resources/sql/schema/02_create-function.sql` (DDL) +* `core/src/main/resources/sql/schema/02_create-view.sql` (DDL) +* `core/src/main/resources/sql/data/01_init_data.sql` (DML) + +--- + + --- ## ๐Ÿ” Jasypt ์•”ํ˜ธํ™” @@ -152,6 +220,31 @@ mybatis: sqlSessionFactoryRef = "mmsSqlSessionFactory") ``` + +## ๐Ÿ”ง ์ผ๊ณ„๋ถ€ ๋“ฑ๋ก ๊ฐ€๋Šฅ ๋‚ ์งœ + +`DailyRecordConstants.java`๋Š” **์ผ๊ณ„๋ถ€ ๋“ฑ๋ก ๋ฐ ์ˆ˜์ • ๊ฐ€๋Šฅ ์‹œ์ ์— ๋Œ€ํ•œ ์ •์ฑ… ์ƒ์ˆ˜**๋ฅผ ์ •์˜ํ•˜๊ณ  ์žˆ์Šต๋‹ˆ๋‹ค. +--- + +### โœ… ์ •์ฑ… ์ •์˜ + +| ํ•ญ๋ชฉ | ์ •์ฑ… ์„ค๋ช… | ์ƒ์ˆ˜๋ช… | ๊ฐ’ | +| ------- | ------------------------ | ---------------------- |------------------------| +| ๋“ฑ๋ก ๊ฐ€๋Šฅ ์›” | ํ•ด๋‹น ์›” ๊ธฐ์ค€, **์ด์ „ ์›”๋งŒ ๋“ฑ๋ก ๊ฐ€๋Šฅ** | `REGISTER_LIMIT_MONTH` | `1` โ†’ *์ž„์‹œ๋กœ `4` ์„ค์ • ์ค‘* | +| ๋“ฑ๋ก ๊ฐ€๋Šฅ ์ผ | ํ•ด๋‹น ์›” **15์ผ๊นŒ์ง€๋งŒ ๋“ฑ๋ก ๊ฐ€๋Šฅ** | `REGISTER_LIMIT_DAY` | `15` โ†’ *์ž„์‹œ๋กœ `31` ์„ค์ • ์ค‘* | +| ์ˆ˜์ • ๊ฐ€๋Šฅ ์›” | ํ•ด๋‹น ์›” ๊ธฐ์ค€, **์ด์ „ ์›”๋งŒ ์ˆ˜์ • ๊ฐ€๋Šฅ** | `MODIFY_LIMIT_MONTH` | `1` โ†’ *์ž„์‹œ๋กœ `4` ์„ค์ • ์ค‘* | +| ์ˆ˜์ • ๊ฐ€๋Šฅ ์ผ | ํ•ด๋‹น ์›” **15์ผ๊นŒ์ง€๋งŒ ์ˆ˜์ • ๊ฐ€๋Šฅ** | `MODIFY_LIMIT_DAY` | `15` โ†’ *์ž„์‹œ๋กœ `31` ์„ค์ • ์ค‘* | + +--- + +### โš ๏ธ ํ˜„์žฌ ์ž„์‹œ ์„ค์ • ์‚ฌํ•ญ + +ํ˜„์žฌ ์‹œ์Šคํ…œ์—์„œ๋Š” **๋“ฑ๋ก ๊ฐ€๋Šฅ ์›”(`REGISTER_LIMIT_MONTH`)** ๋ฐ **์ˆ˜์ • ๊ฐ€๋Šฅ ์›”(`MODIFY_LIMIT_MONTH`)** ๊ฐ’์„ **์ž„์‹œ๋กœ `4๋‹ฌ` **๋“ฑ๋ก ๊ฐ€๋Šฅ ์ผ(`REGISTER_LIMIT_DAY`)** ๋ฐ **์ˆ˜์ • ๊ฐ€๋Šฅ ์ผ(`MODIFY_LIMIT_DAY`)** ๊ฐ’์„ **์ž„์‹œ๋กœ `31์ผ`๋กœ ์„ค์ •**ํ•ด ๋‘์—ˆ์œผ๋ฉฐ, +**์ •์ฑ…์ƒ ์›๋ž˜๋Š” `15์ผ`๋กœ ์ œํ•œ**๋˜์–ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. + +> ๐Ÿ“Œ ํ–ฅํ›„ ์šด์˜ ์ •์ฑ…์— ๋”ฐ๋ผ **`์ด์ „์›”`** **`15์ผ`๋กœ ๋ณต์› ์˜ˆ์ •**์œผ๋กœ ํ•ด๋‹น๊ฐ’์œผ๋กœ ์ˆ˜์ •ํ•œ warํŒŒ์ผ ์ œ๊ณต + +--- ## ๐Ÿ“ค ํŒŒ์ผ ์—…๋กœ๋“œ ```bash @@ -284,6 +377,10 @@ $ mvn clean package -P war |---------| ------ | | `22221` | `1111` | | `22222` | `1111` | +| `22223` | `1111` | +| `22224` | `1111` | +| `22225` | `1111` | +| `22226` | `1111` | --- diff --git a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java index e74dab9a..955a2041 100644 --- a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java +++ b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java @@ -81,8 +81,6 @@ public class AdminURIInterceptor implements HandlerInterceptor { return; } - // ํ™œ์„ฑ ํ”„๋กœํŒŒ์ผ ๊ฐ€์ ธ์˜ค๊ธฐ TODO 2์ฐจ ์˜คํ”ˆ์‹œ ์‚ญ์ œ ์˜ˆ์ • - modelAndView.addObject("activeProfile", activeProfiles); String roleId = AdminUtil.getLoginUserRole(); if (!CommonUtil.isAjaxRequest(request)) { 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/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java index 163eea2e..6e7e161d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java @@ -48,16 +48,6 @@ public class CreateHouseholdValidator implements Validator { return; } - // 4. ๊ฐ€๊ตฌ ์—ฐ๋ฝ์ฒ˜ - // TODO : ํ•„์ˆ˜์ž…๋ ฅ๊ฐ’ ๋งž๋Š”์ง€ ์ฒดํฌ -// if (!StringUtils.hasText(vo.getTel1()) || !StringUtils.hasText(vo.getTel2()) || !StringUtils.hasText(vo.getTel3())) { -// errors.reject("tel", "๊ฐ€๊ตฌ ์—ฐ๋ฝ์ฒ˜๋ฅผ ๋ชจ๋‘ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”."); -// return; -// } -// if (vo.getTel2().length() > 4 || vo.getTel3().length() > 4) { -// errors.reject("tel", "๊ฐ€๊ตฌ ์—ฐ๋ฝ์ฒ˜๋Š” ๊ฐ 4์ž๋ฆฌ๊นŒ์ง€ ์ž…๋ ฅ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค."); -// return; -// } if (StringUtils.hasText(vo.getTel2()) || StringUtils.hasText(vo.getTel3())) { if ((vo.getTel2() != null && vo.getTel2().length() > 4) || (vo.getTel3() != null && vo.getTel3().length() > 4)) { diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 6bd2e7c9..4525cc28 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -385,7 +385,7 @@ /* ๋งตํ•‘ ์—ฌ๋ถ€ */ - AND hvr.researcher_name is not null + AND hvr.researcher_name is not null AND hvr.researcher_name is null diff --git a/admin/src/main/resources/static/scripts/ajaxUtils.js b/admin/src/main/resources/static/scripts/ajaxUtils.js index f23864a7..0ace25d8 100644 --- a/admin/src/main/resources/static/scripts/ajaxUtils.js +++ b/admin/src/main/resources/static/scripts/ajaxUtils.js @@ -136,7 +136,6 @@ var ajaxUtil = { if (options.handle422Type === 'field' || !options.handle422Type) { $(rstData.responseJSON).each((idx, oj) => { - // TODO : form id? or body let target = $('body').find('[name=' + oj.field + ']'); target.addClass('is-invalid'); diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html index 799922c9..dd81419a 100644 --- a/admin/src/main/resources/templates/households/tab/forest-product.html +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -81,7 +81,6 @@ const tbody = $('.tab-content.forest-product tbody'); tbody.empty(); - // TODO(ks) : monthlyStatus ์—†์„ ๊ฒฝ์šฐ ์ฒ˜๋ฆฌ ์ถ”๊ฐ€... ์ผ๋‹จ .. ์ด๋ ‡๊ฒŒ ์ฒ˜๋ฆฌ ํ•˜์ง€๋งŒ.. ๋˜ ๋‹ค๋ฅธ ๋ฐฉ์•ˆ์ด ์žˆ์„์ง€... if (!response.monthlyStatus || !response.monthlyStatus.forestStatus) { noDataMonthly(tbody, null, 15); return; 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/initData/InitAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java deleted file mode 100644 index d19f1790..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java +++ /dev/null @@ -1,56 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -@Slf4j -@Order(5) -public class InitAdminData implements ApplicationRunner { - - private final SaveAdminPortIn saveAdminPortIn; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - public void run(ApplicationArguments args) throws Exception { - if (!isCoreDataRequired) { - return; - } - -/* // ๊ด€๋ฆฌ์ž - saveAdminPortIn.connect( - null, - "test-admin", - "admin1@#$", - null, - false, - List.of("ROLE_ADMIN")); - - // ์ง€๋ฐฉ์‹ค์‚ฌ - saveAdminPortIn.connect( - null, - "test-local-inspection", - "local1@#$", - "code.region.main.1", - false, - List.of("ROLE_LOCAL_INSPECTION")); - - // ์กฐ์‚ฌ์› - saveAdminPortIn.connect( - null, - "test-researcher", - "researcher1@#$", - "code.region.main.1", - false, - List.of("ROLE_RESEARCHER"));*/ - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java deleted file mode 100644 index 461dcacd..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java +++ /dev/null @@ -1,46 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -@Slf4j -@Order(5) -public class InitFrontUserData implements ApplicationRunner { - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - public void run(ApplicationArguments args) throws Exception { - if (!isCoreDataRequired) { - return; - } - -// createHouseholdPortIn.operate(new CreateHouseholdInCmd( -// "11111", -// "ํ…Œ์ŠคํŠธ์ž„๊ฐ€", -// 58, -// null, -// "010-1111-1111", -// "code.region.main.1", // ์„œ์šธ -// "code.region.sub.31", // ๊ฒฝ๊ธฐ๋„ -// "code.region.detail.9", // ๊ฒฝ๊ธฐ -// "๊ฒฝ๊ธฐ๋„ ์„ฑ๋‚จ์‹œ ๋ถ„๋‹น๊ตฌ ์‚ฐ์„ฑ๋Œ€๋กœ 437๋ฒˆ๊ธธ", -// null, -// null, -// null, -// null, -// null, -// true, -// null, -// null -// )); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java deleted file mode 100644 index da883c8d..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java +++ /dev/null @@ -1,32 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.privilege.save.ports.PrivilegeSavePortIn; -import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -@Order(2) -public class InitPrivilegeData implements ApplicationRunner { - - private final PrivilegeSavePortIn privilegeSavePortIn; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - public void run(ApplicationArguments args) throws Exception { - if (!isCoreDataRequired) { - return; - } - - privilegeSavePortIn.connect(new PrivilegeSaveCommand( AppType.ADMIN, "ADMIN_API", "ADMIN API ์ด์šฉ ๊ถŒํ•œ", 0)); - privilegeSavePortIn.connect(new PrivilegeSaveCommand(AppType.ADMIN,"ADMIN_ACCESS", "ADMIN ์‚ฌ์ดํŠธ ์ ‘๊ทผ ๊ถŒํ•œ", 1)); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java deleted file mode 100644 index 8043b920..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java +++ /dev/null @@ -1,53 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.role.save.ports.RoleSavePortIn; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -@RequiredArgsConstructor -@Order(3) -public class InitRoleData implements ApplicationRunner { - - private final RoleSavePortIn roleSavePortIn; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - public void run(ApplicationArguments args) throws Exception { - if (!isCoreDataRequired) { - return; - } - - int orderNo = 0; - - roleSavePortIn.connect( - AppType.ADMIN, - "ROLE_ADMIN", - "๊ด€๋ฆฌ์ž", - orderNo++, - List.of("ADMIN_API", "ADMIN_ACCESS")); - - roleSavePortIn.connect( - AppType.ADMIN, - "ROLE_LOCAL_INSPECTION", - "์ง€๋ฐฉ์‹ค์‚ฌ", - orderNo++, - List.of("ADMIN_API", "ADMIN_ACCESS")); - - roleSavePortIn.connect( - AppType.ADMIN, - "ROLE_RESEARCHER", - "์กฐ์‚ฌ์›", - orderNo++, - List.of("ADMIN_API", "ADMIN_ACCESS")); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java deleted file mode 100644 index 332d572a..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java +++ /dev/null @@ -1,68 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.usecase.uicode.save.ports.UICodeSavePortIn; -import app.module.core.usecase.uicode.save.ports.application.domain.UICodeSaveCommand; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -@Slf4j -@Order(4) -public class InitUICodeData implements ApplicationRunner { - - private final UICodeSavePortIn uiCodeSavePortIn; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - public void run(ApplicationArguments args) { - if (!isCoreDataRequired) { - return; - } - - final String UICODE = "code"; - final String UICODE_PAGEABLE = "code.pageable"; - final String UICODE_PAGEABLE_ROWS = "code.pageable.rows"; - - // root ๋…ธ๋“œ - code - uiCodeSavePortIn.connect( - new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null,null, true), false); - - // code - board - uiCodeSavePortIn.connect( - new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null,null, true), false); - - // code - board - rows - uiCodeSavePortIn.connect( - new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW ๊ฐฏ์ˆ˜", "", null,null, - true), - false); - - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 0, "10", "10", null, null,true), - false); - - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 1, "20", "20", null,null, true), - false); - - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 2, "50", "50", null, null,true), - false); - - uiCodeSavePortIn.connect( - new UICodeSaveCommand( - UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 3, "100", "100", null,null, true), - false); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java deleted file mode 100644 index a00fcdb1..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java +++ /dev/null @@ -1,366 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.uri.save.ports.URISavePortIn; -import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.io.IOException; -import java.util.Set; - -@Component -@RequiredArgsConstructor -@Slf4j -@Order(4) -public class InitUriAdminData implements ApplicationRunner { - - private final URISavePortIn uriSavePortIn; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - @Transactional - public void run(ApplicationArguments args) throws IOException { - if (!isCoreDataRequired) { - return; - } - - final String ADMIN = "uri.admin"; - - final String ADMIN_SETTINGS = "uri.admin.settings"; - - final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group"; - final String ADMIN_SETTINGS_ADMIN = "uri.admin.settings.admins"; - final String ADMIN_SETTINGS_ADMIN_CREATE = "uri.admin.settings.admins.create"; - final String ADMIN_SETTINGS_ADMIN_UPDATE = "uri.admin.settings.admins.update.{{pathVar}}"; - final String ADMIN_SETTINGS_ADMIN_DELETE = "uri.admin.settings.admins.delete"; - final String ADMIN_SETTINGS_ADMIN_EXCEL = "uri.admin.settings.admins.excel"; - final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles"; - final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege"; - - final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin"; - final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front"; - final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode"; - - final String ADMIN_ANALYSIS = "uri.admin.analysis"; - final String ADMIN_ANALYSIS_OPERATION_LOG = "uri.admin.analysis.operationLog"; - final String ADMIN_ANALYSIS_OPERATION_LOG_UPDATE = - "uri.admin.analysis.operationLog.{{pathVar}}"; - final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel"; - - // ์ž„๊ฐ€ํ˜„ํ™ฉ ๋ฉ”๋‰ด - final String ADMIN_HOUSEHOLD = "uri.admin.household"; // 1depth - final String ADMIN_HOUSEHOLD_STATUS = "uri.admin.household.households"; // 2depth ์ž„๊ฐ€ ๋ฆฌ์ŠคํŠธ - final String ADMIN_HOUSEHOLD_STATUS_CREATE = "uri.admin.household.households.create"; // ์ž„๊ฐ€ ๋“ฑ๋ก - final String ADMIN_HOUSEHOLD_STATUS_VIEW = "uri.admin.household.households.view.{{pathVar}}"; // ์ž„๊ฐ€ ์ƒ์„ธ - - // ์กฐ์‚ฌ์›ํ˜„ํ™ฉ ๋ฉ”๋‰ด - final String ADMIN_RESEARCHER = "uri.admin.researcher"; // 1depth - final String ADMIN_RESEARCHER_STATUS = "uri.admin.researcher.researchers"; // 2depth ์กฐ์‚ฌ์› ๋ฆฌ์ŠคํŠธ - final String ADMIN_RESEARCHER_STATUS_CREATE = "uri.admin.researcher.researchers.create"; // ์กฐ์‚ฌ์› ๋“ฑ๋ก - final String ADMIN_RESEARCHER_STATUS_VIEW = "uri.admin.researcher.researchers.view.{{pathVar}}"; // ์กฐ์‚ฌ์› ์ƒ์„ธ - - // ๋Œ€์‹œ๋ณด๋“œ - final String ADMIN_DASHBOARD = "uri.admin.dashboard"; // 1depth - final String ADMIN_DASHBOARD_OVERVIEW = "uri.admin.dashboard.overview"; // 2depth - - // ์ปค๋ฎค๋‹ˆ์ผ€์ด์…˜ ๋ฉ”๋‰ด - final String ADMIN_COMMUNICATION = "uri.admin.communication"; // 1depth - final String ADMIN_COMMUNICATION_NOTICE = "uri.admin.communication.notices"; // 2depth ๊ณต์ง€์‚ฌํ•ญ - final String ADMIN_COMMUNICATION_NOTICE_CREATE = "uri.admin.communication.notices.create"; // ๊ณต์ง€์‚ฌํ•ญ ๋“ฑ๋ก - final String ADMIN_COMMUNICATION_NOTICE_UPDATE = "uri.admin.communication.notices.update.{{pathVar}}"; // ๊ณต์ง€์‚ฌํ•ญ ์ˆ˜์ •,์ƒ์„ธ - final String ADMIN_COMMUNICATION_SUGGESTION = "uri.admin.communication.suggestions"; // 2depth ๊ฑด์˜์‚ฌํ•ญ - final String ADMIN_COMMUNICATION_SUGGESTION_VIEW = "uri.admin.communication.suggestions.view.{{pathVar}}"; // ๊ฑด์˜์‚ฌํ•ญ ์ƒ์„ธ - final String ADMIN_COMMUNICATION_SMS = "uri.admin.communication.sms"; // 2depth ๋ฌธ์ž๋ฐœ์†ก - - // ์ตœ์ƒ์œ„ URI ์ •๋ณด - appendURI( - AppType.ADMIN, - null, - ADMIN, - "๋ฉ”์ธ", - "/", - true, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); - - // `1` depth URI ์ •์˜ - ์‹œ์ž‘ - - appendURI( - AppType.ADMIN, - ADMIN, - ADMIN_HOUSEHOLD, - "์ž„๊ฐ€ ํ˜„ํ™ฉ", - "/household", - true, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); - - appendURI( - AppType.ADMIN, - ADMIN, - ADMIN_RESEARCHER, - "์กฐ์‚ฌ์› ํ˜„ํ™ฉ", - "/researcher", - true, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION")); - - appendURI( - AppType.ADMIN, - ADMIN, - ADMIN_DASHBOARD, - "๋Œ€์‹œ๋ณด๋“œ", - "/dashboard", - true, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); - - appendURI( - AppType.ADMIN, - ADMIN, - ADMIN_COMMUNICATION, - "์ปค๋ฎค๋‹ˆ์ผ€์ด์…˜", - "/communication", - true, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN, - ADMIN_ANALYSIS, - "๋ถ„์„", - "/analysis", - true, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN, - ADMIN_SETTINGS, - "Settings", - "/true", - true, - Set.of("ROLE_ADMIN")); - // `1` depth URI ์ •์˜ - ๋ - - - // ์ž„๊ฐ€ ํ˜„ํ™ฉ ๋ฉ”๋‰ด ์‹œ์ž‘ - appendURI( - AppType.ADMIN, - ADMIN_HOUSEHOLD, - ADMIN_HOUSEHOLD_STATUS, - "์ž„๊ฐ€ ํ˜„ํ™ฉ", - "/households", - true, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); - - appendURI( - AppType.ADMIN, - ADMIN_HOUSEHOLD, - ADMIN_HOUSEHOLD_STATUS_CREATE, - "์ž„๊ฐ€ ๋“ฑ๋ก", - "/households/create", - false, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); - - appendURI( - AppType.ADMIN, - ADMIN_HOUSEHOLD, - ADMIN_HOUSEHOLD_STATUS_VIEW, - "์ž„๊ฐ€ ์ƒ์„ธ", - "/households/{{pathVar}}", - false, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); - - // ์กฐ์‚ฌ์› ํ˜„ํ™ฉ ๋ฉ”๋‰ด ์‹œ์ž‘ - appendURI( - AppType.ADMIN, - ADMIN_RESEARCHER, - ADMIN_RESEARCHER_STATUS, - "์กฐ์‚ฌ์› ํ˜„ํ™ฉ", - "/researcher/researchers", - true, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION")); - - appendURI( - AppType.ADMIN, - ADMIN_RESEARCHER, - ADMIN_RESEARCHER_STATUS_CREATE, - "์กฐ์‚ฌ์› ๋“ฑ๋ก", - "/researcher/researchers/create", - false, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION")); - - appendURI( - AppType.ADMIN, - ADMIN_RESEARCHER, - ADMIN_RESEARCHER_STATUS_VIEW, - "์กฐ์‚ฌ์› ์ƒ์„ธ", - "/researcher/researchers/view/{{pathVar}}", - false, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION")); - - // ๋Œ€์‹œ๋ณด๋“œ - appendURI( - AppType.ADMIN, - ADMIN_DASHBOARD, - ADMIN_DASHBOARD_OVERVIEW, - "๋Œ€์‹œ๋ณด๋“œ", - "/dashboard", - true, - Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); - - // ์ปค๋ฎค๋‹ˆ์ผ€์ด์…˜ ๋ฉ”๋‰ด ์‹œ์ž‘ - appendURI( - AppType.ADMIN, - ADMIN_COMMUNICATION, - ADMIN_COMMUNICATION_NOTICE, - "๊ณต์ง€์‚ฌํ•ญ", - "/communication/notices", - true, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_COMMUNICATION, - ADMIN_COMMUNICATION_NOTICE_CREATE, - "๊ณต์ง€์‚ฌํ•ญ ๋“ฑ๋ก", - "/communication/notices/create", - false, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_COMMUNICATION, - ADMIN_COMMUNICATION_NOTICE_UPDATE, - "๊ณต์ง€์‚ฌํ•ญ ์ˆ˜์ •", - "/communication/notices/{{pathVar}}", - false, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_COMMUNICATION, - ADMIN_COMMUNICATION_SUGGESTION, - "๊ฑด์˜์‚ฌํ•ญ", - "/communication/suggestions", - true, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_COMMUNICATION, - ADMIN_COMMUNICATION_SUGGESTION_VIEW, - "๊ฑด์˜์‚ฌํ•ญ ์ƒ์„ธ", - "/communication/suggestions/{{pathVar}}", - false, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_COMMUNICATION, - ADMIN_COMMUNICATION_SMS, - "๋ฌธ์ž๋ฐœ์†ก", - "/communication/sms", - true, - Set.of("ROLE_ADMIN")); - // ์ปค๋ฎค๋‹ˆ์ผ€์ด์…˜ ๋ฉ”๋‰ด ๋ - - - // ๊ด€๋ฆฌ์ž ์‹œ์ž‘ - appendURI( - AppType.ADMIN, - ADMIN_SETTINGS_ADMIN_GROUP, - ADMIN_SETTINGS_ADMIN, - "๊ด€๋ฆฌ์ž ๋ชฉ๋ก", - "/settings/admins", - true, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_SETTINGS_ADMIN, - ADMIN_SETTINGS_ADMIN_CREATE, - "๊ด€๋ฆฌ์ž ๋“ฑ๋ก", - "/settings/admins/create", - false, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_SETTINGS_ADMIN, - ADMIN_SETTINGS_ADMIN_UPDATE, - "๊ด€๋ฆฌ์ž ์ˆ˜์ •", - "/settings/admins/update/{{pathVar}}", - false, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_SETTINGS_ADMIN, - ADMIN_SETTINGS_ADMIN_EXCEL, - "๊ด€๋ฆฌ์ž ์—‘์…€ ๋‹ค์šด๋กœ๋“œ", - "/settings/admins/excel", - false, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_SETTINGS, - ADMIN_SETTINGS_URI_ADMIN, - "URI ๊ด€๋ฆฌ (๊ด€๋ฆฌ์ž)", - "/settings/uri/ADMIN", - true, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_SETTINGS, - ADMIN_SETTINGS_URI_FRONT, - "URI ๊ด€๋ฆฌ (FRONT)", - "/settings/uri/FRONT", - true, - Set.of("ROLE_ADMIN")); - - appendURI( - AppType.ADMIN, - ADMIN_SETTINGS, - ADMIN_SETTINGS_CODE, - "UI ์ฝ”๋“œ (๊ณตํ†ต์ฝ”๋“œ)", - "/settings/uicode", - true, - Set.of("ROLE_ADMIN")); - } - - private void appendURI( - AppType appType, - String parentId, - String menuId, - String menuTitle, - String uri, - boolean showOnNavi, - Set roles) - throws IOException { - uriSavePortIn.connect( - new URISaveCommand( - menuId, - parentId, - appType, - uri, - showOnNavi, - menuTitle, - null, - menuTitle, - menuTitle, - null, - null, - roles), - null, - false); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java deleted file mode 100644 index d0b6ea69..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java +++ /dev/null @@ -1,109 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.uri.save.ports.URISavePortIn; -import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.io.IOException; -import java.util.Set; - -@Component -@RequiredArgsConstructor -@Slf4j -@Order(4) -public class InitUriFrontData implements ApplicationRunner { - - private final URISavePortIn uriSavePortIn; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - @Transactional - public void run(ApplicationArguments args) throws IOException { - if (!isCoreDataRequired) { - return; - } - - final String FRONT_ROOT_ID = "uri.front"; - - uriSavePortIn.connect( - new URISaveCommand( - FRONT_ROOT_ID, - null, - AppType.FRONT, - "/", - true, - "ํ”„๋ก ํŠธ", - null, - "ํ”„๋ก ํŠธ ํ™ˆ", - "ํ”„๋ก ํŠธ ๋ฉ”์ธ", - "front", - null, - null), - null, - false); - - // ๋กœ๊ทธ์ธ - uriSavePortIn.connect( - new URISaveCommand( - FRONT_ROOT_ID + ".login", - FRONT_ROOT_ID, - AppType.FRONT, - "/login", - false, - "๋กœ๊ทธ์ธ", - null, - "๋กœ๊ทธ์ธ", - "๋กœ๊ทธ์ธ ํŽ˜์ด์ง€", - "front", - null, - null), - null, - false); - - // ํšŒ์›๊ฐ€์ž… - uriSavePortIn.connect( - new URISaveCommand( - FRONT_ROOT_ID + ".user.register", - FRONT_ROOT_ID, - AppType.FRONT, - "/user/register", - false, - "ํšŒ์›๊ฐ€์ž…", - null, - "ํšŒ์›๊ฐ€์ž…", - "ํšŒ์›๊ฐ€์ž… ํŽ˜์ด์ง€", - "ํšŒ์›๊ฐ€์ž…", - null, - null), - null, - false); - - // ์ •๋ณด์ˆ˜์ • - uriSavePortIn.connect( - new URISaveCommand( - FRONT_ROOT_ID + ".user.info", - FRONT_ROOT_ID, - AppType.FRONT, - "/user/info", - false, - "์ •๋ณด์ˆ˜์ •", - null, - "์ •๋ณด์ˆ˜์ •", - "์ •๋ณด์ˆ˜์ • ํŽ˜์ด์ง€", - "์ •๋ณด์ˆ˜์ •", - null, - Set.of("ROLE_GENERAL")), - null, - false); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserPrivilegeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserPrivilegeData.java deleted file mode 100644 index 1c6ddd9a..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserPrivilegeData.java +++ /dev/null @@ -1,32 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.SaveUserPrivilegePortIn; -import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilegeCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -@Order(2) -public class InitUserPrivilegeData implements ApplicationRunner { - - private final SaveUserPrivilegePortIn saveUserPrivilegePortIn; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - public void run(ApplicationArguments args) throws Exception { - if (!isCoreDataRequired) { - return; - } - - saveUserPrivilegePortIn.operate(new SaveUserPrivilegeCmd("FRONT_API", "Front API ์‚ฌ์šฉ๊ถŒํ•œ", 0)); - saveUserPrivilegePortIn.operate( - new SaveUserPrivilegeCmd("FRONT_ACCESS", "Front ์‚ฌ์ดํŠธ ์ ‘๊ทผ ๊ถŒํ•œ", 1)); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java deleted file mode 100644 index 3efc1eaa..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java +++ /dev/null @@ -1,33 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.usecase.userRole.saveUserRole.ports.SaveUserRolePortIn; -import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRoleCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -@RequiredArgsConstructor -@Order(3) -public class InitUserRoleData implements ApplicationRunner { - - private final SaveUserRolePortIn saveUserRolePortIn; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - public void run(ApplicationArguments args) throws Exception { - if (!isCoreDataRequired) { - return; - } - - saveUserRolePortIn.operate( - new SaveUserRoleCmd("ROLE_GENERAL", "์ผ๋ฐ˜ ์‚ฌ์šฉ์ž", 0, List.of("FRONT_API", "FRONT_ACCESS"))); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java deleted file mode 100644 index 5d44fa2b..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java +++ /dev/null @@ -1,46 +0,0 @@ -package app.module.core.config.adapters.persistence.initData; - -import app.module.core.config.adapters.persistence.initData.helper.RemoveAllMapper; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -@Order(1) -public class RemoveInitData implements ApplicationRunner { - - private final RemoveAllMapper mapper; - - @Value("${app.initData.core}") - private boolean isCoreDataRequired; - - @Override - public void run(ApplicationArguments args) throws Exception { - if (!isCoreDataRequired) { - return; - } - - mapper.deleteAllAdminHasRole(); - mapper.deleteAllAdmin(); - -// mapper.deleteAllHouseholdHasRole(); -// mapper.deleteAllHousehold(); - - mapper.deleteAllRoleHasPrivilege(); - mapper.deleteAllPrivilege(); - - mapper.deleteAllUriHasRole(); - mapper.deleteAllUri(); - - mapper.deleteAllFrontUserHasRole(); - mapper.deleteAllFrontUser(); - -// mapper.deleteAllRole(); - - mapper.deleteAllUicode(); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java deleted file mode 100644 index f93e25e8..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.core.config.adapters.persistence.initData.helper; - -import app.module.core.config.application.enums.AppType; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface RemoveAllAdminURIMapper { - void deleteAllByAppType(AppType appType); - void deleteAllByAdminUriIds(List uriIds); -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java deleted file mode 100644 index c50b3bf8..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.core.config.adapters.persistence.initData.helper; - -import app.module.core.config.application.enums.AppType; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface RemoveAllFrontURIMapper { - void deleteAllByAppType(AppType appType); - void deleteAllByFrontUriIds(List uriIds); -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllMapper.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllMapper.java deleted file mode 100644 index 0eda9bf8..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.config.adapters.persistence.initData.helper; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface RemoveAllMapper { - void deleteAllAdminHasRole(); - void deleteAllAdmin(); - - void deleteAllRoleHasPrivilege(); - void deleteAllPrivilege(); - - void deleteAllUriHasRole(); - void deleteAllUri(); - - void deleteAllFrontUserHasRole(); - void deleteAllFrontUser(); - - void deleteAllHouseholdHasRole(); - void deleteAllHousehold(); - - void deleteAllRole(); - - void deleteAllUicode(); -} 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/constants/DailyRecordConstants.java b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java index fe7609ce..fa959eb4 100644 --- a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -46,7 +46,7 @@ public final class DailyRecordConstants { * ์ผ๊ณ„๋ถ€ ๋“ฑ๋ก ๊ฐ€๋Šฅ ์ผ * [์ •์ฑ…] ํ•ด๋‹น์›” 15์ผ๊นŒ์ง€๋Š” ์ด์ „๋‹ฌ ๋ฐ์ดํ„ฐ ๋“ฑ๋ก ๊ฐ€๋Šฅ * ๋‚ ์งœ ๊ธฐ์ค€ ์ •์ฑ… - * TODO 15๋กœ ๋ณ€๊ฒฝ + * ์ž„์‹œ๋กœ 31์ผ๋กœ ์„ค์ •ํ•ด๋‘  15์ผ๋กœ ๋ณ€๊ฒฝํ•ด์•ผ๋จ. */ public static final int REGISTER_LIMIT_DAY = 31; @@ -61,7 +61,7 @@ public final class DailyRecordConstants { * ์ผ๊ณ„๋ถ€ ์ˆ˜์ • ๊ฐ€๋Šฅ ์ผ * [์ •์ฑ…] ํ•ด๋‹น์›” 15์ผ๊นŒ์ง€๋Š” ์ด์ „๋‹ฌ ๋ฐ์ดํ„ฐ ์ˆ˜์ • ๊ฐ€๋Šฅ * ๋‚ ์งœ ๊ธฐ์ค€ ์ •์ฑ… - * TODO : 15๋กœ ๋ณ€๊ฒฝ + * ์ž„์‹œ๋กœ 31์ผ๋กœ ์„ค์ •ํ•ด๋‘  15์ผ๋กœ ๋ณ€๊ฒฝํ•ด์•ผ๋จ. */ public static final int MODIFY_LIMIT_DAY = 31; diff --git a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java index 90e1a49c..7700d6d5 100644 --- a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java +++ b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java @@ -45,7 +45,6 @@ public class CreateCellService implements CreateCellPortIn { cell.setCellValue(Double.parseDouble(String.valueOf(cellValue))); } catch (NumberFormatException e) { cell.setCellValue(String.valueOf(cellValue)); // ์ˆซ์ž๋กœ ๋ณ€ํ™˜ ๋ถˆ๊ฐ€ ์‹œ ๋ฌธ์ž์—ด๋กœ ์ฒ˜๋ฆฌ - // TODO: ๋กœ๊น… ๋˜๋Š” ์˜ˆ์™ธ ์ฒ˜๋ฆฌ } } break; @@ -83,10 +82,6 @@ public class CreateCellService implements CreateCellPortIn { // ์…€ ์Šคํƒ€์ผ ์ ์šฉ (null ์ฒดํฌ) if (cellConfig.getCellStyle() != null) { cell.setCellStyle(cellConfig.getCellStyle()); - //} else { - // TODO: cellConfig.getCellStyle()์ด null์ธ ๊ฒฝ์šฐ, ์›Œํฌ๋ถ์—์„œ ์ƒˆ๋กœ์šด ์Šคํƒ€์ผ์„ ์ƒ์„ฑํ•˜๊ฑฐ๋‚˜ ๊ธฐ๋ณธ ์Šคํƒ€์ผ์„ ์ ์šฉํ•˜๋Š” ๋กœ์ง ๊ณ ๋ ค - // XSSFWorkbook workbook = (XSSFWorkbook) sheet.getWorkbook(); - // cell.setCellStyle(workbook.createCellStyle()); } // MERGE ๋ณ‘ํ•ฉ @@ -108,7 +103,7 @@ public class CreateCellService implements CreateCellPortIn { private void setMergedRegionBorderStyle( XSSFCellStyle style, CellRangeAddress cellRangeAddress, Sheet sheet) { if (style == null) { - // TODO: ์Šคํƒ€์ผ์ด ์ œ๊ณต๋˜์ง€ ์•Š์œผ๋ฉด ๊ฒฝ๊ณ  ๋กœ๊น… ๋˜๋Š” ๊ธฐ๋ณธ ์Šคํƒ€์ผ ์ ์šฉ ๊ณ ๋ ค + // ์Šคํƒ€์ผ์ด ์ œ๊ณต๋˜์ง€ ์•Š์œผ๋ฉด ๊ฒฝ๊ณ  ๋กœ๊น… ๋˜๋Š” ๊ธฐ๋ณธ ์Šคํƒ€์ผ ์ ์šฉ ๊ณ ๋ ค return; } 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/getAttachment/adapters/web/GetAttachmentController.java b/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java index 7eda247d..ca22f3c8 100644 --- a/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java +++ b/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java @@ -54,22 +54,6 @@ class GetAttachmentController { .body("ํŒŒ์ผ์„ ์ฐพ์„ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค: " + e.getMessage()); } -// TODO - private ์—…๋กœ๋“œ ๊ธฐ๋Šฅ์„ ์ผ๋‹จ mute - -// boolean isPrivate = !getFile.getType().isPubic(); -// -// if (isPrivate) { -// Authentication auth = SecurityContextHolder.getContext().getAuthentication(); -// auth.getAuthorities().stream() -// .filter( -// grantedAuthority -> -// grantedAuthority.getAuthority().equals("ROLE_SUPER") -// || grantedAuthority.getAuthority().equals("PRIVATE_DOWNLOAD")) -// .findFirst() -// .orElseThrow( -// () -> new AccessDeniedException("[AccessDenied] Private ํŒŒ์ผ ๋ฆฌ์†Œ์Šค ์ ‘๊ทผ ๊ถŒํ•œ์ด ์—†์Šต๋‹ˆ๋‹ค.")); -// } - // HTTP ํ—ค๋” ์„ค์ • String encodedFileName = URLEncoder.encode(getFile.getOriginName(), StandardCharsets.UTF_8) .replace("+", "%20"); 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 @@