Merge branch 'dev' into deploy-dev-admin

This commit is contained in:
주수현
2025-07-18 15:06:08 +09:00
975 changed files with 4877 additions and 11505 deletions

3
.gitignore vendored
View File

@@ -39,7 +39,4 @@ META-INF
.jpd .jpd
*.log *.log
front/src/main/resources/static/kri_appimg.png
front/src/main/resources/static/kri_favicon.ico
front/src/main/resources/static/manifest.json
front/web/WEB-INF/web.xml front/web/WEB-INF/web.xml

View File

@@ -26,6 +26,11 @@ Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
``` ```
## 프로젝트 개요
본 프로젝트는 **헥사고날 아키텍처(Ports & Adapters)** 기반의 Spring Boot 멀티모듈 시스템입니다.
도메인 로직과 외부 시스템(웹, DB, 파일 등)을 명확히 분리하여 유지보수성과 확장성을 극대화하였습니다.
## Prerequisites ## Prerequisites
* JDK 17+ * JDK 17+
@@ -43,14 +48,6 @@ recycle 은 `core` 모듈을 기반으로 한 `admin`, `front`, `api` 어플리
| |-- pom.xml | |-- pom.xml
| |-- src | |-- src
| `-- target | `-- target
|-- api # API 모듈 (JWT 토큰 기반 인증)
| |-- pom.xml
| |-- src
| `-- target
|-- aws # AWS 서비스 전략(strategy) 모듈
| |-- pom.xml
| |-- src
| `-- target
|-- core # 공통 모듈 |-- core # 공통 모듈
| |-- pom.xml | |-- pom.xml
| |-- src | |-- src
@@ -60,6 +57,7 @@ recycle 은 `core` 모듈을 기반으로 한 `admin`, `front`, `api` 어플리
| |-- src | |-- src
| `-- target | `-- target
`-- pom.xml `-- pom.xml
`-- README.md
``` ```
⚡ AWS S3 업로드를 이용하지 않는다면, pom.xml 에서 `aws`모듈 관련 내용을 삭제하면 된다. ⚡ AWS S3 업로드를 이용하지 않는다면, pom.xml 에서 `aws`모듈 관련 내용을 삭제하면 된다.
@@ -72,6 +70,26 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
- `recycle-api` - https://recycle-api.etribe.co.kr/swagger-ui/index.html - `recycle-api` - https://recycle-api.etribe.co.kr/swagger-ui/index.html
- `recycle-front` - https://recycle-front.etribe.co.kr/ 계정정보 (generalUser/generalUser1@#$) - `recycle-front` - https://recycle-front.etribe.co.kr/ 계정정보 (generalUser/generalUser1@#$)
### 각 모듈의 내부 구조(헥사고날 아키텍처 예시)
```
usecase/
└── daily/
└── expense/
├── ports/
│ ├── application/
│ │ └── DailyExpenseService.java
│ ├── DailyExpensePortIn.java
│ └── DailyExpensePortOut.java
└── adapters/
├── persistence/
│ └── DailyExpenseDao.java
└── web/
└── DailyExpenseController.java
```
- **ports/**: 도메인 서비스 및 인터페이스(Port)
- **adapters/**: 외부 시스템(웹, DB 등) 연결 어댑터
## VM Options ## VM Options
@@ -115,6 +133,12 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
-Dfile.upload.sftp.id=etribe -Dfile.upload.sftp.id=etribe
-Dfile.upload.sftp.password=Etribe@3415 -Dfile.upload.sftp.password=Etribe@3415
-Dfile.upload.sftp.port=22 -Dfile.upload.sftp.port=22
-Dspring.datasource.hikari.maximum-pool-size=10
-Dspring.datasource.hikari.minimum-idle=5
-Dspring.datasource.hikari.idle-timeout=120000
-Dspring.datasource.hikari.max-lifetime=900000
-Dspring.datasource.hikari.connection-timeout=5000
-Dspring.datasource.hikari.leak-detection-threshold=30000
``` ```
** 주의 : 운영서버일 경우 vm옵션 추가 ** 주의 : 운영서버일 경우 vm옵션 추가
-Dspring.profiles.active=prod -Dspring.profiles.active=prod

View File

@@ -1,6 +1,5 @@
package app.module.admin; package app.module.admin;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;

View File

@@ -12,7 +12,6 @@ import app.module.core.usecase.uri.toptier.ports.URITopTierPortIn;
import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@@ -21,6 +20,8 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import java.util.stream.Collectors;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j

View File

@@ -3,10 +3,6 @@ package app.module.admin.config.adapters.web.mvc;
import app.module.admin.config.adapters.web.interceptor.AdminURIInterceptor; import app.module.admin.config.adapters.web.interceptor.AdminURIInterceptor;
import app.module.core.config.adapters.web.interceptor.URIAuthorizeInterceptor; import app.module.core.config.adapters.web.interceptor.URIAuthorizeInterceptor;
import app.module.core.config.application.enums.PublicAccess; import app.module.core.config.application.enums.PublicAccess;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -20,6 +16,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.CookieLocaleResolver; import org.springframework.web.servlet.i18n.CookieLocaleResolver;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
@Configuration @Configuration
@RequiredArgsConstructor @RequiredArgsConstructor
public class AdminWebMvcConfig implements WebMvcConfigurer { public class AdminWebMvcConfig implements WebMvcConfigurer {

View File

@@ -1,6 +1,5 @@
package app.module.admin.config.application.aop; package app.module.admin.config.application.aop;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.enums.OperationLogType; import app.module.core.config.application.enums.OperationLogType;
import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.CommonUtil;
@@ -9,10 +8,6 @@ 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.domain.OperationLogSaveCommand;
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
@@ -21,6 +16,11 @@ import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.thymeleaf.util.StringUtils; import org.thymeleaf.util.StringUtils;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@Aspect @Aspect
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -2,20 +2,22 @@ package app.module.admin.config.application.batch;
import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; import app.module.admin.usecase.batchLog.ports.BatchLogPortIn;
import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType;
import app.module.core.config.application.logging.SafeLogger;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j
public class BatchLogRunner { public class BatchLogRunner {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(BatchLogRunner.class));
private final BatchLogPortIn batchLogPortIn; private final BatchLogPortIn batchLogPortIn;
public void run(BatchLogType batchType, Runnable action) { public void run(BatchLogType batchType, Runnable action) {
// 이미 실행 중인지 확인 // 이미 실행 중인지 확인
if (batchLogPortIn.exists(batchType)) { if (batchLogPortIn.exists(batchType)) {
log.warn("[{}] 배치가 이미 실행 중 입니다.", batchType.name()); safeLogger.warn("[{}] 배치가 이미 실행 중 입니다.", batchType.name());
return; return;
} }
@@ -29,7 +31,7 @@ public class BatchLogRunner {
} catch (Exception e) { } catch (Exception e) {
// 실패 처리 // 실패 처리
batchLogPortIn.update(logId, "FAIL", e.getMessage()); batchLogPortIn.update(logId, "FAIL", e.getMessage());
log.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); safeLogger.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e);
} }
} }
} }

View File

@@ -10,9 +10,6 @@ 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.domain.OperationLogSaveCommand;
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.Objects;
import java.util.Optional;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -23,6 +20,9 @@ import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.Objects;
import java.util.Optional;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j

View File

@@ -1,19 +1,17 @@
package app.module.admin.config.application.security; package app.module.admin.config.application.security;
import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.logging.SafeLogger;
import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.CommonUtil;
import app.module.core.config.application.util.MessageUtil; import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn; import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.util.Objects;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent; import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
@@ -23,10 +21,13 @@ import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import java.time.LocalDateTime;
import java.util.Objects;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j
public class AdminAuthSuccessEvent { public class AdminAuthSuccessEvent {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(AdminAuthSuccessEvent.class));
private final MessageUtil messageUtil; private final MessageUtil messageUtil;
private final AdminViewPortIn adminViewPortIn; private final AdminViewPortIn adminViewPortIn;
@@ -85,6 +86,6 @@ public class AdminAuthSuccessEvent {
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) { public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
Exception e = event.getException(); Exception e = event.getException();
Authentication authentication = event.getAuthentication(); Authentication authentication = event.getAuthentication();
log.warn("Unsuccessful authentication result: {}", authentication, e); safeLogger.warn("Unsuccessful authentication result: {}", authentication, e);
} }
} }

View File

@@ -4,11 +4,6 @@ import app.module.core.config.adapters.web.security.domain.CorePrivilege;
import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn; 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.admin.view.ports.application.domain.AdminView;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
@@ -19,6 +14,12 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class AdminDetailsService implements UserDetailsService { public class AdminDetailsService implements UserDetailsService {

View File

@@ -1,10 +1,6 @@
package app.module.admin.config.application.security; package app.module.admin.config.application.security;
import app.module.core.config.application.enums.PublicAccess; import app.module.core.config.application.enums.PublicAccess;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.sql.DataSource;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.servlet.ServletListenerRegistrationBean; import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
@@ -21,11 +17,14 @@ import org.springframework.security.core.session.SessionRegistryImpl;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl; import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl;
import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository; import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
import org.springframework.security.web.session.HttpSessionEventPublisher; import org.springframework.security.web.session.HttpSessionEventPublisher;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import javax.sql.DataSource;
import java.util.Arrays;
import java.util.List;
@Configuration @Configuration
@EnableWebSecurity @EnableWebSecurity
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,11 +1,12 @@
package app.module.admin.config.application.security; package app.module.admin.config.application.security;
import java.util.Collection;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.User;
import java.util.Collection;
@Getter @Getter
@Setter @Setter
public class AdminUser extends User { public class AdminUser extends User {

View File

@@ -2,12 +2,12 @@ package app.module.admin.config.application.util;
import app.module.admin.config.application.security.AdminUser; import app.module.admin.config.application.security.AdminUser;
import app.module.core.config.adapters.web.interceptor.model.URITopTierVO; import app.module.core.config.adapters.web.interceptor.model.URITopTierVO;
import java.util.List;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
@Component @Component
public class AdminUtil { public class AdminUtil {
@@ -51,7 +51,7 @@ public class AdminUtil {
} }
AdminUser user = (AdminUser) authentication.getPrincipal(); AdminUser user = (AdminUser) authentication.getPrincipal();
return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode(); return user.getRegionMainCode() == null ? null : user.getRegionMainCode();
} }
public static String getLoginUserLastIp() { public static String getLoginUserLastIp() {

View File

@@ -2,12 +2,13 @@ package app.module.admin.config.application.util;
import app.module.admin.config.application.util.model.DayRange; import app.module.admin.config.application.util.model.DayRange;
import app.module.admin.config.application.util.model.MonthOption; import app.module.admin.config.application.util.model.MonthOption;
import org.springframework.stereotype.Component;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import org.springframework.stereotype.Component;
@Component @Component
public class DateUiUtil { public class DateUiUtil {

View File

@@ -3,10 +3,10 @@ package app.module.admin.config.application.util.model;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.List;
import java.util.Set;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
@Getter @Getter
@Setter @Setter

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.admin.checkAdminId.adapters.web; package app.module.admin.usecase.admin.checkAdminId.adapters.web;
import app.module.core.config.constants.CommonConstants;
import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortIn; import app.module.core.usecase.admin.checkAdminId.ports.CheckAdminIdPortIn;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -18,6 +19,12 @@ class AdminIdDuplicateCheckPostController {
@GetMapping("/api/settings/admin/idCheck") @GetMapping("/api/settings/admin/idCheck")
ResponseEntity<?> selectIdCheck(@RequestParam String id ) { ResponseEntity<?> selectIdCheck(@RequestParam String id ) {
if (!id.matches(CommonConstants.ADMIN_ID_REGEX)) {
return ResponseEntity
.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(CommonConstants.ADMIN_ID_MSG);
}
return ResponseEntity.status(HttpStatus.OK).body(checkAdminIdPortIn.connect(id)); return ResponseEntity.status(HttpStatus.OK).body(checkAdminIdPortIn.connect(id));
} }
} }

View File

@@ -7,9 +7,6 @@ import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdmin
import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsCmd; import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsCmd;
import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole; import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.time.format.DateTimeFormatter;
import java.util.Optional;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Row;
@@ -23,6 +20,10 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import java.time.format.DateTimeFormatter;
import java.util.Optional;
import java.util.stream.Collectors;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor
class AdminExcelController { class AdminExcelController {

View File

@@ -2,7 +2,6 @@ package app.module.admin.usecase.admin.removeAdmins.adapters.web;
import app.module.core.config.application.util.MessageUtil; import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortIn; import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortIn;
import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -10,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import java.util.List;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor
class AdminRemoveController { class AdminRemoveController {

View File

@@ -1,21 +1,15 @@
package app.module.admin.usecase.admin.removeAdmins.adapters.web; package app.module.admin.usecase.admin.removeAdmins.adapters.web;
import app.module.admin.usecase.admin.removeAdmins.adapters.web.model.RemoveAdminsReqVO; import app.module.admin.usecase.admin.removeAdmins.adapters.web.model.RemoveAdminsReqVO;
import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortIn; import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortIn;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,12 +1,12 @@
package app.module.admin.usecase.admin.removeAdmins.adapters.web.model; package app.module.admin.usecase.admin.removeAdmins.adapters.web.model;
import java.util.List;
import java.util.Set;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -8,7 +8,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -2,22 +2,15 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminCreateValidator; import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminCreateValidator;
import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.bind.annotation.RestController;
@Slf4j @Slf4j
@RestController @RestController

View File

@@ -2,7 +2,6 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web;
import app.module.admin.usecase.admin.getAdmins.adapters.web.model.AdminListFilterVO; import app.module.admin.usecase.admin.getAdmins.adapters.web.model.AdminListFilterVO;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.config.application.component.ListPageableInfo; import app.module.core.config.application.component.ListPageableInfo;
import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.MessageUtil; import app.module.core.config.application.util.MessageUtil;
@@ -10,8 +9,6 @@ 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.admin.view.ports.application.domain.AdminView;
import app.module.core.usecase.role.list.ports.RoleListPortIn; import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import java.util.NoSuchElementException;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -19,6 +16,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import java.util.NoSuchElementException;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor
class AdminUpdateGetController { class AdminUpdateGetController {

View File

@@ -2,25 +2,14 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminUpdateValidator; import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminUpdateValidator;
import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.MessageUtil;
import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn;
import app.module.core.usecase.role.list.ports.RoleListPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import java.util.stream.Collectors;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,6 +1,5 @@
package app.module.admin.usecase.admin.saveAdmin.adapters.web.model; package app.module.admin.usecase.admin.saveAdmin.adapters.web.model;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@@ -28,4 +27,5 @@ public class AdminCreateBindingVO {
private Boolean accountDisabled; private Boolean accountDisabled;
/* private Boolean accountLocked;*/ /* private Boolean accountLocked;*/
private String roleId; private String roleId;
private Boolean checkDuplicate;
} }

View File

@@ -1,11 +1,12 @@
package app.module.admin.usecase.admin.saveAdmin.adapters.web.model; package app.module.admin.usecase.admin.saveAdmin.adapters.web.model;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,20 +1,17 @@
package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator; package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO;
import java.util.Optional; import app.module.core.config.constants.CommonConstants;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;
import java.util.Optional;
@Component @Component
public class AdminCreateValidator implements Validator { public class AdminCreateValidator implements Validator {
// 아이디: 4~15자, 영문/숫자/한글/특수문자(_,-) 허용
private final String ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$";
// 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상
private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$";
@Override @Override
public boolean supports(Class<?> clazz) { public boolean supports(Class<?> clazz) {
return AdminCreateBindingVO.class.equals(clazz); return AdminCreateBindingVO.class.equals(clazz);
@@ -24,51 +21,68 @@ public class AdminCreateValidator implements Validator {
public void validate(Object target, Errors errors) { public void validate(Object target, Errors errors) {
AdminCreateBindingVO vo = (AdminCreateBindingVO) target; AdminCreateBindingVO vo = (AdminCreateBindingVO) target;
if (vo.getRoleId() == null || vo.getRoleId().isEmpty()) { // [1] 필수값 누락 체크
errors.rejectValue("roleId", "error.roleId", "권한을 선택해주세요."); if(StringUtils.isBlank(vo.getRoleId())) {
errors.rejectValue("roleId", "error.roleId", "필수입력항목을 확인해주세요.");
return;
}
if(StringUtils.isBlank(vo.getId())) {
errors.rejectValue("id", "error.id", "필수입력항목을 확인해주세요.");
return;
}
if(StringUtils.isBlank(vo.getPassword())) {
errors.rejectValue("password", "error.password", "필수입력항목을 확인해주세요.");
return;
} }
if (vo.getAccountDisabled() == null ) { // 권한 조사원으로 선택했을 경우
errors.rejectValue("accountDisabled", "error.accountDisabled", "사용여부를 선택해주세요."); if("ROLE_RESEARCHER".equals(vo.getRoleId())) {
if(StringUtils.isBlank(vo.getName())) {
errors.rejectValue("name", "error.name", "필수입력항목을 확인해주세요.");
return;
} }
if(StringUtils.isBlank(vo.getPhone1())) {
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "id", "valid.common.required","아이디는 필수입력값입니다."); errors.rejectValue("phone1", "error.phone1", "필수입력항목을 확인해주세요.");
Optional.ofNullable(vo.getId()) return;
.filter(id -> !id.matches(ID_REGEX))
.ifPresent(id -> errors.rejectValue("id", "valid.common.id.wrong","아이디를 4~15자, 영문/숫자/한글/특수문자(_,-) 입니다."));
// 비밀번호 유효성 검사
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "valid.common.required","비밀번호는 필수입력값입니다.");
Optional.ofNullable(vo.getPassword())
.filter(password -> !password.matches(PASSWORD_REGEX))
.ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong","비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다."));
if (vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) {
if (vo.getName() == null || vo.getName().isBlank()) {
errors.rejectValue("name", "error.name", "이름을 입력해주세요.");
} }
if (vo.getName().length() > 10) { if(StringUtils.isBlank(vo.getPhone2())) {
errors.rejectValue("name", "error.name", "이름은 10자까지 입력가능합니다."); errors.rejectValue("phone2", "error.phone2", "필수입력항목을 확인해주세요.");
return;
} }
if (vo.getPhone1() == null || vo.getPhone1().isBlank()) { if (!vo.getPhone1().matches("^\\d{4}$")) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요.");
} else if (!vo.getPhone1().matches("^\\d{4}$")) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다."); errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다.");
return;
} }
if (vo.getPhone2() == null || vo.getPhone2().isBlank()) { if (!vo.getPhone2().matches("^\\d{4}$")) {
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리를 입력해주세요.");
} else if (!vo.getPhone2().matches("^\\d{4}$")) {
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다."); errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다.");
return;
} }
} }
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
if(vo.getAccountDisabled() == null) {
errors.rejectValue("accountDisabled", "error.accountDisabled", "필수입력항목을 확인해주세요.");
return;
}
// ROLE_ADMIN이 아닌 경우 실사지역 null체크
Optional.ofNullable(vo.getRoleId()) Optional.ofNullable(vo.getRoleId())
.filter(id -> !id.equals("ROLE_ADMIN")) .filter(id -> !id.equals("ROLE_ADMIN"))
.ifPresent(nonAdmins -> { .ifPresent(nonAdmins -> {
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) { if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
errors.rejectValue("regionMainCode", "valid.common.required","실사지역은 필수입력값입니다."); errors.rejectValue("regionMainCode", "valid.common.required","필수입력항목을 확인해주세요.");
} }
}); });
// [2] 아이디 중복 확인 여부
if (vo.getCheckDuplicate() == null || !vo.getCheckDuplicate()) {
errors.rejectValue("checkDuplicate", "error.checkDuplicate", "아이디 중복 확인을 먼저 진행해주세요.");
return;
}
// [3] 비밀번호 형식 검사
if (!vo.getPassword().matches(CommonConstants.ADMIN_PASSWORD_REGEX)) {
errors.rejectValue("password", "valid.common.password.wrong",
CommonConstants.ADMIN_PASSWORD_MSG);
}
} }
} }

View File

@@ -1,18 +1,16 @@
package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator; package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator;
import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO;
import java.util.Optional; import app.module.core.config.constants.CommonConstants;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;
import java.util.Optional;
@Component @Component
public class AdminUpdateValidator implements Validator { public class AdminUpdateValidator implements Validator {
// 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상
private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$";
@Override @Override
public boolean supports(Class<?> clazz) { public boolean supports(Class<?> clazz) {
return AdminUpdateBindingVO.class.equals(clazz); return AdminUpdateBindingVO.class.equals(clazz);
@@ -22,39 +20,54 @@ public class AdminUpdateValidator implements Validator {
public void validate(Object target, Errors errors) { public void validate(Object target, Errors errors) {
AdminUpdateBindingVO vo = (AdminUpdateBindingVO) target; AdminUpdateBindingVO vo = (AdminUpdateBindingVO) target;
if (vo.getRoleId() == null || vo.getRoleId().isEmpty()) { // [1] 필수값 누락 체크
errors.rejectValue("roleId", "error.roleId", "권한을 선택해주세요."); if(vo.getRoleId() == null || vo.getRoleId().isEmpty()) {
errors.rejectValue("roleId", "error.roleId", "필수입력항목을 확인해주세요.");
return;
} }
Optional.ofNullable(vo.getUpdatePassword()) // 권한 조사원으로 선택했을 경우
.filter(password -> !password.trim().isEmpty() && !password.matches(PASSWORD_REGEX)) if(vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) {
.ifPresent(password -> errors.rejectValue("updatePassword", "valid.common.password.wrong","비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다.")); if(vo.getName() == null || vo.getName().isEmpty()) {
errors.rejectValue("name", "error.name", "필수입력항목을 확인해주세요.");
if (vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) { return;
if (vo.getName() == null || vo.getName().isBlank()) {
errors.rejectValue("name", "error.name", "이름을 입력해주세요.");
} }
if (vo.getName().length() > 10) { if(vo.getPhone1() == null || vo.getPhone1().isBlank()) {
errors.rejectValue("name", "error.name", "이름은 10자까지 입력가능합니다."); errors.rejectValue("phone1", "error.phone1", "필수입력항목을 확인해주세요.");
return;
} }
if (vo.getPhone1() == null || vo.getPhone1().isBlank()) { if(vo.getPhone2() == null || vo.getPhone2().isBlank()) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요."); errors.rejectValue("phone2", "error.phone2", "필수입력항목을 확인해주세요.");
} else if (!vo.getPhone1().matches("^\\d{4}$")) { return;
}
if (!vo.getPhone1().matches("^\\d{4}$")) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다."); errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다.");
return;
} }
if (vo.getPhone2() == null || vo.getPhone2().isBlank()) { if (!vo.getPhone2().matches("^\\d{4}$")) {
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리를 입력해주세요.");
} else if (!vo.getPhone2().matches("^\\d{4}$")) {
errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다."); errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다.");
return;
} }
} }
// ROLE_ADMIN이 아닌 경우 regionMainCode null체크
// 사용여부
if(vo.getAccountDisabled() == null) {
errors.rejectValue("accountDisabled", "error.accountDisabled", "필수입력항목을 확인해주세요.");
return;
}
// ROLE_ADMIN이 아닌 경우 실사지역 null체크
Optional.ofNullable(vo.getRoleId()) Optional.ofNullable(vo.getRoleId())
.filter(id -> !id.equals("ROLE_ADMIN")) .filter(id -> !id.equals("ROLE_ADMIN"))
.ifPresent(nonAdmins -> { .ifPresent(nonAdmins -> {
if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) { if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) {
errors.rejectValue("regionMainCode", "valid.common.required","실사지역을 선택해주세요."); errors.rejectValue("regionMainCode", "valid.common.required","필수입력항목을 확인해주세요.");
} }
}); });
// [3] 비밀번호 형식 검사
if ((vo.getUpdatePassword() != "" && vo.getUpdatePassword() != null )&& !vo.getUpdatePassword().matches(CommonConstants.ADMIN_PASSWORD_REGEX)){
errors.rejectValue("updatePassword", "valid.common.password.wrong", CommonConstants.ADMIN_PASSWORD_MSG);
}
} }
} }

View File

@@ -3,10 +3,11 @@ package app.module.admin.usecase.batchLog.adapters.persistence;
import app.module.admin.usecase.batchLog.ports.BatchLogPortOut; import app.module.admin.usecase.batchLog.ports.BatchLogPortOut;
import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd;
import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor
class BatchLogDao implements BatchLogPortOut { class BatchLogDao implements BatchLogPortOut {

View File

@@ -1,11 +1,12 @@
package app.module.admin.usecase.batchLog.ports.application.domain; package app.module.admin.usecase.batchLog.ports.application.domain;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,11 +1,12 @@
package app.module.admin.usecase.batchLog.ports.application.domain; package app.module.admin.usecase.batchLog.ports.application.domain;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -8,5 +8,5 @@ import lombok.RequiredArgsConstructor;
public enum BatchLogType { public enum BatchLogType {
AUTO_SMS, AUTO_SMS,
MONTHLY_STATUS, MONTHLY_STATUS,
CARRYOVER; CARRYOVER
} }

View File

@@ -1,7 +1,6 @@
package app.module.admin.usecase.communication.notice.createNotice.adapters.web; package app.module.admin.usecase.communication.notice.createNotice.adapters.web;
import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeReqVO;
import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeUIReqVO; import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeUIReqVO;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

View File

@@ -1,6 +1,5 @@
package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model; package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.*; import lombok.*;

View File

@@ -1,15 +1,9 @@
package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model; package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.apache.commons.text.StringEscapeUtils;
import java.time.LocalDateTime;
import java.util.List;
@Getter @Getter
@Setter @Setter

View File

@@ -5,7 +5,6 @@ import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePo
import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice;
import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Optional; import java.util.Optional;

View File

@@ -2,18 +2,15 @@ package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web;
import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO;
import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn;
import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices;
import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault; import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@Controller @Controller

View File

@@ -43,7 +43,9 @@ class UpdateNoticeController {
updateFilePortIn.operate( updateFilePortIn.operate(
new UpdateFileCmd( new UpdateFileCmd(
reqVO.getId(), reqVO.getId(),
reqVO.getFileMappingId().stream().map(Long::parseLong).toList(), reqVO.getFileMappingId() != null
? reqVO.getFileMappingId().stream().map(Long::parseLong).toList()
: List.of(),
FileUploadType.NOTICE) FileUploadType.NOTICE)
); );

View File

@@ -1,17 +1,8 @@
package app.module.admin.usecase.communication.notice.updateNotice.adapters.web; package app.module.admin.usecase.communication.notice.updateNotice.adapters.web;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO;
import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn;
import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices;
import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd;
import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn; import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

View File

@@ -1,11 +1,11 @@
package app.module.admin.usecase.communication.sms.getSmsUI; package app.module.admin.usecase.communication.sms.getSmsUI;
import app.module.admin.usecase.communication.sms.getSmsUI.model.GetSmsReqVO;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.communication.sms.getSmsUI.model.GetSmsReqVO;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,12 +1,13 @@
package app.module.admin.usecase.communication.suggestion.getSuggestion.adapters.persistence; package app.module.admin.usecase.communication.suggestion.getSuggestion.adapters.persistence;
import lombok.RequiredArgsConstructor; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut; import lombok.RequiredArgsConstructor;
import java.util.Optional;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.Optional;
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor
class GetSuggestionDao implements GetSuggestionPortOut { class GetSuggestionDao implements GetSuggestionPortOut {

View File

@@ -2,9 +2,10 @@ package app.module.admin.usecase.communication.suggestion.getSuggestion.adapters
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.Optional;
@Mapper @Mapper
public interface GetSuggestionMapper { public interface GetSuggestionMapper {
Optional<GetSuggestion> getSuggestionById(GetSuggestionCmd cmd); Optional<GetSuggestion> getSuggestionById(GetSuggestionCmd cmd);

View File

@@ -1,9 +1,10 @@
package app.module.admin.usecase.communication.suggestion.getSuggestion.ports; package app.module.admin.usecase.communication.suggestion.getSuggestion.ports;
import java.util.Optional;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
import java.util.Optional;
public interface GetSuggestionPortIn { public interface GetSuggestionPortIn {
Optional<GetSuggestion> operate(GetSuggestionCmd cmd); Optional<GetSuggestion> operate(GetSuggestionCmd cmd);
} }

View File

@@ -1,9 +1,10 @@
package app.module.admin.usecase.communication.suggestion.getSuggestion.ports; package app.module.admin.usecase.communication.suggestion.getSuggestion.ports;
import java.util.Optional;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
import java.util.Optional;
public interface GetSuggestionPortOut { public interface GetSuggestionPortOut {
Optional<GetSuggestion> operate(GetSuggestionCmd cmd); Optional<GetSuggestion> operate(GetSuggestionCmd cmd);
} }

View File

@@ -1,13 +1,14 @@
package app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application; package app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortIn;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut;
import java.util.Optional; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Optional;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
class GetSuggestionService implements GetSuggestionPortIn { class GetSuggestionService implements GetSuggestionPortIn {

View File

@@ -2,13 +2,13 @@ package app.module.admin.usecase.communication.suggestion.getSuggestionUI;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortIn;
import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd;
import app.module.admin.usecase.communication.suggestion.getSuggestionUI.model.GetSuggestionUIReqVO;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import app.module.admin.usecase.communication.suggestion.getSuggestionUI.model.GetSuggestionUIReqVO;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,15 +1,16 @@
package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.persistence; package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.persistence;
import java.util.List; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut; import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor
class GetSuggestionsDao implements GetSuggestionsPortOut { class GetSuggestionsDao implements GetSuggestionsPortOut {

View File

@@ -2,11 +2,12 @@ package app.module.admin.usecase.communication.suggestion.getSuggestions.adapter
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import java.util.List;
@Mapper @Mapper
public interface GetSuggestionsMapper { public interface GetSuggestionsMapper {
List<GetSuggestions> getSuggestions(@Param("pageable") Pageable pageable, List<GetSuggestions> getSuggestions(@Param("pageable") Pageable pageable,

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web; package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web;
import app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model.GetSuggestionsReqVO;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortIn;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -7,10 +8,8 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault; import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model.GetSuggestionsReqVO; import org.springframework.web.bind.annotation.RestController;
import app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model.GetSuggestionsResVO;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,10 +1,10 @@
package app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application; package app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortIn;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions;
import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@@ -1,13 +1,12 @@
package app.module.admin.usecase.communication.suggestion.getSuggestionsUI; package app.module.admin.usecase.communication.suggestion.getSuggestionsUI;
import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.config.application.util.DateUiUtil;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestionsUI.model.GetSuggestionsUIReqVO;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.communication.suggestion.getSuggestionsUI.model.GetSuggestionsUIReqVO;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -3,31 +3,30 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence;
import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionPercentDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.TotalPercentDto;
import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO;
import app.module.admin.usecase.dashboard.chart.ports.ChartPortOut; import app.module.admin.usecase.dashboard.chart.ports.ChartPortOut;
import app.module.core.config.application.exception.NoMatchingURIException; import app.module.core.config.application.exception.NoMatchingURIException;
import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper; import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class ChartDao implements ChartPortOut { public class ChartDao implements ChartPortOut {
@Value("${spring.profiles.active}")
private String activeProfiles;
private final ChartMapper chartMapper; private final ChartMapper chartMapper;
private final UICodeListMapper uiCodeListMapper; private final UICodeListMapper uiCodeListMapper;
@Override @Override
public ChartDto selectTotalPercentage(String usageType) { public ChartDto selectTotalPercentage(String usageType) {
TotalPercentageReqVO reqVO = new TotalPercentageReqVO(); TotalPercentageReqVO reqVO = new TotalPercentageReqVO();
@@ -44,10 +43,10 @@ public class ChartDao implements ChartPortOut {
// 관리자 일경우 // 관리자 일경우
return new ChartDto( return new ChartDto(
recordMonthText, recordMonthText,
chartMapper.selectTotalPercentage(reqVO), chartMapper.selectTotalPercentage(reqVO,activeProfiles),
chartMapper.selectLocalRegionPercentage(reqVO), chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles),
chartMapper.selectLocalRegionResearcherPercentage(reqVO), chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles),
uiCodeListMapper.findByParentId("code.region.main")); uiCodeListMapper.findByParentId("code.region.main",AdminUtil.getLoginUserRole(),activeProfiles));
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { } else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
// 지방 실사 일경우 실사 지역으로만 // 지방 실사 일경우 실사 지역으로만
@@ -55,14 +54,14 @@ public class ChartDao implements ChartPortOut {
return new ChartDto( return new ChartDto(
recordMonthText, recordMonthText,
chartMapper.selectTotalPercentage(reqVO), chartMapper.selectTotalPercentage(reqVO,activeProfiles),
null, null,
chartMapper.selectLocalRegionResearcherPercentage(reqVO), chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles),
null); null);
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { } else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
// 조사원 일경우 // 조사원 일경우
reqVO.setAdminSeq(AdminUtil.getLoginUserSeq()); reqVO.setAdminSeq(AdminUtil.getLoginUserSeq());
return new ChartDto(recordMonthText, chartMapper.selectTotalPercentageResearcher(reqVO), null,null,null); return new ChartDto(recordMonthText, chartMapper.selectTotalPercentageResearcher(reqVO,activeProfiles), null,null,null);
} }
return new ChartDto(null,null,null,null,null); return new ChartDto(null,null,null,null,null);
@@ -74,7 +73,7 @@ public class ChartDao implements ChartPortOut {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
String formattedDate = today.format(formatter); String formattedDate = today.format(formatter);
if("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) { if("ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
return chartMapper.selectLocalRegionResearcherPercentage(new TotalPercentageReqVO(usageType,regionMainCode,formattedDate)); return chartMapper.selectLocalRegionResearcherPercentage(new TotalPercentageReqVO(usageType,regionMainCode,formattedDate),activeProfiles);
}else{ }else{
throw new NoMatchingURIException("잘못된 접근"); throw new NoMatchingURIException("잘못된 접근");
} }
@@ -83,7 +82,7 @@ public class ChartDao implements ChartPortOut {
@Override @Override
public DashboardExcelDto selectDashboard(String recordMonth) { public DashboardExcelDto selectDashboard(String recordMonth) {
return new DashboardExcelDto( return new DashboardExcelDto(
chartMapper.selectRegionMainExcel(recordMonth), chartMapper.selectRegionMainExcel(recordMonth,activeProfiles),
chartMapper.selectRegionDetailExcel(recordMonth)); chartMapper.selectRegionDetailExcel(recordMonth,activeProfiles));
} }
} }

View File

@@ -1,24 +1,20 @@
package app.module.admin.usecase.dashboard.chart.adapters.persistence; package app.module.admin.usecase.dashboard.chart.adapters.persistence;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.*;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.TotalPercentDto;
import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface ChartMapper { public interface ChartMapper {
TotalPercentDto selectTotalPercentage(TotalPercentageReqVO reqVO); TotalPercentDto selectTotalPercentage(@Param("reqVO") TotalPercentageReqVO reqVO,@Param("activeProfiles") String activeProfiles);
TotalPercentDto selectTotalPercentageResearcher(TotalPercentageReqVO reqVO); TotalPercentDto selectTotalPercentageResearcher(@Param("reqVO") TotalPercentageReqVO reqVO,@Param("activeProfiles") String activeProfiles);
List<LocalRegionPercentDto> selectLocalRegionPercentage(TotalPercentageReqVO reqVO); List<LocalRegionPercentDto> selectLocalRegionPercentage(@Param("reqVO") TotalPercentageReqVO reqVO,@Param("activeProfiles") String activeProfiles);
List<LocalRegionResearcherPercentDto> selectLocalRegionResearcherPercentage(TotalPercentageReqVO reqVO); List<LocalRegionResearcherPercentDto> selectLocalRegionResearcherPercentage(@Param("reqVO") TotalPercentageReqVO reqVO,@Param("activeProfiles") String activeProfiles);
List<RegionMainExcelDto> selectRegionMainExcel(String recordMonth); List<RegionMainExcelDto> selectRegionMainExcel(@Param("recordMonth") String recordMonth,@Param("activeProfiles") String activeProfiles);
List<RegionDetailExcelDto> selectRegionDetailExcel(String recordMonth); List<RegionDetailExcelDto> selectRegionDetailExcel(@Param("recordMonth") String recordMonth,@Param("activeProfiles") String activeProfiles);
} }

View File

@@ -3,6 +3,7 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence.model;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data

View File

@@ -1,10 +1,11 @@
package app.module.admin.usecase.dashboard.chart.adapters.persistence.model; package app.module.admin.usecase.dashboard.chart.adapters.persistence.model;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -4,6 +4,7 @@ import lombok.Data;
@Data @Data
public class LocalRegionResearcherPercentDto { public class LocalRegionResearcherPercentDto {
private Long seq;
private String researcherName; private String researcherName;
private String regionMainCodeName; private String regionMainCodeName;
private Double totalHouseholdCount; private Double totalHouseholdCount;

View File

@@ -6,15 +6,7 @@ import app.module.admin.config.application.util.model.ExcelSheetDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO;
import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn; import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -23,7 +15,18 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j @Slf4j
@RestController @RestController

View File

@@ -3,7 +3,6 @@ package app.module.admin.usecase.dashboard.chart.ports;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto;
import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO;
import java.util.List; import java.util.List;

View File

@@ -3,7 +3,6 @@ package app.module.admin.usecase.dashboard.chart.ports.applilcation;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto;
import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO;
import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn; import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn;
import app.module.admin.usecase.dashboard.chart.ports.ChartPortOut; import app.module.admin.usecase.dashboard.chart.ports.ChartPortOut;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@@ -1,12 +1,12 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence; package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatusCmd;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut;
import java.util.Optional; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.Optional;
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor
class GetSmsAutoStatusDao implements GetSmsAutoStatusPortOut { class GetSmsAutoStatusDao implements GetSmsAutoStatusPortOut {

View File

@@ -1,9 +1,10 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence; package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.Optional;
@Mapper @Mapper
public interface GetSmsAutoStatusMapper { public interface GetSmsAutoStatusMapper {
Optional<GetSmsAutoStatus> operate(); Optional<GetSmsAutoStatus> operate();

View File

@@ -1,6 +1,7 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports; package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import java.util.Optional; import java.util.Optional;
public interface GetSmsAutoStatusPortIn { public interface GetSmsAutoStatusPortIn {

View File

@@ -1,6 +1,7 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports; package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import java.util.Optional; import java.util.Optional;
public interface GetSmsAutoStatusPortOut { public interface GetSmsAutoStatusPortOut {

View File

@@ -3,10 +3,11 @@ package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import java.util.Optional;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Optional;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
class GetSmsAutoStatusService implements GetSmsAutoStatusPortIn { class GetSmsAutoStatusService implements GetSmsAutoStatusPortIn {

View File

@@ -1,11 +1,12 @@
package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain; package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,10 +1,9 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.persistence; package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.persistence;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.config.application.annotation.UpdateCommand;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@Repository @Repository

View File

@@ -1,21 +1,19 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web; package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusReqVO;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusResVO;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import app.module.core.config.application.util.MessageUtil; import app.module.core.config.application.util.MessageUtil;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusReqVO;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusResVO;
@Slf4j
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
class UpdateSmsAutoStatusController { class UpdateSmsAutoStatusController {
@@ -35,7 +33,6 @@ class UpdateSmsAutoStatusController {
portIn.operate(new UpdateSmsAutoStatusCmd(reqVO.getActive())); portIn.operate(new UpdateSmsAutoStatusCmd(reqVO.getActive()));
} catch (Exception e) { } catch (Exception e) {
// update 실패 // update 실패
log.info(e.getMessage());
throw new RuntimeException(e); throw new RuntimeException(e);
} }

View File

@@ -1,6 +1,5 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model; package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

View File

@@ -1,9 +1,9 @@
package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application; package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut;
import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service

View File

@@ -2,7 +2,6 @@ package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application
import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.adapters.persistence.component.AuditCommand;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

View File

@@ -5,7 +5,6 @@ import app.module.core.config.application.enums.FileUploadType;
import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn; import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn;
import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage;
import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn;
import java.io.IOException;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@@ -14,6 +13,8 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@Controller @Controller
@RequiredArgsConstructor @RequiredArgsConstructor
public class EditorImageUploadController { public class EditorImageUploadController {

View File

@@ -1,23 +1,22 @@
package app.module.admin.usecase.excel.getExcelMultilSheet.adapters.web; package app.module.admin.usecase.excel.getExcelMultilSheet.adapters.web;
import app.module.admin.config.application.util.ExcelWriterUtil;
import app.module.admin.config.application.util.model.ExcelSheetDto; import app.module.admin.config.application.util.model.ExcelSheetDto;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.IndexedColors;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import app.module.admin.config.application.util.ExcelWriterUtil;
import java.util.List;
import java.util.Set;
import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.Map;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
import java.util.Set;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,16 +1,16 @@
package app.module.admin.usecase.home.adapters.web; package app.module.admin.usecase.home.adapters.web;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import java.security.Principal;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import java.security.Principal;
@Controller @Controller
@RequestMapping("/") @RequestMapping("/")
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,12 +1,13 @@
package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence; package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence;
import lombok.RequiredArgsConstructor; import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut; import lombok.RequiredArgsConstructor;
import java.util.Optional;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.Optional;
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor
class CheckHouseholdNumDao implements CheckHouseholdNumPortOut { class CheckHouseholdNumDao implements CheckHouseholdNumPortOut {

View File

@@ -2,9 +2,10 @@ package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistenc
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.Optional;
@Mapper @Mapper
public interface CheckHouseholdNumMapper { public interface CheckHouseholdNumMapper {
Optional<CheckHouseholdNum> checkHouseholdNum(CheckHouseholdNumCmd cmd); Optional<CheckHouseholdNum> checkHouseholdNum(CheckHouseholdNumCmd cmd);

View File

@@ -9,7 +9,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController

View File

@@ -1,9 +1,10 @@
package app.module.admin.usecase.household.checkHouseholdNum.ports; package app.module.admin.usecase.household.checkHouseholdNum.ports;
import java.util.Optional;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import java.util.Optional;
public interface CheckHouseholdNumPortIn { public interface CheckHouseholdNumPortIn {
Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd); Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd);
} }

View File

@@ -1,9 +1,10 @@
package app.module.admin.usecase.household.checkHouseholdNum.ports; package app.module.admin.usecase.household.checkHouseholdNum.ports;
import java.util.Optional;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import java.util.Optional;
public interface CheckHouseholdNumPortOut { public interface CheckHouseholdNumPortOut {
Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd); Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd);
} }

View File

@@ -1,13 +1,14 @@
package app.module.admin.usecase.household.checkHouseholdNum.ports.application; package app.module.admin.usecase.household.checkHouseholdNum.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn; import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn;
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut; import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut;
import java.util.Optional; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Optional;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
class CheckHouseholdNumService implements CheckHouseholdNumPortIn { class CheckHouseholdNumService implements CheckHouseholdNumPortIn {

View File

@@ -1,14 +1,13 @@
package app.module.admin.usecase.household.createHousehold.adapters.persistence; package app.module.admin.usecase.household.createHousehold.adapters.persistence;
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd;
import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.annotation.CreateCommand;
import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.AuditUtil;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,19 +1,18 @@
package app.module.admin.usecase.household.createHousehold.adapters.web; package app.module.admin.usecase.household.createHousehold.adapters.web;
import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdReqVO;
import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdResVO; import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdResVO;
import app.module.core.config.application.util.MessageUtil; import app.module.admin.usecase.household.createHousehold.adapters.web.validator.CreateHouseholdValidator;
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn; import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdReqVO;
import app.module.admin.usecase.household.createHousehold.adapters.web.validator.CreateHouseholdValidator;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -2,13 +2,7 @@ package app.module.admin.usecase.household.createHousehold.adapters.web.model;
import app.module.admin.config.application.enums.EmploymentType; import app.module.admin.config.application.enums.EmploymentType;
import app.module.admin.config.application.enums.UsageType; import app.module.admin.config.application.enums.UsageType;
import jakarta.validation.constraints.NotBlank; import lombok.*;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter @Getter
@Setter @Setter

View File

@@ -8,18 +8,20 @@ import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdP
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn;
import java.util.List; import app.module.core.config.application.logging.SafeLogger;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import org.slf4j.LoggerFactory;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@Slf4j import java.util.List;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
class CreateHouseholdService implements CreateHouseholdPortIn { class CreateHouseholdService implements CreateHouseholdPortIn {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(CreateHouseholdService.class));
private final CreateHouseholdPortOut portOut; private final CreateHouseholdPortOut portOut;
private final BCryptPasswordEncoder passwordEncoder; private final BCryptPasswordEncoder passwordEncoder;
@@ -72,8 +74,7 @@ class CreateHouseholdService implements CreateHouseholdPortIn {
autoSchedulesPortIn.operate(); autoSchedulesPortIn.operate();
} catch (Exception e) { } catch (Exception e) {
log.info(e.getMessage()); safeLogger.error("Exception: {}", e.getMessage(), e);
throw e;
} }
} }
} }

View File

@@ -1,12 +1,13 @@
package app.module.admin.usecase.household.createHousehold.ports.application.domain; package app.module.admin.usecase.household.createHousehold.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,12 +1,13 @@
package app.module.admin.usecase.household.createHousehold.ports.application.domain; package app.module.admin.usecase.household.createHousehold.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,7 +1,6 @@
package app.module.admin.usecase.household.createHousehold.ports.application.domain; package app.module.admin.usecase.household.createHousehold.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,6 +1,7 @@
package app.module.admin.usecase.household.createHouseholdUI.adapters.web; package app.module.admin.usecase.household.createHouseholdUI.adapters.web;
import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.household.createHouseholdUI.adapters.web.model.CreateHouseholdUIReqVO;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -8,7 +9,6 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.household.createHouseholdUI.adapters.web.model.CreateHouseholdUIReqVO;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@Controller @Controller

View File

@@ -1,10 +1,10 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence; package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd; import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd;
import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.AuditUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

View File

@@ -1,5 +1,7 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.web; package app.module.admin.usecase.household.createResearcherMapping.adapters.web;
import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingReqVO;
import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingResVO;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn; import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import app.module.core.config.application.util.MessageUtil; import app.module.core.config.application.util.MessageUtil;
@@ -7,12 +9,10 @@ import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingReqVO;
import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingResVO;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -1,12 +1,12 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model; package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor

View File

@@ -1,11 +1,12 @@
package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model; package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,9 +1,9 @@
package app.module.admin.usecase.household.createResearcherMapping.ports.application; package app.module.admin.usecase.household.createResearcherMapping.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn; import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn;
import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut; import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut;
import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service

View File

@@ -1,12 +1,13 @@
package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain; package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,12 +1,13 @@
package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain; package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,11 +1,12 @@
package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence; package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence;
import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut;
import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut;
import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor
class GetHouseholdsExcelDao implements GetHouseholdsExcelPortOut { class GetHouseholdsExcelDao implements GetHouseholdsExcelPortOut {

View File

@@ -1,9 +1,9 @@
package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence; package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence;
import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*;
import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface GetHouseholdsExcelMapper { public interface GetHouseholdsExcelMapper {

View File

@@ -11,19 +11,12 @@ import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports
import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn; import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd;
import java.net.URLEncoder; import app.module.core.config.application.logging.SafeLogger;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import app.module.core.config.application.util.DailyUtil; import app.module.core.config.application.util.DailyUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.IndexedColors;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@@ -32,10 +25,19 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j
class GetHouseholdsExcelController { class GetHouseholdsExcelController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(GetHouseholdsExcelController.class));
private final GetHouseholdsStatusPortIn getHouseholdsStatusPortIn; private final GetHouseholdsStatusPortIn getHouseholdsStatusPortIn;
private final GetHouseholdsExcelPortIn getHouseholdsExcelPortIn; private final GetHouseholdsExcelPortIn getHouseholdsExcelPortIn;
private final DailyUtil dailyUtil; private final DailyUtil dailyUtil;
@@ -120,7 +122,7 @@ class GetHouseholdsExcelController {
}; };
if (result == null) { if (result == null) {
log.warn("[엑셀 다운로드 실패] 템플릿 타입 '{}' 에 대한 처리 결과가 null입니다.", reqVO.getTemplateType()); safeLogger.warn("[엑셀 다운로드 실패] 템플릿 타입 '{}' 에 대한 처리 결과가 null입니다.", reqVO.getTemplateType());
return ResponseEntity.badRequest().build(); return ResponseEntity.badRequest().build();
} }

View File

@@ -1,12 +1,13 @@
package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application; package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application;
import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortIn; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortIn;
import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut;
import java.util.List; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
class GetHouseholdsExcelService implements GetHouseholdsExcelPortIn { class GetHouseholdsExcelService implements GetHouseholdsExcelPortIn {

View File

@@ -1,11 +1,12 @@
package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain; package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@AllArgsConstructor @AllArgsConstructor

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.persistence; package app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.persistence;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence.CheckHouseholdNumMapper; import app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence.CheckHouseholdNumMapper;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
@@ -12,12 +13,14 @@ import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.we
import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO; import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO;
import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortOut; import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortOut;
import app.module.admin.usecase.researcher.adpaters.persistence.ResearcherMapper; import app.module.admin.usecase.researcher.adpaters.persistence.ResearcherMapper;
import app.module.core.config.application.logging.SafeLogger;
import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.AuditUtil;
import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper; import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -25,14 +28,16 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Optional;
@Slf4j
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor
class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut { class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(ExcelUploadCreateHouseholdDao.class));
@Value("${spring.profiles.active}")
private String activeProfiles;
private final CreateHouseholdMapper createHouseholdMapper; private final CreateHouseholdMapper createHouseholdMapper;
private final CheckHouseholdNumMapper checkHouseholdNumMapper; private final CheckHouseholdNumMapper checkHouseholdNumMapper;
private final UICodeListMapper uiCodeListMapper; private final UICodeListMapper uiCodeListMapper;
@@ -46,12 +51,12 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
Workbook workbook = WorkbookFactory.create(file.getInputStream()); Workbook workbook = WorkbookFactory.create(file.getInputStream());
Sheet sheet = workbook.getSheetAt(0); Sheet sheet = workbook.getSheetAt(0);
Integer success = 0; int success = 0;
List<UICodeElement> RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main"); List<UICodeElement> RegionMainCodeList = uiCodeListMapper.findByParentId("code.region.main", AdminUtil.getLoginUserRole(), activeProfiles);
List<UICodeElement> RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub"); List<UICodeElement> RegionSubCodeList = uiCodeListMapper.findByParentId("code.region.sub", AdminUtil.getLoginUserRole(), activeProfiles);
List<UICodeElement> RegionDetailCodeList = uiCodeListMapper.findByLikeId("code.region.detail"); List<UICodeElement> RegionDetailCodeList = uiCodeListMapper.findByLikeId("code.region.detail");
List<UICodeElement> IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large"); List<UICodeElement> IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large", AdminUtil.getLoginUserRole(), activeProfiles);
List<UICodeElement> IndustryMiddleCodeList = uiCodeListMapper.findByLikeId("code.industry.middle"); List<UICodeElement> IndustryMiddleCodeList = uiCodeListMapper.findByLikeId("code.industry.middle");
List<String> errorList = new ArrayList<>(); List<String> errorList = new ArrayList<>();
@@ -122,7 +127,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
} }
} else { } else {
errorList.add(getCellValue(row.getCell(0))); errorList.add(getCellValue(row.getCell(0)));
log.warn("[ EXCEL 누락 ] 임가번호={} 핸드폰번호={}",getCellValue(row.getCell(0)),getCellValue(row.getCell(3))); safeLogger.warn("[ EXCEL 누락 ] 임가번호={} 핸드폰번호={}", getCellValue(row.getCell(0)),getCellValue(row.getCell(3)));
} }
} }
workbook.close(); workbook.close();
@@ -150,12 +155,21 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
private String getUiCode(Cell cell,List<UICodeElement> uiCodeElementList,String codeId){ private String getUiCode(Cell cell,List<UICodeElement> uiCodeElementList,String codeId){
if (cell == null) return ""; if (cell == null) return "";
try {
String cellValue = cell.getStringCellValue().trim();
String[] cellValueParts = cellValue.split("\\.");
return uiCodeElementList.stream().filter(code -> { return uiCodeElementList.stream().filter(code -> {
String[] cellValue = cell.getStringCellValue().trim().split("\\."); if(cellValueParts.length == 1 ) return code.getCodeText().equals(codeId+"."+cellValueParts[0]) || code.getCodeText().equals(cellValueParts[0]) ;
return code.getId().equals(codeId+"."+cellValue[0]) || code.getCodeText().equals(cellValue[1]) ; if(cellValueParts.length == 2 ) return code.getId().equals(codeId+"."+cellValueParts[0]) || code.getCodeText().equals(cellValueParts[1]) ;
return Boolean.parseBoolean(null);
} ) } )
.findFirst() .findFirst()
.map(UICodeElement::getId).orElse(""); .map(UICodeElement::getId).orElse("");
} catch (ArrayIndexOutOfBoundsException e) {
return null;
}
} }
private ExcelUploadContactVO getDivisionContact(Cell cell){ private ExcelUploadContactVO getDivisionContact(Cell cell){

Some files were not shown because too many files have changed in this diff Show More