diff --git a/README.md b/README.md index 27bddca8..ecf5bdfd 100644 --- a/README.md +++ b/README.md @@ -1,404 +1,328 @@ +# KOREA-RESEARCH μ‹œμŠ€ν…œ -# KOREA-RESEARCH +## πŸ“Œ ν”„λ‘œμ νŠΈ κ°œμš” + +**KOREA-RESEARCH**λŠ” μž„κ°€ νŒ¨λ„μ˜ 일계뢀 μˆ˜μ§‘ 및 관리λ₯Ό μœ„ν•œ μ‹œμŠ€ν…œμž…λ‹ˆλ‹€. +이 μ‹œμŠ€ν…œμ€ ν—₯사고날 μ•„ν‚€ν…μ²˜(Ports & Adapters) νŒ¨ν„΄μ„ μ μš©ν•œ Spring Boot 기반의 λ©€ν‹°λͺ¨λ“ˆ ν”„λ ˆμž„μ›Œν¬λ₯Ό 기반으둜 ν•˜μ—¬ μž‘μ„± λ˜μ—ˆμŠ΅λ‹ˆλ‹€. + +--- + +## βœ… Prerequisites + +- JDK 17+ +- Maven +- PostgreSQL + +--- + +## πŸ“‚ ν”„λ‘œμ νŠΈ ꡬ쑰 ``` -β”¬β”€β”β”Œβ”€β”β”Œβ”€β”β”¬ β”¬β”Œβ”€β”β”¬ β”Œβ”€β” -β”œβ”¬β”˜β”œβ”€ β”‚ β””β”¬β”˜β”‚ β”‚ β”œβ”€ -β”΄β””β”€β””β”€β”˜β””β”€β”˜ β”΄ β””β”€β”˜β”΄β”€β”˜β””β”€β”˜ - framework for spring developers exploring JPA +β”œβ”€β”€ admin # κ΄€λ¦¬μž μ–΄ν”Œλ¦¬μΌ€μ΄μ…˜ +β”œβ”€β”€ core # 곡톡 도메인 및 둜직 +β”œβ”€β”€ front # μ‚¬μš©μž μ–΄ν”Œλ¦¬μΌ€μ΄μ…˜ +└── pom.xml - _____\ _______ - / \ | /\ - /_______/ |_____/ \ - | \ / / / - \ \ \/ / - \ / \__/_ - \/ ____ /\ - / \ / \ - /\ \ / / - \ \/ / - \___\__/ - -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. ``` -## ν”„λ‘œμ νŠΈ κ°œμš” +> λͺ¨λ“  μ• ν”Œλ¦¬μΌ€μ΄μ…˜μ€ `core` λͺ¨λ“ˆμ„ μ€‘μ‹¬μœΌλ‘œ 포트, μ–΄λŒ‘ν„° ꡬ쑰둜 κ΅¬μ„±λ©λ‹ˆλ‹€. -λ³Έ ν”„λ‘œμ νŠΈλŠ” **ν—₯사고날 μ•„ν‚€ν…μ²˜(Ports & Adapters)** 기반의 Spring Boot λ©€ν‹°λͺ¨λ“ˆ μ‹œμŠ€ν…œμž…λ‹ˆλ‹€. -도메인 둜직과 μ™ΈλΆ€ μ‹œμŠ€ν…œ(μ›Ή, DB, 파일 λ“±)을 λͺ…ν™•νžˆ λΆ„λ¦¬ν•˜μ—¬ μœ μ§€λ³΄μˆ˜μ„±κ³Ό ν™•μž₯성을 κ·ΉλŒ€ν™”ν•˜μ˜€μŠ΅λ‹ˆλ‹€. - -## Prerequisites - -* JDK 17+ -* Maven -* PostgreSQL - -## Structure - -recycle 은 `core` λͺ¨λ“ˆμ„ 기반으둜 ν•œ `admin`, `front`, `api` μ–΄ν”Œλ¦¬μΌ€μ΄μ…˜μœΌλ‘œ κ΅¬μ„±λ˜μ–΄ μžˆλ‹€. - -```shell -. -|-- README.md -|-- admin # κ΄€λ¦¬μž μ–΄ν”Œλ¦¬μΌ€μ΄μ…˜ -| |-- pom.xml -| |-- src -| `-- target -|-- core # 곡톡 λͺ¨λ“ˆ -| |-- pom.xml -| |-- src -| `-- target -|-- front # ν”„λ‘ νŠΈ μ–΄ν”Œλ¦¬μΌ€μ΄μ…˜ -| |-- pom.xml -| |-- src -| `-- target -`-- pom.xml -`-- README.md -``` - -⚑ AWS S3 μ—…λ‘œλ“œλ₯Ό μ΄μš©ν•˜μ§€ μ•ŠλŠ”λ‹€λ©΄, pom.xml μ—μ„œ `aws`λͺ¨λ“ˆ κ΄€λ ¨ λ‚΄μš©μ„ μ‚­μ œν•˜λ©΄ λœλ‹€. -⚑ `admin`, `front`, `api` 쀑 μ‹€μ œ ν”„λ‘œμ νŠΈμ—μ„œ μ‚¬μš©ν•  λͺ¨λ“ˆλ§Œ 남기고 μ‚­μ œν•΄μ£Όμ„Έμš”. - -βœ”οΈ Dockerfile κ³Ό .gitlab-ci.yml 은 μ‚­μ œν•΄μ£Όμ„Έμš” : ) recycle demo μš©μ΄κΈ°μ— μ—¬λ €λΆ„μ˜ ν”„λ‘œμ νŠΈμ—μ„œλŠ” μ˜λ―Έκ°€ μ—†μŠ΅λ‹ˆλ‹€. - -recycle 의 demo κ°€ κΆκΈˆν•˜λ‹€λ©΄ μ•„λž˜ URL μ—μ„œ 확인 ν•΄μ£Όμ„Έμš”. -- `recycle-admin` - https://recycle-admin.etribe.co.kr 계정정보 (recycle-super/recycle1@#$) -- `recycle-api` - https://recycle-api.etribe.co.kr/swagger-ui/index.html -- `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 λ“±) μ—°κ²° μ–΄λŒ‘ν„° +└── daily/ +└── expense/ +β”œβ”€β”€ ports/ +β”‚ β”œβ”€β”€ application/ +β”‚ β”‚ └── DailyExpenseService.java +β”‚ β”œβ”€β”€ DailyExpensePortIn.java +β”‚ └── DailyExpensePortOut.java +└── adapters/ +β”œβ”€β”€ persistence/ +β”‚ └── DailyExpenseDao.java +└── web/ +└── DailyExpenseController.java +```` -## VM Options +--- -ν”„λ ˆμž„μ›Œν¬ μ‹€ν–‰ μ‹œ ν•„μš”ν•œ μžλ°” VM μ˜΅μ…˜μ€ μ•„λž˜μ™€ κ°™λ‹€. +## βš™οΈ VM Options -| VM λ³€μˆ˜ | μ„€λͺ… | μ„€μ • κ°’ | ν•„μˆ˜μ—¬λΆ€ | -|-----------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|-------------------------|------| -| -Dspring.profiles.active | Spring active ν”„λ‘œνŒŒμΌ | local, dev, prod | Y | -| -Dapp.initData.core | μ–΄ν”Œλ¦¬μΌ€μ΄μ…˜ 초기 ꡬ동에 ν•„μš”ν•œ ν•„μˆ˜ 데이터 생성여뢀 | true, false | N | -| -Dspring.sql.init.mode | SQL μ΄ˆκΈ°ν™” λͺ¨λ“œλ₯Ό μ„€μ • | always, embedded, never | N | -| -Dpath.upload.public | 파일 μ—…λ‘œλ“œ 경둜 | κΈ°λ³Έκ°’ (~/upload/public) | N | -| -Dpath.upload.tmpdir | μž„μ‹œ 파일 μ—…λ‘œλ“œ 경둜 | κΈ°λ³Έκ°’ (~/upload/tmpdir) | N | -| -Dlogging.file.path | 둜그 파일 생성 경둜 | κΈ°λ³Έκ°’ (~/logs) | N | -| -Dfile.encoding | JVM 속성 | `UTF-8` | Y | -| -Djava.net.preferIPv4Stack | JVM 속성. ν΄λΌμ΄μ–ΈνŠΈ IPμ²΄ν¬μ‹œ IPv4 ν˜•μ‹μ„ μ‚¬μš©ν•˜κΈ° μœ„ν•¨. | true | Y | -| -Dcom.amazonaws.sdk.disableEc2Metadata | aws λͺ¨λ“ˆμ˜ ec2 metadata 전솑 끄기 | true | N | -| **-Dserver.port** (2023-03-25 μΆ”κ°€) | μ„œλ²„ 포트 (μ—†λ‹€λ©΄ κΈ°λ³Έ 8080) | μ›ν•˜λŠ” port | N | -| **-Dserver.forward-headers-strategy** (2023-03-25 μΆ”κ°€) | ν”„λ‘μ‹œ μ„œλ²„(nginx, apache)에 μ •μ˜λœ `X-Forward-For`, `X-Forwarded-Proto` 섀정값을 μ΄μš©ν•˜λ €λ©΄ `native` 둜 μ„€μ •ν•΄μ£Όλ©΄ λœλ‹€. (λ‚΄μž₯ μ»¨ν…Œμ΄λ„ˆλ₯Ό μ‚¬μš©ν•˜λŠ” κ²½μš°μ—λ§Œ 유효) | `native` | N | -| **-Dspring.datasource.driver-class-name** (2023-03-25 μΆ”κ°€) | JDBC Driver. μ—†λ‹€λ©΄ JDBC URL을 κΈ°μ€€μœΌλ‘œ JPAκ°€ νŒλ‹¨ν•œλ‹€. | jdbc λ“œλΌμ΄λ²„ | Y | -| **-Dspring.datasource.url** (2023-03-25 μΆ”κ°€) | JDBC URL | jdbc url | N | -| **-Dspring.datasource.username** (2023-03-25 μΆ”κ°€) | DB Username | DB μ‚¬μš©μž | Y | -| **-Dspring.datasource.password** (2023-03-25 μΆ”κ°€) | DB Password | DB νŒ¨μŠ€μ›Œλ“œ | Y | - - -### VM Options μ˜ˆμ‹œ -#### `admin`, `front` λͺ¨λ‘ μ‚¬μš©κ°€λŠ₯ν•©λ‹ˆλ‹€. -``` --Dspring.profiles.active=local --Dapp.initData.core=false --Dspring.sql.init.mode=never +```bash +-Dspring.profiles.active=prod +-Dserver.port=8081 -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true --Dcom.amazonaws.sdk.disableEc2Metadata=true --Dserver.port=8080 --Dserver.forward-headers-strategy=native -Dlogging.level.org.springframework.security=DEBUG -Daes.secret-key=092HW829O0A0AVR0 -Dpath.upload.storage=LOCAL --Dpath.upload.sftp.public=/home/etribe/data/upload --Dfile.upload.sftp.ip=115.68.193.117 --Dfile.upload.sftp.id=etribe --Dfile.upload.sftp.password=Etribe@3415 --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μ˜΅μ…˜ μΆ”κ°€ --Dspring.profiles.active=prod --Dpath.upload.storage=SFTP +-Dpath.upload.public=/home/etribe/data/upload +-Dpath.upload.tmpdir=/home/etribe/data/upload/tmp -Djasypt.encryptor.password=ko-research -Djasypt.encryptor.algorithm=PBEWITHHMACSHA512ANDAES_256 +```` +## πŸ’» 둜컬 ꡬ동 μ‹œ ν•„μˆ˜ μ„€μ • -## JDBC 및 데이터 핸듀링 ꡬ성 μ˜΅μ…˜ +둜컬 ν™˜κ²½μ—μ„œ ꡬ동 μ‹œ μ•„λž˜ JVM μ˜΅μ…˜λ“€μ„ ν™˜κ²½μ— 맞게 μ„€μ •ν•΄ μ£Όμ„Έμš” -### app.initData.core - -```shell --Dapp.initData.core=true # true | false +```bash +-Dspring.profiles.active=local +-Dpath.upload.public=/home/etribe/data/upload +-Dpath.upload.tmpdir=/home/etribe/data/upload/tmp +-Djasypt.encryptor.password=ko-research +-Djasypt.encryptor.algorithm=PBEWITHHMACSHA512ANDAES_256 ``` -μ–΄ν”Œλ¦¬μΌ€μ΄μ…˜ 초기 ꡬ동에 ν•„μš”ν•œ ν•„μˆ˜ 데이터 생성여뢀. κ³΅ν†΅μ½”λ“œ, 메뉴 정보 및 κ°œλ°œμ— ν•„μš”ν•œ 기반 데이터 등이 여기에 ν•΄λ‹Ήν•œλ‹€. -InitAdminData, InitUriFrontData λ“± *ApplicationRunner* κ΅¬ν˜„μ²΄μ—μ„œ λ‚΄μš©μ„ 확인할 수 μžˆλ‹€. - -### spring.sql.init.mode - -```shell --Dspring.sql.init.mode=never # always | embedded | never -``` -μ–΄ν”Œλ¦¬μΌ€μ΄μ…˜ 초기 ꡬ동 μ‹œ, schema.sql, data.sql λ“± SQL μ΄ˆκΈ°ν™” 슀크립트 μ‹€ν–‰ μ—¬λΆ€λ₯Ό μ œμ–΄ν•˜λŠ” μ„€μ •. - -* always : μ• ν”Œλ¦¬μΌ€μ΄μ…˜ ꡬ동 μ‹œ 항상 SQL 슀크립트λ₯Ό μ‹€ν–‰ -* embedded : λ‚΄μž₯ DB(H2 λ“±)일 κ²½μš°μ—λ§Œ μ‹€ν–‰ -* never : SQL 슀크립트λ₯Ό μ‹€ν–‰ν•˜μ§€ μ•ŠμŒ - -## 데이터 호좜 및 응닡 처리 방식 κ°€μ΄λ“œ -> BO(Back Office)와 FO(Front Office) ν™”λ©΄μ—μ„œλŠ” κΈ°λŠ₯에 따라 **Ajax 호좜 방식**κ³Ό **μ„œλ²„ λ Œλ”λ§ 방식(Server-Side Rendering, SSR)을** κ΅¬λΆ„ν•˜μ—¬ μ‚¬μš©ν•©λ‹ˆλ‹€. - -### BO (Back Office: κ΄€λ¦¬μž ν™”λ©΄) -- #### πŸ“‘ Ajax 호좜 방식 (REST API, JSON 응닡) -λ‹€μŒ κΈ°λŠ₯은 Ajaxλ₯Ό 톡해 REST API(JSON)λ₯Ό ν˜ΈμΆœν•©λ‹ˆλ‹€ - -| κΈ°λŠ₯ | λ©”μ„œλ“œ | URI | μ˜ˆμ‹œ | -|----------|----------|------------------------------------|------------------------| -| λͺ©λ‘ 쑰회 | GET | `/api/{resource-name}/list` | `/api/articles/list` | -| 등둝 | POST | `/api/{resource-name}/create` | `/api/articles/create` | -| μˆ˜μ • | PUT/PATCH | `/api/{resource-name}/update` | `/api/articles/update` | -| μ‚­μ œ | DELETE | `/api/{resource-name}/remove` | `/api/articles/remove` | -| 등둝 & μˆ˜μ • |POST | `/api/{resource-name}/save` | `/api/articles/save` | - - -- #### πŸ–₯️ μ„œλ²„ λ Œλ”λ§ 방식 (SSR) -상세 쑰회(view) 화면은 SSR λ°©μ‹μœΌλ‘œ μ²˜λ¦¬ν•©λ‹ˆλ‹€. - -| κΈ°λŠ₯ | λ©”μ„œλ“œ | URI | μ˜ˆμ‹œ | -|------------|--------|------------------------|---------------| -| 상세 쑰회 | GET | `/{resource-name}/{id}` | `/articles/1` | +> πŸ’‘ `-Djasypt.encryptor.password`와 `-Djasypt.encryptor.algorithm`λŠ” ν™˜κ²½μ— 따라 **μˆ˜μ • κ°€λŠ₯**ν•©λ‹ˆλ‹€. --- -### FO (Front Office: μ‚¬μš©μž ν™”λ©΄) -- #### πŸ“‘ Ajax 호좜 방식 (REST API, JSON 응닡) -λ‹€μŒ κΈ°λŠ₯은 Ajax 기반 REST API 호좜둜 μ²˜λ¦¬ν•©λ‹ˆλ‹€. -| κΈ°λŠ₯ | λ©”μ„œλ“œ | URI | μ˜ˆμ‹œ | -|------|------------|-------------------------|--------------------------| -| 등둝 | POST | `/api/{resource-name}/create` | `/api/articles/create` | -| μˆ˜μ • | PUT/PATCH | `/api/{resource-name}/update` | `/api/articles/update` | -| μ‚­μ œ | DELETE | `/api/{resource-name}/remove` | `/api/articles/remove` | +## ⚠️ 둜컬 DB μ—°κ²° κ΄€λ ¨ μ•ˆλ‚΄ -- #### πŸ–₯️ μ„œλ²„ λ Œλ”λ§ 방식 (SSR) -λͺ©λ‘ 및 상세 화면은 SSR λ°©μ‹μœΌλ‘œ μ²˜λ¦¬ν•  수 있으며, 상황에 따라 μ„ νƒμ μœΌλ‘œ μ‚¬μš©ν•©λ‹ˆλ‹€. +ν˜„μž¬ 제곡된 DB 섀정은 **운영 μ„œλ²„μš© 정보**만 ν¬ν•¨λ˜μ–΄ μžˆμŠ΅λ‹ˆλ‹€. +둜컬 ν™˜κ²½μ—μ„œ κ΅¬λ™ν•˜κΈ° μœ„ν•΄μ„œλŠ” **둜컬 DB 섀정을 λ³„λ„λ‘œ ꡬ성해야 ν•©λ‹ˆλ‹€.** -| κΈ°λŠ₯ | λ©”μ„œλ“œ | URI | μ˜ˆμ‹œ | -|------------|--------|------------------------------|------------------------| -| λͺ©λ‘ 쑰회 | GET | `/{resource-name}/list` | `/articles/list` | -| 상세 쑰회 | GET | `/{resource-name}/{id}` | `/articles/1` | +* `application-local.yml`에 둜컬 DB 접속 정보λ₯Ό μž…λ ₯ν•΄μ•Ό ν•©λ‹ˆλ‹€. +* 운영 DB에 직접 μ ‘κ·Όν•˜μ—¬ κ°œλ°œν•˜μ§€ μ•Šλ„λ‘ μ£Όμ˜κ°€ ν•„μš”ν•©λ‹ˆλ‹€ +* `Jasypt`둜 μ•”ν˜Έν™”λœ DB 계정 정보가 μžˆλŠ” 경우, 둜컬 λΉ„λ°€λ²ˆν˜Έ λ³΅ν˜Έν™”λ₯Ό μœ„ν•œ `encryptor.password`κ°€ λ°˜λ“œμ‹œ ν•„μš”ν•©λ‹ˆλ‹€. -## LOG 생성 μ˜΅μ…˜ +--- +## πŸ” Jasypt μ•”ν˜Έν™” -### logging.file.path +* DB 컀λ„₯μ…˜ μ •λ³΄λŠ” Jasypt둜 μ•”ν˜Έν™”λ˜μ–΄ μ‚¬μš©λ©λ‹ˆλ‹€. +* `admin`, `front` λͺ¨λ“ˆ 각각에 `JasyptConfig.java` 섀정이 ν¬ν•¨λ˜μ–΄ μžˆμŠ΅λ‹ˆλ‹€. -```shell --Dlogging.file.path=~/logs # κΈ°λ³Έκ°’ ${user.home}/logs +```yaml +jasypt: + encryptor: + password: # 별도 관리 + algorithm: # 별도 관리 ``` -둜그 파일 생성 경둜λ₯Ό μ§€μ •ν•œλ‹€. μ§€μ •λœ κ²½λ‘œμ— μ•„λž˜μ™€ 같은 둜그 파일이 μƒμ„±λœλ‹€. +μ˜ˆμ‹œ: -```shell -admin-app.log # μ–΄λ“œλ―Ό 전체 둜그 -admin-app-ERROR.log # μ–΄λ“œλ―Ό 둜그 쀑 ERROR λΆ€λΆ„ 필터링 -front-app.log # ν”„λ‘ νŠΈ 전체 둜그 -front-app-ERROR.log # ν”„λ‘ νŠΈ 둜그 쀑 ERROR λΆ€λΆ„ 필터링 +```yaml +spring: + datasource: + kri: + jdbc-url: ENC(...) + username: ENC(...) + password: ENC(...) + mms: + jdbc-url: ENC(...) + username: ENC(...) + password: ENC(...) ``` -## File ꡬ성 μ˜΅μ…˜ +--- -### 파일 μ—…λ‘œλ“œ +## πŸ—ƒοΈ DB ꡬ성 -```shell --Dpath.upload.public=~/upload/public # 파일 μ—…λ‘œλ“œ 경둜 --Dpath.upload.tmpdir=~/upload/tmpdir # tmp 디렉토리 경둜 +| λͺ¨λ“ˆ | μ—°κ²° DB | +| ------- | ----------------------- | +| `admin` | kri DB, mms DB (문자 λ°œμ†‘μš©) | +| `front` | kri DB | + +--- + +## πŸ”„ 닀쀑 DB μ„€μ • (admin) + +* `admin` λͺ¨λ“ˆμ—λŠ” `MMSDBConfig.java`λ₯Ό ν†΅ν•œ **mms μ „μš© DataSource** 섀정이 μžˆμŠ΅λ‹ˆλ‹€. +* MyBatis λ§€νΌλŠ” 별도 μœ„μΉ˜λ‘œ κ΅¬λΆ„λ©λ‹ˆλ‹€. + +```yaml +mybatis: + mapper-locations: + kri: classpath*:mappers/**/*Mapper.xml + mms: classpath*:mappers/mms/*Mapper.xml + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl ``` -파일 μ—…λ‘œλ“œ κ²½λ‘œκ°€ μ§€μ •λ˜λ©΄ μ‚¬μš©μžκ°€ μ—…λ‘œλ“œν•œ νŒŒμΌμ€ 이 경둜λ₯Ό κΈ°μ€€μœΌλ‘œ `주제`/`년월일` 폴더 μ•„λž˜μ— μ €μž₯λ©λ‹ˆλ‹€. -tmpdir 은 μ„œλΈ”λ¦Ώ μ»¨ν…Œμ΄λ„ˆκ°€ multipart 파일 μ—…λ‘œλ“œ μ‹œ λŒ€μš©λŸ‰ 처리λ₯Ό μœ„ν•΄ μž„μ‹œνŒŒμΌμ„ μ €μž₯ν•˜λŠ” κ³΅κ°„μž…λ‹ˆλ‹€. +--- -파일 μ‹œμŠ€ν…œ 외에 AWS S3 λ‘œλ„ μ—…λ‘œλ“œν•΄μ•Ό ν•œλ‹€λ©΄, μ•„λž˜ AWS CLI λ₯Ό μ΄μš©ν•˜κΈ° μœ„ν•œ 정보λ₯Ό μ œκ³΅ν•΄μ£Όμ–΄μ•Ό ν•©λ‹ˆλ‹€. - -```shell --Dapp.aws.s3.accessKey=AKIAZF27HETWNITZBZOF # AMI μ—μ„œ λ°œκΈ‰ν•œ μ‚¬μš©μž μ—‘μ„ΈμŠ€ ν‚€ --Dapp.aws.s3.secretKey=IhnTG0X7Wav8ak3cbYR1l8UAjL+gbnXdWJRM11cx # AMI μ—μ„œ λ°œκΈ‰ν•œ μ‚¬μš©μž μ‹œν¬λ¦Ώ ν‚€ --Dapp.aws.s3.bucketName=etribe # S3 버킷 이름 --Dapp.aws.s3.bucketFolder=/recycle/upload # S3 버킷 디렉토리 --Dapp.aws.s3.domain=dixjkmptx5pkm.cloudfront.net # S3 ν˜Ήμ€ cloudfront 도메인 -``` - -πŸ”‘ μœ„ accessKey μ •λ³΄λŠ” μ œκ°€ λ§Œλ“  μž„μ‹œ 정보이며, recycle 데λͺ¨μš©μœΌλ‘œλ§Œ μ‚¬μš©λ˜λ‹ˆ μ°Έκ³ ν•΄μ£Όμ„Έμš”. - -πŸ’‘ recycle 은 파일 μ‹œμŠ€ν…œ μ—…λ‘œλ“œμ™€ S3 μ—…λ‘œλ“œλ₯Ό μ‚¬μš© λͺ©μ μ— 맞게 선택할 수 μžˆλŠ” μœ μ—°μ„±μ„ μ œκ³΅ν•©λ‹ˆλ‹€. -`FileUploadType`은 파일 μ—…λ‘œλ“œκ°€ ν•„μš”ν•œ 주제 도메인듀이 μ •μ˜λœ enum κ°μ²΄μž…λ‹ˆλ‹€. μ—¬κΈ° 기술된 `FileStorageType` 속성에 따라 파일 μ—…λ‘œλ“œ κ²½λ‘œκ°€ κ²°μ •λ©λ‹ˆλ‹€. - -### 파일 μ°Έμ‘° - -μ—…λ‘œλ“œλœ νŒŒμΌμ€ 참쑰될 수 μžˆμ–΄μ•Ό ν•©λ‹ˆλ‹€. `fileUrlPortIn`λŠ” 파일이 파일 μ‹œμŠ€ν…œμ— μžˆλ“  S3 에 μžˆλ“  μ •ν™•ν•œ μ°Έμ‘° URL 을 μ „λ‹¬ν•΄μ£ΌλŠ” μΈν„°νŽ˜μ΄μŠ€μž…λ‹ˆλ‹€. +## 🧩 MyBatis 닀쀑 DB μ„€μ • μ˜ˆμ‹œ (`MMSDBConfig.java`) ```java -// μ°Έμ‘° URL 전달 - inline 방식 -fileUrlPortIn.getInline( - uploadFile.getType().getFileStorageType(), - uploadFile.getPath(), - uploadFile.getName()); - -// μ°Έμ‘° URL 전달 - attachment 방식 - fileUrlPortIn.getAttachment( - uploadFile.getType().getFileStorageType(), - uploadFile.getId()); +@MapperScan( + basePackages = "app.module.mms.**.persistence", + sqlSessionFactoryRef = "mmsSqlSessionFactory") ``` -`inline` κ³Ό `attachment` λŠ” 응닡 ν—€λ”μ˜ content-disposition 속성 값을 μ˜λ―Έν•©λ‹ˆλ‹€. -μ—…λ‘œλ“œλœ νŒŒμΌμ€ μ‚¬μš©μžμ—κ²Œ 전달할 λ•Œ `inline` κ³Ό `attachment` 두 방식 쀑 μš”κ±΄μ— 맞게 μ‚¬μš©ν•˜λ©΄ λ©λ‹ˆλ‹€. -## 곡톡 ν•„λ“œ(Audit) μžλ™ μ£Όμž… 방법 (AOP기반) -createdAt, createdBy, updatedAt, updatedBy, deletedAt, deletedBy, isDeleted 와 같은 곡톡 이λ ₯ ν•„λ“œλŠ” -맀번 μˆ˜λ™μœΌλ‘œ μ„€μ •ν•˜μ§€ μ•Šμ•„λ„ λ˜λ„λ‘, AOPλ₯Ό ν™œμš©ν•΄ μžλ™μœΌλ‘œ μ£Όμž…λ˜λ„λ‘ κ΅¬μ„±ν–ˆμŠ΅λ‹ˆλ‹€. +## πŸ”§ 일계뢀 등둝 κ°€λŠ₯ λ‚ μ§œ -### 1. κΈ°λ³Έ ꡬ쑰 -create, update, delete μ‹œ Command 객체에 AuditCommandλ₯Ό μƒμ†ν•©λ‹ˆλ‹€. -#### AuditCommand μ‚¬μš© μ˜ˆμ‹œ -``` java -// ν•„μˆ˜: AuditCommand 상속 -public class UpdateCmd extends AuditCommand { - private Long seq; - ... -} -``` -AuditCommandλŠ” μ•„λž˜ λ©”μ„œλ“œλ₯Ό μ œκ³΅ν•˜λ©°, 각각 생성/μˆ˜μ •/μ‚­μ œ μž‘μ—…μ— ν•„μš”ν•œ ν•„λ“œλ₯Ό μžλ™μœΌλ‘œ μ„€μ •ν•©λ‹ˆλ‹€. -``` java -public class AuditCommand { - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; - - public void create() { ... } - public void update() { ... } - public void delete() { ... } -} +`DailyRecordConstants.java`λŠ” **일계뢀 등둝 및 μˆ˜μ • κ°€λŠ₯ μ‹œμ μ— λŒ€ν•œ μ •μ±… μƒμˆ˜**λ₯Ό μ •μ˜ν•˜κ³  μžˆμŠ΅λ‹ˆλ‹€. +--- + +### βœ… μ •μ±… μ •μ˜ + +| ν•­λͺ© | μ •μ±… μ„€λͺ… | μƒμˆ˜λͺ… | κ°’ | +| ------- | ------------------------ | ---------------------- |------------------------| +| 등둝 κ°€λŠ₯ μ›” | ν•΄λ‹Ή μ›” κΈ°μ€€, **이전 μ›”λ§Œ 등둝 κ°€λŠ₯** | `REGISTER_LIMIT_MONTH` | `1` β†’ *μž„μ‹œλ‘œ `4` μ„€μ • 쀑* | +| 등둝 κ°€λŠ₯ 일 | ν•΄λ‹Ή μ›” **15μΌκΉŒμ§€λ§Œ 등둝 κ°€λŠ₯** | `REGISTER_LIMIT_DAY` | `15` β†’ *μž„μ‹œλ‘œ `31` μ„€μ • 쀑* | +| μˆ˜μ • κ°€λŠ₯ μ›” | ν•΄λ‹Ή μ›” κΈ°μ€€, **이전 μ›”λ§Œ μˆ˜μ • κ°€λŠ₯** | `MODIFY_LIMIT_MONTH` | `1` β†’ *μž„μ‹œλ‘œ `4` μ„€μ • 쀑* | +| μˆ˜μ • κ°€λŠ₯ 일 | ν•΄λ‹Ή μ›” **15μΌκΉŒμ§€λ§Œ μˆ˜μ • κ°€λŠ₯** | `MODIFY_LIMIT_DAY` | `15` β†’ *μž„μ‹œλ‘œ `31` μ„€μ • 쀑* | + +--- + +### ⚠️ ν˜„μž¬ μž„μ‹œ μ„€μ • 사항 + +ν˜„μž¬ μ‹œμŠ€ν…œμ—μ„œλŠ” **등둝 κ°€λŠ₯ μ›”(`REGISTER_LIMIT_MONTH`)** 및 **μˆ˜μ • κ°€λŠ₯ μ›”(`MODIFY_LIMIT_MONTH`)** 값을 **μž„μ‹œλ‘œ `4달` **등둝 κ°€λŠ₯ 일(`REGISTER_LIMIT_DAY`)** 및 **μˆ˜μ • κ°€λŠ₯ 일(`MODIFY_LIMIT_DAY`)** 값을 **μž„μ‹œλ‘œ `31일`둜 μ„€μ •**ν•΄ λ‘μ—ˆμœΌλ©°, +**정책상 μ›λž˜λŠ” `15일`둜 μ œν•œ**λ˜μ–΄μ•Ό ν•©λ‹ˆλ‹€. + +> πŸ“Œ ν–₯ν›„ 운영 정책에 따라 **`이전월` **`15일`둜 볡원 μ˜ˆμ •**으둜 ν•΄λ‹Ήκ°’μœΌλ‘œ μˆ˜μ •ν•œ war파일 제곡 + +--- +## πŸ“€ 파일 μ—…λ‘œλ“œ + +```bash +-Dpath.upload.public=/home/etribe/data/upload ``` -### 2. AOP 기반 μ–΄λ…Έν…Œμ΄μ…˜ μžλ™ μ£Όμž… -service λ˜λŠ” dao 내에 -@CreateCommand, @UpdateCommand, @DeleteCommand μ–΄λ…Έν…Œμ΄μ…˜μ„ 톡해 -AOPκ°€ μžλ™μœΌλ‘œ ν•΄λ‹Ή λ©”μ„œλ“œμ˜ νŒŒλΌλ―Έν„°(AuditCommand 상속 객체)에 곡톡 ν•„λ“œλ₯Ό μ£Όμž…ν•©λ‹ˆλ‹€. +파일 μ €μž₯ κ΅¬μ‘°λŠ” `주제/년월일/파일λͺ…`이며, `FileUploadType` Enum에 따라 κ²½λ‘œκ°€ κ²°μ •λ©λ‹ˆλ‹€. -| μ–΄λ…Έν…Œμ΄μ…˜ | μžλ™ μ„€μ •λ˜λŠ” ν•„λ“œ | -| ---------------- | -------------------------------------------------- | -| `@CreateCommand` | `createdAt`, `createdBy`, `updatedAt`, `updatedBy` | -| `@UpdateCommand` | `updatedAt`, `updatedBy` | -| `@DeleteCommand` | `updatedAt`, `updatedBy`, `deletedAt`, `deletedBy` | +```java +fileUrlPortIn.getInline(type, path, name); +fileUrlPortIn.getAttachment(type, id); +``` -#### μ–΄λ…Έν…Œμ΄μ…˜ μ‚¬μš© μ˜ˆμ‹œ +--- + +## 🧾 Audit 곡톡 ν•„λ“œ μžλ™ μ£Όμž… + +* AOP 기반 μžλ™ μ£Όμž… λ°©μ‹μœΌλ‘œ 생성/μˆ˜μ •/μ‚­μ œ μ‹œ ν•„λ“œ λ°˜λ³΅μ„ μ΅œμ†Œν™”ν•©λ‹ˆλ‹€. +* 곡톡 ν•„λ“œ: `createdAt`, `createdBy`, `updatedAt`, `updatedBy`, `deletedAt`, `deletedBy`, `isDeleted` + + +| μ–΄λ…Έν…Œμ΄μ…˜ | μ£Όμž… ν•„λ“œ | +| ---------------- | ------------------------------------------ | +| `@CreateCommand` | createdAt, createdBy, updatedAt, updatedBy | +| `@UpdateCommand` | updatedAt, updatedBy | +| `@DeleteCommand` | deletedAt, deletedBy | + +### βœ… κΈ°λ³Έ μ‚¬μš©λ²• +λͺ¨λ“  CommandλŠ” AuditCommandλ₯Ό μƒμ†ν•˜κ³ , Service/DAO λ©”μ„œλ“œμ— μ–΄λ…Έν…Œμ΄μ…˜λ§Œ 뢙이면 μžλ™μœΌλ‘œ ν•„λ“œμ— 값이 μ£Όμž…λ©λ‹ˆλ‹€. ```java @UpdateCommand -public void operate(UpdateCmd cmd) { - mapper.update(cmd); +public void update(UpdateCmd cmd) { + mapper.update(cmd); // updatedAt, updatedBy μžλ™ μ£Όμž… } ``` -### 3. AOP μ™Έ μˆ˜λ™ 적용이 ν•„μš”ν•œ 경우: AuditUtil μ‚¬μš© -AOP 외에도, ν•˜λ‚˜μ˜ DAO λ©”μ„œλ“œ λ‚΄μ—μ„œ μ—¬λŸ¬ Insert/Delete μ²˜λ¦¬κ°€ ν•„μš”ν•œ κ²½μš°μ—λŠ” μ•„λž˜μ²˜λŸΌ 직접 AuditUtil을 μ‚¬μš©ν•  수 μžˆμŠ΅λ‹ˆλ‹€. -#### AuditUtil μ‚¬μš© μ˜ˆμ‹œ +```java +public class UpdateCmd extends AuditCommand { + private Long seq; +} +``` + +### βœ… 볡합적인 CRUD 처리 μ‹œ +ν•˜λ‚˜μ˜ 둜직 μ•ˆμ—μ„œ insert, update, delete λ“± μ—¬λŸ¬ DB μž‘μ—…μ΄ ν•¨κ»˜ μ²˜λ¦¬λ˜λŠ” 경우, `AuditUtil`의 μœ ν‹Έ λ©”μ„œλ“œλ₯Ό μ‚¬μš©ν•©λ‹ˆλ‹€. ```java // κ΄€λ¦¬μž 등둝 mapper.insertAdmin(AuditUtil.create(cmd)); -// κ΄€λ¦¬μžμ˜ μ—­ν•  λ§€ν•‘ +// κ΄€λ¦¬μž μ—­ν•  λ§€ν•‘ (닀건) mapper.insertAdminHasRoles( AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds())) ); ``` +--- -### 4. XMLμ—μ„œ 곡톡 ν•„λ“œ include둜 μž¬μ‚¬μš© -SQL μž‘μ„± μ‹œ κ³΅ν†΅ν•„λ“œμ˜ 반볡 μž‘μ„±μ„ ν”Όν•˜κΈ° μœ„ν•΄ `` νƒœκ·Έλ‘œ λΆ„λ¦¬ν•˜μ—¬ `` λ°©μ‹μœΌλ‘œ μž¬μ‚¬μš©ν•©λ‹ˆλ‹€. -μžμ„Έν•œ μ •μ˜λŠ” `CommonFieldsMapper.xml` νŒŒμΌμ—μ„œ 확인할 수 μžˆμŠ΅λ‹ˆλ‹€. +## πŸ” XML 곡톡 ν•„λ“œ include -| SQL ID | μ„€λͺ… | μ‚¬μš© μ˜ˆμ‹œ | -| ---------------------------- | -------------------------------------- | -------------------------------------------------------------- | -| `CreateUpdateBaseColumns` | `INSERT` μ‹œ 곡톡 컬럼 μ •μ˜ | `` | -| `CreateUpdateBaseValues` | `INSERT` μ‹œ 곡톡 컬럼의 κ°’ μ •μ˜ | `` | -| `CreateUpdateListBaseValues` | `닀건 INSERT` μ‹œ 곡톡 κ°’ μ •μ˜ (e.g. `foreach`) | `` | -| `UpdateBaseSet` | `UPDATE` μ‹œ 곡톡 `SET` ꡬ문 | `` | -| `DeleteBaseSet` | `μ‚­μ œ 처리용 UPDATE` μ‹œ 곡톡 `SET` ꡬ문 | `` | - -#### include μ‚¬μš© μ˜ˆμ‹œ ```xml -UPDATE household -SET - owner_name = #{ownerName}, - owner_age = #{ownerAge}, - tel = #{tel}, - phone = #{phone}, - region = #{region}, - city = #{city}, - address_detail = #{addressDetail}, - -WHERE seq = ${seq} + ``` +곡톡 SQL은 `CommonFieldsMapper.xml` 에 μ •μ˜λ˜μ–΄ μžˆμŠ΅λ‹ˆλ‹€. -## PACKAGING +--- -배포방식 섀정을 μœ„ν•΄ 두가지 maven ν”„λ‘œνŒŒμΌμ„ μ œκ³΅ν•œλ‹€. +## πŸ“¦ νŒ¨ν‚€μ§• (WAR) -* `jar` (default) -* `war` Jeus, WebLogic, Tomcat λ“± 별도 μ™Έμž₯ μ»¨ν…Œμ΄λ„ˆ μ΄μš©μ‹œ μ‚¬μš© - -maven λΉŒλ“œ μ‹œ ν”„λ‘œνŒŒμΌμ„ μ§€μ •ν•˜μ§€ μ•ŠμœΌλ©΄ κΈ°λ³Έ `jar` ν”„λ‘œνŒŒμΌλ‘œ λ™μž‘ν•˜κ³ , `war` 의 경우 λͺ…μ‹œμ μΈ 지정이 ν•„μš”ν•˜λ‹€. - -μ•„λž˜λŠ” admin λΉŒλ“œμ‹œ `war` ν”„λ‘œνŒŒμΌμ„ μ§€μ •ν•œ μ˜ˆμ‹œμ΄λ‹€. - -```shell -$ mvn --projects admin --also-make clean package -DskipTests -P war - -# λΉŒλ“œ ν›„, admin/target 디렉토리에 war κ°€ μƒμ„±λœκ±Έ 확인할 수 μžˆλ‹€. -$ ll admin/target --rw-r--r-- 1 user 197121 94905770 4μ›” 22 09:59 admin-0.0.1-SNAPSHOT.war +```bash +$ mvn clean package -P war ``` -## 개발 μ„œλ²„ ν™˜κ²½ +--- -### database - postgresql 14.17 +## πŸ”Œ API 호좜 방식 -``` -URL: jdbc:postgresql://15.165.180.203:5432/korea_research -USERNAME: ko_research -PASSWORD: koresearch1@#4 +### BO (κ΄€λ¦¬μž) + +| κΈ°λŠ₯ | 방식 | URI μ˜ˆμ‹œ | +| ------- | ---- | -------------------------------------- | +| λͺ©λ‘/등둝 λ“± | Ajax | `/api/household/daily/list`, `/save` λ“± | +| 상세 쑰회 | SSR | `/household/{id}` | + +### FO (μ‚¬μš©μž) + +| κΈ°λŠ₯ | 방식 | URI μ˜ˆμ‹œ | +| -------- | ---- | -------------------------------------------------------- | +| 등둝/μˆ˜μ •/μ‚­μ œ | Ajax | `/api/record/income/{searchMonth}/{groupNo}/form/{id}` λ“± | +| λͺ©λ‘/상세 쑰회 | SSR | `/record/income/{searchMonth}/{groupNo}`, `/form/{id}` λ“± | + +--- + +## πŸ“‹ 둜그 μ„€μ • + +```bash +-Dlogging.file.path=~/logs ``` -### πŸš€ ADMIN DEPLOY +| 파일 이름 | μ„€λͺ… | +| --------------------- | ------------ | +| `admin-app.log` | κ΄€λ¦¬μž 전체 둜그 | +| `admin-app-ERROR.log` | κ΄€λ¦¬μž μ—λŸ¬ μ „μš© 둜그 | +| `front-app.log` | ν”„λ‘ νŠΈ 전체 둜그 | +| `front-app-ERROR.log` | ν”„λ‘ νŠΈ μ—λŸ¬ μ „μš© 둜그 | -#### `deploy_dev_admin` 브렌치둜 merge! pipeline μ‹€ν–‰ ν›„ μ•„λž˜ URL μ—μ„œ 확인가λŠ₯. -* https://ko-research-admin.etribe.co.kr +--- -### πŸš€ FRONT DEPLOY +## ⏱️ 배치 μŠ€μΌ€μ€„λŸ¬ + +`AutoSchedulesController.java`에 μ •μ˜λ˜μ–΄ 있으며, 총 3개의 λ°°μΉ˜κ°€ μ‘΄μž¬ν•©λ‹ˆλ‹€. + +| 배치λͺ… | μ‹€ν–‰ μ£ΌκΈ° | μ„€λͺ… | +| ----------- | ------------ | -------------------------- | +| 월별 μž…λ ₯ μƒνƒœ 등둝 | λ§€μ›” 1일 0μ‹œ 0초 | 월별 μž…λ ₯ μƒνƒœλ₯Ό μ΄ˆκΈ°ν™” 등둝함 | +| 문자 μžλ™ λ°œμ†‘ | 맀일 17μ‹œ 0λΆ„ | mms DBλ‘œλΆ€ν„° μˆ˜μ‹  λŒ€μƒ μΆ”μΆœ ν›„ 문자 λ°œμ†‘ | +| μ›”μ΄ˆ μ΄μ›”κΈˆ 등둝 | λ§€μ›” 16일 0μ‹œ 0초 | 이전 달 데이터λ₯Ό κΈ°μ€€μœΌλ‘œ μ΄μ›”κΈˆ 등둝 | + +--- + +## πŸ‘€μš΄μ˜μ„œλ²„ ν…ŒμŠ€νŠΈ 계정 + 계정 ID | λΉ„λ°€λ²ˆν˜Έ | κΆŒν•œ | +| ------------ | ------- | ------- | +| `koadmin` | `0701!` | κ΄€λ¦¬μž κΆŒν•œ | +| `kolocal` | `0701@` | 지방싀사 κΆŒν•œ | +| `kosearcher` | `0701#` | 쑰사원 κΆŒν•œ | + +--- + +## 🧾 μš΄μ˜μ„œλ²„ μž„κ°€ 계정 λͺ©λ‘ + +| μž„κ°€λ²ˆν˜Έ | λΉ„λ°€λ²ˆν˜Έ | +|---------| ------ | +| `22221` | `1111` | +| `22222` | `1111` | +| `22223` | `1111` | +| `22224` | `1111` | +| `22225` | `1111` | +| `22226` | `1111` | + +--- + +## ❗ 싀사지역 μ„€μ • μ£Όμ˜μ‚¬ν•­ + +ν…ŒμŠ€νŠΈ 계정듀은 **싀사지역이 `ν…ŒμŠ€νŠΈ`둜 μ§€μ •**λ˜μ–΄ μžˆμŠ΅λ‹ˆλ‹€. + +> 이둜 인해 ν•΄λ‹Ή κ³„μ •μœΌλ‘œ μˆ˜μ§‘λœ λ°μ΄ν„°λŠ” **톡계에 λ°˜μ˜λ˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€.** + +**주의:**⚠️ 톡계에 ν¬ν•¨λ˜λ„λ‘ ν•˜λ €λ©΄ **μ‹€μ œ 싀사지역**으둜 맀핑이 ν•„μš”ν•©λ‹ˆλ‹€. + +--- -#### `deploy_dev_front` 브렌치둜 merge! pipeline μ‹€ν–‰ ν›„ μ•„λž˜ URL μ—μ„œ 확인가λŠ₯. -* https://ko-research-front.etribe.co.kr \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java index e74dab9a..955a2041 100644 --- a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java +++ b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java @@ -81,8 +81,6 @@ public class AdminURIInterceptor implements HandlerInterceptor { return; } - // ν™œμ„± ν”„λ‘œνŒŒμΌ κ°€μ Έμ˜€κΈ° TODO 2μ°¨ μ˜€ν”ˆμ‹œ μ‚­μ œ μ˜ˆμ • - modelAndView.addObject("activeProfile", activeProfiles); String roleId = AdminUtil.getLoginUserRole(); if (!CommonUtil.isAjaxRequest(request)) { diff --git a/admin/src/main/java/app/module/admin/config/application/aop/LoginFailAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/LoginFailAspect.java index 202aa9bc..74302d3f 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/LoginFailAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/LoginFailAspect.java @@ -1,11 +1,6 @@ package app.module.admin.config.application.aop; -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.enums.OperationLogType; -import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.MessageUtil; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.aspectj.lang.JoinPoint; @@ -18,21 +13,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class LoginFailAspect { - private final OperationLogSavePortIn operationLogSavePortIn; private final MessageUtil messageUtil; @After("@annotation(app.module.admin.config.application.aop.LoginFailOperateLog)") public void operate(JoinPoint joinPoint) throws Throwable { Object[] args = joinPoint.getArgs(); HttpServletRequest request = (HttpServletRequest) args[0]; - String targetId = request.getParameter("username"); - operationLogSavePortIn.connect( - new OperationLogSaveCommand( - AppType.ADMIN, - OperationLogType.LOGIN_FAIL, - targetId, - CommonUtil.getClientIP(request), - messageUtil.getMessage("operate.login.fail", targetId))); } } diff --git a/admin/src/main/java/app/module/admin/config/application/aop/LoginSuccessAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/LoginSuccessAspect.java index fca4668c..6d7d251b 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/LoginSuccessAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/LoginSuccessAspect.java @@ -4,8 +4,6 @@ import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.OperationLogType; import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.MessageUtil; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -20,8 +18,6 @@ import org.springframework.stereotype.Component; @Slf4j @RequiredArgsConstructor public class LoginSuccessAspect { - - private final OperationLogSavePortIn operationLogSavePortIn; private final MessageUtil messageUtil; @After("@annotation(app.module.admin.config.application.aop.LoginSuccessOperateLog)") @@ -31,12 +27,5 @@ public class LoginSuccessAspect { HttpServletRequest request = (HttpServletRequest) args[0]; Authentication authentication = (Authentication) args[2]; - operationLogSavePortIn.connect( - new OperationLogSaveCommand( - AppType.ADMIN, - OperationLogType.LOGIN_SUCCESS, - null, - CommonUtil.getClientIP(request), - messageUtil.getMessage("operate.login.success", authentication.getName()))); } } diff --git a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java index f54a3dfa..22b770de 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java @@ -5,8 +5,6 @@ import app.module.core.config.application.enums.OperationLogType; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.aspectj.lang.ProceedingJoinPoint; @@ -27,7 +25,6 @@ import java.util.Optional; public class RoleUpdateAspect { private final AdminViewPortIn adminViewPortIn; - private final OperationLogSavePortIn operationLogSavePortIn; @Around( "execution(* app.module.core.usecase.admin.saveAdmin.ports.application.SaveAdminService.connect(..))") @@ -54,34 +51,7 @@ public class RoleUpdateAspect { // .map(adminUserWithRole -> adminUserWithRole.getRole().getId()) // .collect(Collectors.toList()); - boolean createLog = false; - if (beforeAdmin.isPresent()) { - List beforeRoles = - beforeAdmin.stream().map(r -> r.getRole().getId()).toList(); - if (beforeRoles.size() != currentRoles.size() - || currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) { - createLog = true; - } - } else if (!currentRoles.isEmpty()) { - createLog = true; - } - - if (createLog) { - String operatorId = Optional.ofNullable(CommonUtil.getLoginUsername()) - .orElse("init data"); - HttpServletRequest request = CommonUtil.getRequest(); - - operationLogSavePortIn.connect( - new OperationLogSaveCommand( - AppType.ADMIN, - OperationLogType.ROLE_UPDATE, - adminId, - request != null ? CommonUtil.getClientIP(request) : null, - String.format( - "`%s` grants [%s] permissions to `%s`", - operatorId, StringUtils.join(currentRoles, ", "), adminId))); - } return joinPoint.proceed(); } diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java index 7e892c83..09a87d5c 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java @@ -7,8 +7,6 @@ import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.status.ports.AdminUpdateAccountLockPortIn; import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,7 +29,6 @@ public class AdminAuthFailEvent { private final AdminViewPortIn adminViewPortIn; private final AdminUpdateLoginFailPortIn updateLoginFailPortIn; private final AdminUpdateAccountLockPortIn updateAccountLockPortIn; - private final OperationLogSavePortIn operationLogSavePortIn; private final MessageUtil messageUtil; @Value("${app.admin.auth.fail.permit}") private int failPermit; @@ -61,15 +58,6 @@ public class AdminAuthFailEvent { request.getSession(), messageUtil.getMessage("security.auth.fail.exceed", failPermit)); - // 계정 잠금 둜그 기둝 - operationLogSavePortIn.connect( - new OperationLogSaveCommand( - AppType.ADMIN, - OperationLogType.ACCOUNT_LOCKED, - adminUserViewInfo.getId(), - CommonUtil.getClientIP(request), - messageUtil.getMessage( - "operate.account.locked", adminUserViewInfo.getId()))); } }); } diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java index a8101264..03d90e4c 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain; import app.module.core.config.application.enums.FileUploadType; +import app.module.core.usecase.file.model.UploadFile; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,7 +10,7 @@ import java.io.Serializable; import java.time.LocalDateTime; /** - * DTO for {@link app.module.core.config.adapters.persistence.entity.UploadFile} + * DTO for {@link UploadFile} */ @Data @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java index 163eea2e..6e7e161d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/validator/CreateHouseholdValidator.java @@ -48,16 +48,6 @@ public class CreateHouseholdValidator implements Validator { return; } - // 4. 가ꡬ μ—°λ½μ²˜ - // TODO : ν•„μˆ˜μž…λ ₯κ°’ λ§žλŠ”μ§€ 체크 -// if (!StringUtils.hasText(vo.getTel1()) || !StringUtils.hasText(vo.getTel2()) || !StringUtils.hasText(vo.getTel3())) { -// errors.reject("tel", "가ꡬ μ—°λ½μ²˜λ₯Ό λͺ¨λ‘ μž…λ ₯ν•΄μ£Όμ„Έμš”."); -// return; -// } -// if (vo.getTel2().length() > 4 || vo.getTel3().length() > 4) { -// errors.reject("tel", "가ꡬ μ—°λ½μ²˜λŠ” 각 4μžλ¦¬κΉŒμ§€ μž…λ ₯ κ°€λŠ₯ν•©λ‹ˆλ‹€."); -// return; -// } if (StringUtils.hasText(vo.getTel2()) || StringUtils.hasText(vo.getTel3())) { if ((vo.getTel2() != null && vo.getTel2().length() > 4) || (vo.getTel3() != null && vo.getTel3().length() > 4)) { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java index ce3873dd..41adfee1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java @@ -27,10 +27,5 @@ public class GetHouseholdsStatus { private Boolean isGiftSent; private String researcherName; private String researcherPhone; - private Integer ownerAge; - private String address; - private String industrySubMiddle; - private String industryDetail; - private String usageType; private Integer total; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/validator/SaveBankAutoTransferExpenseValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/validator/SaveBankAutoTransferExpenseValidator.java index 23b7c2c8..0180d984 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/validator/SaveBankAutoTransferExpenseValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/validator/SaveBankAutoTransferExpenseValidator.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.validator; import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model.SaveBankAutoTransferExpenseReqVO; +import app.module.core.config.constants.CommonConstants; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; @@ -33,6 +34,13 @@ public class SaveBankAutoTransferExpenseValidator implements Validator { return; } + // μˆ˜λŸ‰ 0 이상 μž…λ ₯ + if (StringUtils.hasText(vo.getCount()) && Integer.parseInt(vo.getCount()) <= 0) { + errors.rejectValue( + "count", CommonConstants.VALID_CODE_INVALID_ZERO, + "μˆ˜λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + // μˆ˜λŸ‰ μž…λ ₯ O, λ‹¨μœ„ 선택 X if (StringUtils.hasText(vo.getCount()) && !StringUtils.hasText(vo.getUnitCode())) { errors.rejectValue("unitCode", "error.unitCode", @@ -59,5 +67,11 @@ public class SaveBankAutoTransferExpenseValidator implements Validator { errors.rejectValue("price", "error.price", "ν˜„κΈˆ(원)을 μž…λ ₯ν•΄μ£Όμ„Έμš”."); } + + if (vo.getPrice() != null && vo.getPrice() <= 0) { + errors.rejectValue( + "price", CommonConstants.VALID_CODE_INVALID_ZERO, + "ν˜„κΈˆ(원)은 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java index ed09ab19..f603d52a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.validator; import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model.SaveBankAutoTransferIncomeReqVO; +import app.module.core.config.constants.CommonConstants; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; @@ -42,6 +43,13 @@ public class SaveBankAutoTransferIncomeValidator implements Validator { "μˆ˜μž…μ˜ μ’…λ₯˜λ₯Ό μž…λ ₯ν•΄μ£Όμ„Έμš”."); } + // μˆ˜λŸ‰ 0 이상 μž…λ ₯ + if (StringUtils.hasText(vo.getCount()) && Integer.parseInt(vo.getCount()) <= 0) { + errors.rejectValue( + "count", CommonConstants.VALID_CODE_INVALID_ZERO, + "μˆ˜λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + // μˆ˜λŸ‰ μž…λ ₯ O, λ‹¨μœ„ 선택 X if (StringUtils.hasText(vo.getCount()) && !StringUtils.hasText(vo.getUnitCode())) { errors.rejectValue("unitCode", "error.unitCode", @@ -68,5 +76,11 @@ public class SaveBankAutoTransferIncomeValidator implements Validator { errors.rejectValue("price", "error.price", "ν˜„κΈˆ(원)을 μž…λ ₯ν•΄μ£Όμ„Έμš”."); } + + if (vo.getPrice() != null && vo.getPrice() <= 0) { + errors.rejectValue( + "price", CommonConstants.VALID_CODE_INVALID_ZERO, + "ν˜„κΈˆ(원)은 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java index 107e0b35..a87c974d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java @@ -27,6 +27,12 @@ public class SaveDailyExpenseValidator implements Validator { "μˆ˜λŸ‰μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + if (vo.getQuantity() != null && vo.getQuantity() <= 0) { + errors.rejectValue( + "quantity", CommonConstants.VALID_CODE_INVALID_ZERO, + "μˆ˜λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { errors.rejectValue( "unitCode", CommonConstants.VALID_CODE_NOTBLANK, @@ -47,5 +53,15 @@ public class SaveDailyExpenseValidator implements Validator { "estimatedValue", CommonConstants.VALID_CODE_NOTBLANK, "ν˜„κΈˆ λ˜λŠ” ν˜„λ¬Όν‰κ°€μ•‘μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + + if ((vo.getPrice() != null && vo.getPrice() <= 0) + || (vo.getEstimatedValue() != null && vo.getEstimatedValue() <= 0)) { + errors.rejectValue( + "price", CommonConstants.VALID_CODE_INVALID_ZERO, + "ν˜„κΈˆ λ˜λŠ” ν˜„λ¬Όν‰κ°€μ•‘μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + errors.rejectValue( + "estimatedValue", CommonConstants.VALID_CODE_INVALID_ZERO, + "ν˜„κΈˆ λ˜λŠ” ν˜„λ¬Όν‰κ°€μ•‘μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java index ab4d7494..9b616511 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java @@ -32,6 +32,12 @@ public class SaveDailyFarmingValidator implements Validator { "μˆ˜λŸ‰μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + if (vo.getQuantity() != null && vo.getQuantity() <= 0) { + errors.rejectValue( + "quantity", CommonConstants.VALID_CODE_INVALID_ZERO, + "μˆ˜λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { errors.rejectValue( "unitCode", CommonConstants.VALID_CODE_NOTBLANK, @@ -49,5 +55,11 @@ public class SaveDailyFarmingValidator implements Validator { "estimatedValue", CommonConstants.VALID_CODE_NOTBLANK, "ν˜„λ¬Όν‰κ°€μ•‘μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + + if (vo.getEstimatedValue() != null && vo.getEstimatedValue() <= 0) { + errors.rejectValue( + "estimatedValue", CommonConstants.VALID_CODE_INVALID_ZERO, + "ν˜„λ¬Όν‰κ°€μ•‘μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java index fee8a8a7..281189bb 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java @@ -26,6 +26,12 @@ public class SaveDailyForestryValidator implements Validator { "μˆ˜λŸ‰μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + if (vo.getQuantity() != null && vo.getQuantity() <= 0) { + errors.rejectValue( + "quantity", CommonConstants.VALID_CODE_INVALID_ZERO, + "μˆ˜λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { errors.rejectValue( "unitCode", CommonConstants.VALID_CODE_NOTBLANK, @@ -43,5 +49,12 @@ public class SaveDailyForestryValidator implements Validator { "estimatedValue", CommonConstants.VALID_CODE_NOTBLANK, "ν˜„λ¬Όν‰κ°€μ•‘μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + + if (vo.getEstimatedValue() != null && vo.getEstimatedValue() <= 0) { + errors.rejectValue( + "estimatedValue", CommonConstants.VALID_CODE_INVALID_ZERO, + "ν˜„λ¬Όν‰κ°€μ•‘μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java index 510915b5..bb6c175e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java @@ -27,6 +27,12 @@ public class SaveDailyIncomeValidator implements Validator { "μˆ˜λŸ‰μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + if (vo.getQuantity() != null && vo.getQuantity() <= 0) { + errors.rejectValue( + "quantity", CommonConstants.VALID_CODE_INVALID_ZERO, + "μˆ˜λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { errors.rejectValue( "unitCode", CommonConstants.VALID_CODE_NOTBLANK, @@ -47,5 +53,15 @@ public class SaveDailyIncomeValidator implements Validator { "estimatedValue", CommonConstants.VALID_CODE_NOTBLANK, "ν˜„κΈˆ λ˜λŠ” ν˜„λ¬Όν‰κ°€μ•‘μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + + if ((vo.getPrice() != null && vo.getPrice() <= 0) + || (vo.getEstimatedValue() != null && vo.getEstimatedValue() <= 0)) { + errors.rejectValue( + "price", CommonConstants.VALID_CODE_INVALID_ZERO, + "ν˜„κΈˆ λ˜λŠ” ν˜„λ¬Όν‰κ°€μ•‘μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + errors.rejectValue( + "estimatedValue", CommonConstants.VALID_CODE_INVALID_ZERO, + "ν˜„κΈˆ λ˜λŠ” ν˜„λ¬Όν‰κ°€μ•‘μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java index 7ec35dad..c580f28d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java @@ -27,5 +27,15 @@ public class SaveDailyPowerValidator implements Validator { "leasedHours", CommonConstants.VALID_CODE_NOTBLANK, "μžκ°€ μ‚¬μš©μ‹œκ°„ λ˜λŠ” μž„μ°¨ μ‚¬μš©μ‹œκ°„μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + + if ((vo.getOwnedHours() != null && vo.getOwnedHours() <= 0) + || (vo.getLeasedHours() != null && vo.getLeasedHours() <= 0)) { + errors.rejectValue( + "ownedHours", CommonConstants.VALID_CODE_INVALID_ZERO, + "μžκ°€ μ‚¬μš©μ‹œκ°„ λ˜λŠ” μž„μ°¨ μ‚¬μš©μ‹œκ°„μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + errors.rejectValue( + "leasedHours", CommonConstants.VALID_CODE_INVALID_ZERO, + "μžκ°€ μ‚¬μš©μ‹œκ°„ λ˜λŠ” μž„μ°¨ μ‚¬μš©μ‹œκ°„μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java index 2d0b013c..de7e08f3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java @@ -25,7 +25,11 @@ public class SaveDailyWorkValidator implements Validator { "workLandArea", CommonConstants.VALID_CODE_NOTBLANK, "μž‘μ—… 면적을 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } - + if (vo.getWorkLandArea() != null && vo.getWorkLandArea() <= 0) { + errors.rejectValue( + "workLandArea", CommonConstants.VALID_CODE_INVALID_ZERO, + "μž‘μ—… 면적은 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } if (vo.getWorkLandArea() != null && StringUtils.isBlank(vo.getAreaUnitCode())) { errors.rejectValue( "areaUnitCode", CommonConstants.VALID_CODE_NOTBLANK, @@ -44,6 +48,12 @@ public class SaveDailyWorkValidator implements Validator { "μˆ˜ν™•λŸ‰μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); } + if (vo.getHarvestQuantity() != null && vo.getHarvestQuantity() <= 0) { + errors.rejectValue( + "harvestQuantity", CommonConstants.VALID_CODE_INVALID_ZERO, + "μˆ˜ν™•λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + if (vo.getHarvestQuantity() != null && StringUtils.isBlank(vo.getHarvestUnitCode())) { errors.rejectValue( "harvestUnitCode", CommonConstants.VALID_CODE_NOTBLANK, @@ -72,5 +82,27 @@ public class SaveDailyWorkValidator implements Validator { errors.rejectValue("volunteerMHours", CommonConstants.VALID_CODE_NOTBLANK); errors.rejectValue("volunteerFHours", CommonConstants.VALID_CODE_NOTBLANK); } + + if ((vo.getOwnerTime() != null && vo.getOwnerTime() <= 0) + || (vo.getSpouseTime() != null && vo.getSpouseTime() <= 0) + || (vo.getFamilyMHours() != null && vo.getFamilyMHours() <= 0) + || (vo.getFamilyFHours() != null && vo.getFamilyFHours() <= 0) + || (vo.getHiredMHours() != null && vo.getHiredMHours() <= 0) + || (vo.getHiredFHours() != null && vo.getHiredFHours() <= 0) + || (vo.getSharedMHours() != null && vo.getSharedMHours() <= 0) + || (vo.getSharedFHours() != null && vo.getSharedFHours() <= 0) + || (vo.getVolunteerMHours() != null && vo.getVolunteerMHours() <= 0) + || (vo.getVolunteerFHours() != null && vo.getVolunteerFHours() <= 0)) { + errors.rejectValue("ownerTime", CommonConstants.VALID_CODE_INVALID_ZERO, "λ…Έλ™νˆ¬μž…μ‹œκ°„μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + errors.rejectValue("spouseTime", CommonConstants.VALID_CODE_INVALID_ZERO); + errors.rejectValue("familyMHours", CommonConstants.VALID_CODE_INVALID_ZERO); + errors.rejectValue("familyFHours", CommonConstants.VALID_CODE_INVALID_ZERO); + errors.rejectValue("hiredMHours", CommonConstants.VALID_CODE_INVALID_ZERO); + errors.rejectValue("hiredFHours", CommonConstants.VALID_CODE_INVALID_ZERO); + errors.rejectValue("sharedMHours", CommonConstants.VALID_CODE_INVALID_ZERO); + errors.rejectValue("sharedFHours", CommonConstants.VALID_CODE_INVALID_ZERO); + errors.rejectValue("volunteerMHours", CommonConstants.VALID_CODE_INVALID_ZERO); + errors.rejectValue("volunteerFHours", CommonConstants.VALID_CODE_INVALID_ZERO); + } } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java index 388382d6..db690fda 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java @@ -18,18 +18,18 @@ public class SaveForestProductReqVO { private String landType; private String town; private String cropName; - private String landArea; - private String availableArea; - private String mainYield; - private String mainYieldUnitCode; - private String mainYieldUnit; - private String mainSaleAmount; - private String mainSaleUnitCode; - private String mainSaleUnit; - private String subYield; - private String subYieldUnitCode; - private String subYieldUnit; - private String subSaleAmount; - private String subSaleUnitCode; - private String subSaleUnit; + private String landArea; // 면적(평) + private String availableArea; // κ°€λŠ₯면적(평) + private String mainYield; // 주생산물 μˆ˜ν™•λŸ‰ + private String mainYieldUnitCode; // 주생산물 μˆ˜ν™•λŸ‰ λ‹¨μœ„ (select) + private String mainYieldUnit; // 주생산물 μˆ˜ν™•λŸ‰ μ§μ ‘μž…λ ₯ λ‹¨μœ„ + private String mainSaleAmount; // 주생산물 νŒλ§€λŸ‰ + private String mainSaleUnitCode; // 주생산물 νŒλ§€λŸ‰ λ‹¨μœ„ (select) + private String mainSaleUnit; // 주생산물 νŒλ§€λŸ‰ μ§μ ‘μž…λ ₯ λ‹¨μœ„ + private String subYield; // 뢀생산물 μˆ˜ν™•λŸ‰ + private String subYieldUnitCode; // 뢀생산물 μˆ˜ν™•λŸ‰ λ‹¨μœ„ (select) + private String subYieldUnit; // 뢀생산물 μˆ˜ν™•λŸ‰ μ§μ ‘μž…λ ₯ λ‹¨μœ„ + private String subSaleAmount; // 뢀생산물 νŒλ§€λŸ‰ + private String subSaleUnitCode; // 뢀생산물 νŒλ§€λŸ‰ λ‹¨μœ„ (select) + private String subSaleUnit; // 뢀생산물 νŒλ§€λŸ‰ μ§μ ‘μž…λ ₯ λ‹¨μœ„ } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/validator/SaveForestProductValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/validator/SaveForestProductValidator.java index fb55563a..797c0367 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/validator/SaveForestProductValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/validator/SaveForestProductValidator.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.validator; import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model.SaveForestProductReqVO; +import app.module.core.config.constants.CommonConstants; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; @@ -21,5 +22,93 @@ public class SaveForestProductValidator implements Validator { if (!StringUtils.hasText(vo.getCropName())) { errors.rejectValue("cropName", "error.cropName", "재배 μž‘λ¬Όλͺ…을 μž…λ ₯ν•΄μ£Όμ„Έμš”."); } + + if (StringUtils.hasText(vo.getLandArea()) && Integer.parseInt(vo.getLandArea()) <= 0) { + errors.rejectValue( + "landArea", CommonConstants.VALID_CODE_INVALID_ZERO, + "면적(평)은 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + if (StringUtils.hasText(vo.getAvailableArea()) && Integer.parseInt(vo.getAvailableArea()) <= 0) { + errors.rejectValue( + "availableArea", CommonConstants.VALID_CODE_INVALID_ZERO, + "κ°€λŠ₯면적(평)은 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + // 주생산물 μˆ˜ν™•λŸ‰ + if (StringUtils.hasText(vo.getMainYield()) && Integer.parseInt(vo.getMainYield()) <= 0) { + errors.rejectValue( + "mainYield", CommonConstants.VALID_CODE_INVALID_ZERO, + "주생산물 μˆ˜ν™•λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + if (StringUtils.hasText(vo.getMainYield()) && !StringUtils.hasText(vo.getMainYieldUnitCode())) { + errors.rejectValue( + "mainYieldUnitCode", CommonConstants.VALID_CODE_NOTBLANK, + "주생산물 μˆ˜ν™•λŸ‰μ˜ λ‹¨μœ„λ₯Ό 선택해 μ£Όμ„Έμš”."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getMainYieldUnitCode()) && !StringUtils.hasText(vo.getMainYieldUnit())) { + errors.rejectValue( + "mainYieldUnit", CommonConstants.VALID_CODE_NOTBLANK, + "주생산물 μˆ˜ν™•λŸ‰ λ‹¨μœ„λ₯Ό μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + // 주생산물 νŒλ§€λŸ‰ + if (StringUtils.hasText(vo.getMainSaleAmount()) && Integer.parseInt(vo.getMainSaleAmount()) <= 0) { + errors.rejectValue( + "mainSaleAmount", CommonConstants.VALID_CODE_INVALID_ZERO, + "주생산물 νŒλ§€λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + if (StringUtils.hasText(vo.getMainSaleAmount()) && !StringUtils.hasText(vo.getMainSaleUnitCode())) { + errors.rejectValue( + "mainSaleUnitCode", CommonConstants.VALID_CODE_NOTBLANK, + "주생산물 νŒλ§€λŸ‰μ˜ λ‹¨μœ„λ₯Ό 선택해 μ£Όμ„Έμš”."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getMainSaleUnitCode()) && !StringUtils.hasText(vo.getMainSaleUnit())) { + errors.rejectValue( + "mainSaleUnit", CommonConstants.VALID_CODE_NOTBLANK, + "주생산물 νŒλ§€λŸ‰ λ‹¨μœ„λ₯Ό μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + // 뢀생산물 μˆ˜ν™•λŸ‰ + if (StringUtils.hasText(vo.getSubYield()) && Integer.parseInt(vo.getSubYield()) <= 0) { + errors.rejectValue( + "subYield", CommonConstants.VALID_CODE_INVALID_ZERO, + "뢀생산물 μˆ˜ν™•λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + if (StringUtils.hasText(vo.getSubYield()) && !StringUtils.hasText(vo.getSubYieldUnitCode())) { + errors.rejectValue( + "subYieldUnitCode", CommonConstants.VALID_CODE_NOTBLANK, + "뢀생산물 μˆ˜ν™•λŸ‰μ˜ λ‹¨μœ„λ₯Ό 선택해 μ£Όμ„Έμš”."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getSubYieldUnitCode()) && !StringUtils.hasText(vo.getSubYieldUnit())) { + errors.rejectValue( + "subYieldUnit", CommonConstants.VALID_CODE_NOTBLANK, + "뢀생산물 μˆ˜ν™•λŸ‰ λ‹¨μœ„λ₯Ό μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + // 뢀생산물 νŒλ§€λŸ‰ + if (StringUtils.hasText(vo.getSubSaleAmount()) && Integer.parseInt(vo.getSubSaleAmount()) <= 0) { + errors.rejectValue( + "subSaleAmount", CommonConstants.VALID_CODE_INVALID_ZERO, + "뢀생산물 νŒλ§€λŸ‰μ€ 0 이상 μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } + + if (StringUtils.hasText(vo.getSubSaleAmount()) && !StringUtils.hasText(vo.getSubSaleUnitCode())) { + errors.rejectValue( + "subSaleUnitCode", CommonConstants.VALID_CODE_NOTBLANK, + "뢀생산물 νŒλ§€λŸ‰μ˜ λ‹¨μœ„λ₯Ό 선택해 μ£Όμ„Έμš”."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getSubSaleUnitCode()) && !StringUtils.hasText(vo.getSubSaleUnit())) { + errors.rejectValue( + "subSaleUnit", CommonConstants.VALID_CODE_NOTBLANK, + "뢀생산물 νŒλ§€λŸ‰ λ‹¨μœ„λ₯Ό μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + } } -} \ No newline at end of file +} diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml index 563816f2..57185338 100644 --- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -58,7 +58,7 @@ bat.income_code, /* μˆ˜μž…λΆ€ν˜Έ(μ—‘μ…€μš©) */ bat.expense_code, /* μ§€μΆœλΆ€ν˜Έ(μ—‘μ…€μš©) */ CASE - WHEN ui_category.id = 'code.bank.input.self' + WHEN ui_category.id = 'code.bank.output.self' THEN bat.transfer_category ELSE ui_category.code_text END AS categoryText, /* μ§€μΆœμ˜ μ’…λ₯˜ */ diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index b1f2c355..da8469a0 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -79,12 +79,7 @@ vs.second_visit_date AS secondVisitDate, COALESCE(vs.is_gift_sent, false) AS isGiftSent, r.researcher_name AS researcherName, - r.researcher_phone AS researcherPhone, - h.owner_age, /* μ—‘μ…€μš© */ - h.address, /* μ—‘μ…€μš© */ - h.industry_sub_middle, /* μ—‘μ…€μš© */ - h.industry_detail, /* μ—‘μ…€μš© */ - h.usage_type /* μ—‘μ…€μš© */ + r.researcher_phone AS researcherPhone FROM v_household_with_code h CROSS JOIN total_days td LEFT JOIN daily_progress dp ON h.seq = dp.household_seq diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index cb1aa1bd..4525cc28 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -337,7 +337,6 @@ h.is_panel AS isPanel, r.researcher_name AS researcherName FROM v_household_with_code h - LEFT JOIN v_household_visit v ON h.seq = v.household_seq LEFT JOIN v_household_researcher r ON h.seq = r.household_seq ) AS hvr @@ -386,10 +385,10 @@ /* λ§΅ν•‘ μ—¬λΆ€ */ - AND r.researcher_name is not null + AND hvr.researcher_name is not null - AND r.researcher_name is null + AND hvr.researcher_name is null diff --git a/admin/src/main/resources/messages/validation.properties b/admin/src/main/resources/messages/validation.properties index e175623f..ba48523b 100644 --- a/admin/src/main/resources/messages/validation.properties +++ b/admin/src/main/resources/messages/validation.properties @@ -2,6 +2,7 @@ valid.common.required=\uD544\uC218\uC785\uB825 \uD56D\uBAA9\uC785\uB2C8\uB2E4. valid.common.required.ask=\uD544\uC218\uC785\uB825\uD56D\uBAA9\uC744 \uD655\uC778\uD574\uC8FC\uC138\uC694. valid.common.required.size={0} \uAC1C \uD56D\uBAA9\uC774 \uB2F4\uACA8\uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4. valid.common.required.size.min={0} \uAC1C \uC774\uC0C1 \uD56D\uBAA9\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. +valid.common.required.value.min={0} \uC774\uC0C1 \uC785\uB825\uD574 \uC8FC\uC138\uC694. valid.common.required.remove.item=\uC0AD\uC81C\uD560 \uC544\uC774\uD15C\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. valid.common.email.wrong=\uC774\uBA54\uC77C \uD615\uC2DD\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. valid.common.nickname.wrong=\uB2C9\uB124\uC784(2-10\uAE00\uC790)\uC740 \uD55C\uAE00,\uC601\uC5B4 \uB300\uC18C\uBB38\uC790, -, _ \uB9CC \uC785\uB825\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. diff --git a/admin/src/main/resources/static/scripts/ajaxUtils.js b/admin/src/main/resources/static/scripts/ajaxUtils.js index f23864a7..0ace25d8 100644 --- a/admin/src/main/resources/static/scripts/ajaxUtils.js +++ b/admin/src/main/resources/static/scripts/ajaxUtils.js @@ -136,7 +136,6 @@ var ajaxUtil = { if (options.handle422Type === 'field' || !options.handle422Type) { $(rstData.responseJSON).each((idx, oj) => { - // TODO : form id? or body let target = $('body').find('[name=' + oj.field + ']'); target.addClass('is-invalid'); diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index c0400618..17dff0cd 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -56,7 +56,7 @@ 쀑볡확인 - 4~15자 / 영문,숫자,ν•œκΈ€ κ°€λŠ₯/ 특수문자 _,- μ‚¬μš©κ°€λŠ₯ + 2~15자 / 영문,숫자,ν•œκΈ€ κ°€λŠ₯/ 특수문자 _,- μ‚¬μš©κ°€λŠ₯ diff --git a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html index 5461e6a2..d3327b4a 100644 --- a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html +++ b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html @@ -178,9 +178,11 @@ form.price.value = data.price ?? ''; form.sourcePurpose.value = data.sourcePurpose ?? ''; form.transferCategoryCode.value = data.transferCategoryCode ?? ''; + form.transferCategory.value = data.transferCategory ?? ''; - toggleSelfInput(form.expenseCode.value, form.transferCategory); - toggleSelfInput(form.unitCode.value, form.unit); + // 초기 μƒνƒœ μ—…λ°μ΄νŠΈ + toggleExpenseSelfInput(form.transferCategoryCode); + selectedSelf(form.unitCode); } @@ -255,11 +257,15 @@ f.expenseCode.value = codeValue; - const tr = el.closest('tr'); + toggleExpenseSelfInput(el); + } + + const toggleExpenseSelfInput = (selectElement) => { + const tr = selectElement.closest('tr'); const selfArea = tr.querySelector('.self-input'); const selfInput = tr.querySelector('.self-input input'); - if (el.value?.endsWith('.self')) { + if (selectElement.value?.endsWith('.self')) { selfInput.disabled = false; selfArea.classList.remove('input-disabled'); } else { diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-work.html b/admin/src/main/resources/templates/households/modal/modal-daily-work.html index da50531b..26d4654c 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-work.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-work.html @@ -148,7 +148,7 @@ - 가쑱노동(남) + 가쑱노동(μ—¬)
@@ -169,7 +169,7 @@
- κ³ μš©λ…Έλ™(남) + κ³ μš©λ…Έλ™(μ—¬)
@@ -190,7 +190,7 @@
- ν’ˆμ•—μ΄(남) + ν’ˆμ•—μ΄(μ—¬)
@@ -211,7 +211,7 @@
- 일손돕기(남) + 일손돕기(μ—¬)
diff --git a/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html index 7462d3c1..dbc005e5 100644 --- a/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html +++ b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html @@ -136,7 +136,7 @@ tbody.append(tmpl); } - // μ€ν–‰μžλ™μ΄μ²΄λ‚΄μ—­ 수좜 ν…Œμ΄λΈ” 그리기 + // μ€ν–‰μžλ™μ΄μ²΄λ‚΄μ—­ μ§€μΆœ ν…Œμ΄λΈ” 그리기 const gridBankExpenseTable = (data) => { const tbody = $('#table-bank-expense tbody'); tbody.empty(); diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html index 799922c9..dd81419a 100644 --- a/admin/src/main/resources/templates/households/tab/forest-product.html +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -81,7 +81,6 @@ const tbody = $('.tab-content.forest-product tbody'); tbody.empty(); - // TODO(ks) : monthlyStatus 없을 경우 처리 μΆ”κ°€... 일단 .. μ΄λ ‡κ²Œ 처리 ν•˜μ§€λ§Œ.. 또 λ‹€λ₯Έ λ°©μ•ˆμ΄ μžˆμ„μ§€... if (!response.monthlyStatus || !response.monthlyStatus.forestStatus) { noDataMonthly(tbody, null, 15); return; diff --git a/admin/src/test/java/app/module/admin/EnableJsonUTF8.java b/admin/src/test/java/app/module/admin/EnableJsonUTF8.java deleted file mode 100644 index 89f8d8d4..00000000 --- a/admin/src/test/java/app/module/admin/EnableJsonUTF8.java +++ /dev/null @@ -1,30 +0,0 @@ -package app.module.admin; - -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; -import org.springframework.web.filter.CharacterEncodingFilter; - -import java.lang.annotation.*; - -/** - * MockMvc `application/json` νƒ€μž… 전솑 μ‹œ UTF-8 μ„€μ • μ–΄λ…Έν…Œμ΄μ…˜ - * - * @author Youngmok Kim - * @version 1.0 2022-06-27 - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@AutoConfigureMockMvc -@Import(EnableJsonUTF8.Config.class) -public @interface EnableJsonUTF8 { - - class Config { - - @Bean - public CharacterEncodingFilter characterEncodingFilter() { - return new CharacterEncodingFilter("UTF-8", true); - } - } -} diff --git a/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java b/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java deleted file mode 100644 index e8512087..00000000 --- a/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java +++ /dev/null @@ -1,26 +0,0 @@ -package app.module.admin.config.initData; - -import app.module.core.config.adapters.persistence.repository.RoleRepo; -import lombok.RequiredArgsConstructor; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.core.env.Environment; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -public class InitAdminUserRoleTestData implements ApplicationRunner { - - private final RoleRepo roleRepo; - private final Environment env; - - @Override - public void run(ApplicationArguments args) { - if (!env.getProperty("admin.initData.test", Boolean.class)) { - return; - } - -// roleRepo.save(new Role("ROLE_SUPER")); -// roleRepo.save(new Role("ROLE_STAFF")); - } -} diff --git a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java deleted file mode 100644 index 37207ff8..00000000 --- a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java +++ /dev/null @@ -1,72 +0,0 @@ -package app.module.admin.config.security; - -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import app.module.core.usecase.admin.view.ports.AdminViewPortIn; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.web.servlet.MockMvc; - -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; - -@SpringBootTest -@TestPropertySource("classpath:application-override.properties") -@AutoConfigureMockMvc -@TestInstance(Lifecycle.PER_CLASS) -class AdminAuthFailHandlerTest { - - static { - System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true"); - } - - @Autowired - MockMvc mockMvc; - @Autowired - AdminViewPortIn adminViewPortIn; - @Autowired - SaveAdminPortIn saveAdminPortIn; - - @Value("${app.admin.auth.fail.permit}") - Integer loginFailPermit; - - String testUsername = "testUser"; - - @BeforeAll - public void beforeAll() { - /* saveAdminPortIn.connect( - 1L, - testUsername, - "test.1@#$", - null, - false, - Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));*/ - } - - @Test - @DisplayName("operate - 계정 μž κΉ€") - void onAuthenticationFailure() throws Exception { - String badPassword = "bad-password.1@#$"; - String goodPassword = "test.1@#$"; - - for (int i = 0; i < loginFailPermit; i++) { - mockMvc.perform(formLogin().user(testUsername).password(badPassword)); - } - - assertTrue( - adminViewPortIn.connect(testUsername).orElseThrow().getAccountLocked(), - String.format("%s 회 이상 둜그인 μ‹€νŒ¨λ‘œ 계정이 μž κΉ€μ²˜λ¦¬λ˜μ–΄μ•Ό ν•œλ‹€.", loginFailPermit)); - - mockMvc - .perform(formLogin().user(testUsername).password(goodPassword)) - .andExpect(unauthenticated()); - } -} diff --git a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java deleted file mode 100644 index 68dba740..00000000 --- a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package app.module.admin.config.security; - -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.web.servlet.MockMvc; - -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; - -@SpringBootTest -@TestPropertySource("classpath:application-override.properties") -@AutoConfigureMockMvc -@TestInstance(Lifecycle.PER_CLASS) -class AdminDetailsServiceTest { - - static { - System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true"); - } - - @Autowired - MockMvc mockMvc; - @Autowired - SaveAdminPortIn saveAdminPortIn; - - String username = "test"; - String password = "test.1@#$"; - String oldUsername = "admin_for_old_password_test"; - - @BeforeAll - public void beforeAll() { - /* saveAdminPortIn.connect( - 1L, - username, - password, - null, - false, - Arrays.asList("ROLE_SUPER", "ROLE_STAFF"));*/ - - - } - - @Test - @DisplayName("operate - 둜그인 성곡") - void operate1() throws Exception { - mockMvc.perform(formLogin().user(username).password(password)).andExpect(authenticated()); - } - - @Test - @DisplayName("operate - 둜그인 μ‹€νŒ¨") - void operate2() throws Exception { - String badPassword = "bad-password.1@#$"; - mockMvc.perform(formLogin().user(username).password(badPassword)) - .andExpect(unauthenticated()); - } - - // @Test - // @DisplayName("operate - νŒ¨μŠ€μ›Œλ“œ μœ νš¨κΈ°κ°„ 지남") - // void operate3() throws Exception { - // - // mockMvc.perform(formLogin().user(oldUsername).password(password)).andExpect(unauthenticated()); - // } -} diff --git a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java deleted file mode 100644 index e06fd722..00000000 --- a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package app.module.admin.feature.admin.repository.dao; - -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - - - -@Slf4j -class AdminCreateUpdateDaoTest { - - static { - System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true"); - } - -/* @Autowired - SaveAdminPortOut adminCreateUpdateDao; - @Autowired - AdminViewPortIn adminViewPortIn; - @Autowired - SaveAdminPortIn saveAdminPortIn;*/ - - @Test - @DisplayName("operate - AdminCreateDao") - void operate() { - - /* saveAdminPortIn.connect( - 1L, - "admin_for_createDao_test", - "test.1@#$", - null, - false, - Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); - - adminViewPortIn - .connect("admin_for_createDao_test") - .ifPresent( - retrieveUser -> - assertEquals( - Arrays.asList("ROLE_SUPER", "ROLE_STAFF").size(), - retrieveUser.getRoles().size())); - - saveAdminPortIn.connect( - 2L, - "admin_for_createDao_test", - "test.1@#$", - null, - false, - List.of("ROLE_STAFF")); - assertEquals( - 1, - adminViewPortIn.connect("admin_for_createDao_test").orElseThrow().getRoles().size(), - "κΈ°μ‘΄ κΆŒν•œλ“€μ„ (λ‚΄λΆ€μ μœΌλ‘œ) μ‚­μ œν•˜κ³  μƒˆλ‘œμ΄ μΆ”κ°€ λ“±λ‘λ˜κΈ°μ— withRoles 의 size λŠ” 1이닀.");*/ - } -} diff --git a/admin/src/test/resources/application-override.properties b/admin/src/test/resources/application-override.properties deleted file mode 100644 index 939ee5c2..00000000 --- a/admin/src/test/resources/application-override.properties +++ /dev/null @@ -1,11 +0,0 @@ -# disable JNDI lookup -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration -spring.profiles.active=local -spring.jpa.hibernate.ddl-auto=create -spring.datasource.url=jdbc:h2:~/test; -spring.datasource.username=sa -spring.datasource.password= -spring.datasource.driver-class-name=org.h2.Driver -spring.jpa.properties.hibernate.show_sql=true -logging.level.org.hibernate.type.descriptor.sql=trace -admin.initData.test=true diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java deleted file mode 100644 index 8b88d203..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java +++ /dev/null @@ -1,35 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class Admin extends AuditEntity { - private Long seq; - - private String id; - - private String password; - - private String email; - - private LocalDateTime passwordUpdatedAt; - - private Boolean accountDisabled; - - private Integer loginFailCnt; - - private Boolean accountLocked; - - public Admin(String id) { - this.id = id; - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java deleted file mode 100644 index 29feec3b..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.*; - -@Getter -@Setter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class AdminHasRole extends AuditEntity { - - private Long id; - - private String adminId; - - private String roleId; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java deleted file mode 100644 index 79d30c10..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java +++ /dev/null @@ -1,53 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class FrontUser extends AuditEntity { - - private String id; - - private String password; - - private String email; - - private String nickname; - - private SignUpType signUpType; - - private LocalDateTime passwordUpdatedAt; - - private Boolean accountDisabled; - - private Integer loginFailCnt; - - private Boolean accountLocked; - -// private String roleId; - - private String uploadFileId; - - public FrontUser(String id) { - this.id = id; - } - - public FrontUser(String id, String email, String nickname, Boolean accountDisabled, - Integer loginFailCnt, Boolean accountLocked) { - this.id = id; - this.email = email; - this.nickname = nickname; - this.accountDisabled = accountDisabled; - this.loginFailCnt = loginFailCnt; - this.accountLocked = accountLocked; - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasRole.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasRole.java deleted file mode 100644 index c5a539c3..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasRole.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -public class FrontUserHasRole extends AuditEntity { - - private Long id; - - private String frontUSerId; - - private String roleId; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasUploadFile.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasUploadFile.java deleted file mode 100644 index 7ebc8e03..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserHasUploadFile.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class FrontUserHasUploadFile extends AuditEntity { - - private String frontUserId; - - private Long uploadFilesId; - - public FrontUserHasUploadFile(String frontUserId) { - this.frontUserId = frontUserId; - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java deleted file mode 100644 index 6e36bd4a..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java +++ /dev/null @@ -1,50 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class Household extends AuditEntity { - - private Long id; - - private String householdNum; - - private String ownerName; - - private Integer ownerAge; - - private String tel; - - private String phone; - - private String password; - - private String region; - - private String city; - - private String addressDetail; - - private Integer industryLargeCode; - - private Integer industryMiddleCode; - - private Integer industrySmallCode; - - private Integer scaleCode; - - private Integer employmentType; - - private Boolean isPanel; - - private String memo; - - private String dropReason; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java deleted file mode 100644 index 9b1a58e6..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/NoticeHasUploadFile.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class NoticeHasUploadFile extends AuditEntity { - - private Long noticeId; - - private Long uploadFilesId; - - public NoticeHasUploadFile(Long noticeId) { - this.noticeId = noticeId; - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/OperationLog.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/OperationLog.java deleted file mode 100644 index 75653666..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/OperationLog.java +++ /dev/null @@ -1,28 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.enums.OperationLogType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class OperationLog extends AuditEntity { - - private Long id; - - private AppType appType; - - private OperationLogType operationLogType; - - private String targetId; - - private String ip; - - private String taskDesc; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java deleted file mode 100644 index f95f5bf4..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java +++ /dev/null @@ -1,23 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -/** - * Spring Security - Remember me κΈ°λŠ₯을 μœ„ν•œ μ—”ν‹°ν‹° - */ -@Getter -@Setter -public class PersistentLogins extends AuditEntity { - - private String series; - - private String username; - - private String token; - - private Date lastUsed; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java deleted file mode 100644 index 6fa946b1..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.*; - -@Getter -@Setter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class UriHasRole extends AuditEntity { - - private Long id; - - private String uriId; - - private String roleId; -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/AdminRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/AdminRepo.java deleted file mode 100644 index 99ad2e8c..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/AdminRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface AdminRepo { - -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/OperationLogRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/OperationLogRepo.java deleted file mode 100644 index d61943d8..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/OperationLogRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface OperationLogRepo { - -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java deleted file mode 100644 index e2a02270..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import app.module.core.config.adapters.persistence.entity.Role; -import app.module.core.config.application.enums.AppType; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.data.domain.Sort; - -import java.util.List; - -@Mapper -public interface RoleRepo { - - List findAllByAppType(AppType appType, Sort sort); -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/UICodeRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/UICodeRepo.java deleted file mode 100644 index 23348df6..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/UICodeRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UICodeRepo { - -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/URIRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/URIRepo.java deleted file mode 100644 index 73b55c98..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/URIRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface URIRepo { - -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/UploadFileRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/UploadFileRepo.java deleted file mode 100644 index b5a4b2e6..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/UploadFileRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.config.adapters.persistence.repository; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UploadFileRepo { - -} diff --git a/core/src/main/java/app/module/core/config/application/enums/FileStorageType.java b/core/src/main/java/app/module/core/config/application/enums/FileStorageType.java index 0a4cee07..2c5e5479 100644 --- a/core/src/main/java/app/module/core/config/application/enums/FileStorageType.java +++ b/core/src/main/java/app/module/core/config/application/enums/FileStorageType.java @@ -7,8 +7,7 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public enum FileStorageType { LOCAL("둜컬 μŠ€ν† λ¦¬μ§€"), - S3("AWS S3 μŠ€ν† λ¦¬μ§€"), - SFTP("SFTP"); + S3("AWS S3 μŠ€ν† λ¦¬μ§€"); private final String desc; private String name; diff --git a/core/src/main/java/app/module/core/config/application/enums/FileUploadType.java b/core/src/main/java/app/module/core/config/application/enums/FileUploadType.java index 78d06094..0916389c 100644 --- a/core/src/main/java/app/module/core/config/application/enums/FileUploadType.java +++ b/core/src/main/java/app/module/core/config/application/enums/FileUploadType.java @@ -13,7 +13,7 @@ public enum FileUploadType { // URI og:image 용 이미지 파일 OG_IMAGE(Set.of(FileStorageType.LOCAL), "/ogImage", Set.of(AcceptableFileType.IMAGE)), // WEB Editor 이미지 파일 - EDITOR_IMAGE(Set.of(FileStorageType.SFTP,FileStorageType.LOCAL), "/editorImage", Set.of(AcceptableFileType.IMAGE)), + EDITOR_IMAGE(Set.of(FileStorageType.LOCAL), "/editorImage", Set.of(AcceptableFileType.IMAGE)), PUBLIC( Set.of(FileStorageType.LOCAL), @@ -43,7 +43,6 @@ public enum FileUploadType { AcceptableFileType.ZIP)), NOTICE( Set.of( - FileStorageType.SFTP, FileStorageType.LOCAL ), "/notice", @@ -58,14 +57,14 @@ public enum FileUploadType { AcceptableFileType.PDF, AcceptableFileType.ZIP)), INCOME( - Set.of(FileStorageType.SFTP,FileStorageType.LOCAL), + Set.of(FileStorageType.LOCAL), "/income", Set.of( AcceptableFileType.IMAGE ) ), EXPENSE( - Set.of(FileStorageType.SFTP,FileStorageType.LOCAL), + Set.of(FileStorageType.LOCAL), "/expense", Set.of( AcceptableFileType.IMAGE diff --git a/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java b/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java deleted file mode 100644 index b2baacfa..00000000 --- a/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.core.config.application.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum UiCodeType { - REGION_MAIN("code.region.main"), - REGION_SUB("code.region.sub"); - private final String code; -} diff --git a/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java b/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java deleted file mode 100644 index 5dde50c5..00000000 --- a/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java +++ /dev/null @@ -1,96 +0,0 @@ -package app.module.core.config.application.util; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import java.nio.charset.StandardCharsets; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.Base64; - -@Slf4j -@Component -public class AESEncryptUtil { - - @Value("${aes.secret-key}") - private String key; - - @Value("${encrypt.aes.iv}") - private String iv; - - private static final String AES_ALGORITHM = "AES/CBC/PKCS5PADDING"; - public static final String ENCRYPT_IV = "0123456789ABCDEF"; - - public String encrypt(String text) - throws NoSuchPaddingException, NoSuchAlgorithmException, BadPaddingException, - IllegalBlockSizeException, InvalidAlgorithmParameterException, InvalidKeyException { - Cipher cipher = Cipher.getInstance(getTransformation()); - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), "AES"); - IvParameterSpec ivParamSpec = new IvParameterSpec(iv.getBytes()); - cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivParamSpec); - - byte[] encrypted = cipher.doFinal(text.getBytes(StandardCharsets.UTF_8)); - return Base64.getEncoder().encodeToString(encrypted); - } - - public String decrypt(String cipherText) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, - InvalidKeyException, BadPaddingException, IllegalBlockSizeException { - Cipher cipher = Cipher.getInstance(getTransformation()); - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), "AES"); - IvParameterSpec ivParamSpec = new IvParameterSpec(iv.getBytes()); - cipher.init(Cipher.DECRYPT_MODE, keySpec, ivParamSpec); - - byte[] decodedBytes = Base64.getDecoder().decode(cipherText); - byte[] decrypted = cipher.doFinal(decodedBytes); - return new String(decrypted, StandardCharsets.UTF_8); - } - - - public byte[] encryptAesCbc(byte[] plainData) { - if (plainData == null || plainData.length == 0) { - throw new IllegalArgumentException("λ°μ΄ν„°λŠ” nullμ΄κ±°λ‚˜ λΉ„μ–΄ μžˆμ„ 수 μ—†μŠ΅λ‹ˆλ‹€."); - } - - try { - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES"); - IvParameterSpec ivSpec = new IvParameterSpec(ENCRYPT_IV.getBytes(StandardCharsets.UTF_8)); - Cipher cipher = Cipher.getInstance(AES_ALGORITHM); - cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); - return org.apache.commons.codec.binary.Base64.encodeBase64(cipher.doFinal(plainData)); - } catch (Exception e) { - log.error("λ°”μ΄λ„ˆλ¦¬ 데이터 μ•”ν˜Έν™” μ‹€νŒ¨", e); - throw new RuntimeException("λ°”μ΄λ„ˆλ¦¬ 데이터 μ•”ν˜Έν™” μ‹€νŒ¨", e); - } - } - - public byte[] decryptAesCbc(byte[] cipherData) { - if (cipherData == null || cipherData.length == 0) { - throw new IllegalArgumentException("μ•”ν˜Έλ¬Έμ€ nullμ΄κ±°λ‚˜ λΉ„μ–΄ μžˆμ„ 수 μ—†μŠ΅λ‹ˆλ‹€."); - } - - try { - byte[] encrypted = org.apache.commons.codec.binary.Base64.decodeBase64(cipherData); - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES"); - IvParameterSpec ivSpec = new IvParameterSpec(ENCRYPT_IV.getBytes(StandardCharsets.UTF_8)); - Cipher cipher = Cipher.getInstance(AES_ALGORITHM); - cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec); - return cipher.doFinal(encrypted); - } catch (Exception e) { - log.error("λ°”μ΄λ„ˆλ¦¬ 데이터 λ³΅ν˜Έν™” μ‹€νŒ¨", e); - throw new RuntimeException("λ°”μ΄λ„ˆλ¦¬ 데이터 λ³΅ν˜Έν™” μ‹€νŒ¨", e); - } - } - - private String getTransformation() { - return "AES/CBC/PKCS5Padding"; - } -} diff --git a/core/src/main/java/app/module/core/config/application/util/SftpFileDeleteUtil.java b/core/src/main/java/app/module/core/config/application/util/SftpFileDeleteUtil.java deleted file mode 100644 index 4fff9402..00000000 --- a/core/src/main/java/app/module/core/config/application/util/SftpFileDeleteUtil.java +++ /dev/null @@ -1,130 +0,0 @@ -package app.module.core.config.application.util; - -import app.module.core.usecase.file.getFile.adapters.persistence.GetFileMapper; -import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; -import app.module.core.usecase.file.saveToStorage.ports.application.strategy.SftpConnector; -import app.module.core.usecase.file.updateFile.adapters.persistence.UpdateFileMapper; -import app.module.core.usecase.file.updateFile.ports.application.domain.UploadFileDto; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.SftpException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import java.nio.file.Paths; - -@Slf4j -@Component -@RequiredArgsConstructor -public class SftpFileDeleteUtil { - - private final SftpConnector sftpConnector; - private final GetFileMapper getFileMapper; - private final UpdateFileMapper updateFileMapper; - - @Value("${path.upload.sftp.public}") - private String publicPath; - - /** - * SFTP μ„œλ²„μ—μ„œ νŒŒμΌμ„ μ‚­μ œν•˜λŠ” 곡톡 λ©”μ„œλ“œ - * @param deleteFile μ‚­μ œν•  파일 정보 - * @throws JSchException SFTP μ—°κ²° 였λ₯˜ - * @throws SftpException SFTP μž‘μ—… 였λ₯˜ - */ - public void deleteRealFile(UploadFileDto deleteFile) throws JSchException, SftpException { - if (deleteFile == null || deleteFile.getPath() == null || deleteFile.getName() == null) { - log.error("Invalid file information: {}", deleteFile); - throw new IllegalArgumentException("Invalid file information"); - } - - // 경둜 검증 및 생성 - String filePath = constructSafeFilePath(deleteFile.getPath(), deleteFile.getName()); - log.info("Attempting to delete file from SFTP: {}", filePath); - - // SFTP μ—°κ²° 확인 및 μž¬μ—°κ²° - if (!sftpConnector.isConnected()) { - log.warn("SFTP connection lost, attempting to reconnect"); - sftpConnector.connect(); - } - ChannelSftp channelSftp = sftpConnector.getChannelSftp(); - if (channelSftp == null) { - log.error("SFTP channel is not initialized"); - throw new SftpException(ChannelSftp.SSH_FX_NO_CONNECTION, "SFTP channel is not initialized"); - } - - // 파일 μ‚­μ œ - try { - channelSftp.stat(filePath); // 파일 쑴재 μ—¬λΆ€ 확인 - channelSftp.rm(filePath); - log.info("File deleted successfully from SFTP: {}", filePath); - } catch (SftpException e) { - if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { - log.warn("File does not exist on SFTP: {}", filePath); - } else { - log.error("Failed to delete file from SFTP: {}, error: {}", filePath, e.getMessage(), e); - throw e; - } - } - } - - public void deleteRealFile(Long deleteFileId) throws JSchException, SftpException { - GetFile deleteFile = getFileMapper.findById(deleteFileId).orElseThrow(); - updateFileMapper.deleteReceiptFile(deleteFileId,CommonUtil.getLoginUsername()); - - if (deleteFile == null || deleteFile.getPath() == null || deleteFile.getName() == null) { - log.error("Invalid file information: {}", deleteFile); - throw new IllegalArgumentException("Invalid file information"); - } - - // 경둜 검증 및 생성 - String filePath = constructSafeFilePath(deleteFile.getPath(), deleteFile.getName()); - log.info("Attempting to delete file from SFTP: {}", filePath); - - // SFTP μ—°κ²° 확인 및 μž¬μ—°κ²° - if (!sftpConnector.isConnected()) { - log.warn("SFTP connection lost, attempting to reconnect"); - sftpConnector.connect(); - } - ChannelSftp channelSftp = sftpConnector.getChannelSftp(); - if (channelSftp == null) { - log.error("SFTP channel is not initialized"); - throw new SftpException(ChannelSftp.SSH_FX_NO_CONNECTION, "SFTP channel is not initialized"); - } - - // 파일 μ‚­μ œ - try { - channelSftp.stat(filePath); // 파일 쑴재 μ—¬λΆ€ 확인 - channelSftp.rm(filePath); - log.info("File deleted successfully from SFTP: {}", filePath); - } catch (SftpException e) { - if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) { - log.warn("File does not exist on SFTP: {}", filePath); - } else { - log.error("Failed to delete file from SFTP: {}, error: {}", filePath, e.getMessage(), e); - throw e; - } - } - } - - - - /** - * 경둜 μ‘°μž‘ λ°©μ§€λ₯Ό μœ„ν•΄ μ•ˆμ „ν•œ 파일 경둜 생성 - */ - private String constructSafeFilePath(String subPath, String fileName) { - // 경둜 및 파일 이름 μ •κ·œν™” - String normalizedSubPath = Paths.get(subPath).normalize().toString().replace("\\", "/"); - String normalizedFileName = Paths.get(fileName).getFileName().toString(); - String safePath = CommonUtil.removeLastChar(publicPath, "/") + "/" + normalizedSubPath + "/" + normalizedFileName; - - // κ²½λ‘œκ°€ publicPath둜 μ‹œμž‘ν•˜λŠ”μ§€ 검증 - if (!safePath.startsWith(publicPath)) { - log.error("Invalid file path detected: {}", safePath); - throw new IllegalArgumentException("Invalid file path: " + safePath); - } - - return safePath; - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/config/application/util/SftpFileDownloader.java b/core/src/main/java/app/module/core/config/application/util/SftpFileDownloader.java deleted file mode 100644 index df993fb8..00000000 --- a/core/src/main/java/app/module/core/config/application/util/SftpFileDownloader.java +++ /dev/null @@ -1,102 +0,0 @@ -package app.module.core.config.application.util; - -import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; -import app.module.core.usecase.file.saveToStorage.ports.application.strategy.SftpConnector; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.SftpException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; - -@Slf4j -@Component -@RequiredArgsConstructor -public class SftpFileDownloader { - private final SftpConnector sftpConnector; - private final AESEncryptUtil encryptUtil; - - @Value("${path.upload.sftp.public}") - private String publicPath; - - @Value("${file.download.base-path:/tmp/downloads}") - private String defaultDownloadBasePath; - - public void downloadFile(GetFile file) throws JSchException, SftpException, IOException { - // SFTP μ—°κ²° 확인 및 μž¬μ—°κ²° - if (!sftpConnector.isConnected()) { - log.info("SFTP connection lost, attempting to reconnect"); - sftpConnector.connect(); - } - ChannelSftp channelSftp = sftpConnector.getChannelSftp(); - if (channelSftp == null) { - throw new SftpException(ChannelSftp.SSH_FX_NO_CONNECTION, "SFTP channel is not initialized"); - } - - try { - // 원격 파일 경둜 (μ•”ν˜Έν™”λœ 파일λͺ… μ‚¬μš©) - String remoteFilePath = CommonUtil.removeLastChar(publicPath, "/") + file.getPath() + "/" +"encrypted_"+ file.getName(); - log.info("Remote file path: {}", remoteFilePath); - - // λ‹€μš΄λ‘œλ“œ 경둜 μ •κ·œν™” - String basePath = CommonUtil.normalizePath(defaultDownloadBasePath); - log.info("Base path: {}", basePath); - String localEncryptedFilePath = basePath + File.separator + "encrypted_" + file.getOriginName(); - String localDecryptedFilePath = basePath + File.separator + file.getOriginName(); - log.info("Local encrypted file path: {}", localEncryptedFilePath); - log.info("Local decrypted file path: {}", localDecryptedFilePath); - - // 둜컬 디렉토리 생성 - File localDir = new File(localEncryptedFilePath).getParentFile(); - CommonUtil.createDirectories(localDir); - - // 원격 파일 쑴재 μ—¬λΆ€ 확인 (디버깅 용) - try { - channelSftp.lstat(remoteFilePath); - log.info("Remote file exists: {}", remoteFilePath); - } catch (SftpException e) { - log.error("Remote file does not exist: {}", remoteFilePath, e); - throw new SftpException(ChannelSftp.SSH_FX_NO_SUCH_FILE, "Remote file does not exist: " + remoteFilePath); - } - - // μ•”ν˜Έν™”λœ 파일 λ‹€μš΄λ‘œλ“œ - try (FileOutputStream fos = new FileOutputStream(localEncryptedFilePath)) { - channelSftp.get(remoteFilePath, fos); - log.info("File downloaded to: {}", localEncryptedFilePath); - } - - // 파일 λ³΅ν˜Έν™” - try { - byte[] encryptedContent = Files.readAllBytes(Paths.get(localEncryptedFilePath)); - byte[] decryptedContent = encryptUtil.decryptAesCbc(encryptedContent); - Files.write(Paths.get(localDecryptedFilePath), decryptedContent); - log.info("File decrypted and saved to: {}", localDecryptedFilePath); - file.setLocalPath(localDecryptedFilePath); - } catch (Exception e) { - log.error("Failed to decrypt file: {}", file.getOriginName(), e); - throw new IOException("Failed to decrypt file", e); - } finally { - // μ•”ν˜Έν™”λœ μž„μ‹œ 파일 μ‚­μ œ - Files.deleteIfExists(Paths.get(localEncryptedFilePath)); - log.info("Temporary encrypted file deleted: {}", localEncryptedFilePath); - } - - } catch (SftpException e) { - log.error("Failed to download file: {} (Error: {})", file.getOriginName(), e.getMessage()); - throw e; - } catch (IOException e) { - log.error("IO error during file download or decryption: {}", file.getOriginName(), e); - throw e; - } catch (Exception e) { - log.error("Unexpected error during file download: {}", file.getOriginName(), e); - throw new RuntimeException("Unexpected error during file download", e); - } - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/config/constants/CommonConstants.java b/core/src/main/java/app/module/core/config/constants/CommonConstants.java index fa64cc24..8b29138f 100644 --- a/core/src/main/java/app/module/core/config/constants/CommonConstants.java +++ b/core/src/main/java/app/module/core/config/constants/CommonConstants.java @@ -17,14 +17,14 @@ public final class CommonConstants { /** * κ΄€λ¦¬μž 아이디 생성 κ·œμΉ™ - * [μ •μ±…] 아이디: 4~15자, 영문/숫자/ν•œκΈ€/특수문자(_,-) ν—ˆμš© + * [μ •μ±…] 아이디: 2~15자, 영문/숫자/ν•œκΈ€/특수문자(_,-) ν—ˆμš© */ - public static final String ADMIN_ID_REGEX = "^[a-zA-Z0-9κ°€-힣_-]{4,15}$"; + public static final String ADMIN_ID_REGEX = "^[a-zA-Z0-9κ°€-힣_-]{2,15}$"; /** * κ΄€λ¦¬μž 아이디 μœ νš¨μ„± μ‹€νŒ¨ λ©”μ‹œμ§€ */ - public static final String ADMIN_ID_MSG = "μ•„μ΄λ””λŠ” 4~15자, 영문/숫자/ν•œκΈ€/특수문자(_,-)만 κ°€λŠ₯ν•©λ‹ˆλ‹€."; + public static final String ADMIN_ID_MSG = "μ•„μ΄λ””λŠ” 2~15자, 영문/숫자/ν•œκΈ€/특수문자(_,-)만 κ°€λŠ₯ν•©λ‹ˆλ‹€."; /** * κ΄€λ¦¬μž λΉ„λ°€λ²ˆν˜Έ 생성 κ·œμΉ™ @@ -42,9 +42,19 @@ public final class CommonConstants { */ public static final String VALID_CODE_NOTBLANK = "valid.common.required"; + /** + * Validator NotBlank errorCode + */ + public static final String VALID_CODE_NOTZERO = "valid.common.notZero"; + /** * ν•Έλ“œν° 번호 κ·œμΉ™ */ public static final String PHONE_REGEX = "^01([0|1|6|7|8|9])-?([0-9]{3,4})-?([0-9]{4})$"; + /** + * Validator Invalid Zero errorCode + */ + public static final String VALID_CODE_INVALID_ZERO = "valid.common.required.value.min"; + } diff --git a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java index 321a3d00..06b0e938 100644 --- a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -46,7 +46,7 @@ public final class DailyRecordConstants { * 일계뢀 등둝 κ°€λŠ₯ 일 * [μ •μ±…] ν•΄λ‹Ήμ›” 15μΌκΉŒμ§€λŠ” 이전달 데이터 등둝 κ°€λŠ₯ * λ‚ μ§œ κΈ°μ€€ μ •μ±… - * TODO 15둜 λ³€κ²½ + * μž„μ‹œλ‘œ 31일둜 μ„€μ •ν•΄λ‘  15일둜 변경해야됨. */ public static final int REGISTER_LIMIT_DAY = 31; @@ -61,7 +61,7 @@ public final class DailyRecordConstants { * 일계뢀 μˆ˜μ • κ°€λŠ₯ 일 * [μ •μ±…] ν•΄λ‹Ήμ›” 15μΌκΉŒμ§€λŠ” 이전달 데이터 μˆ˜μ • κ°€λŠ₯ * λ‚ μ§œ κΈ°μ€€ μ •μ±… - * TODO : 15둜 λ³€κ²½ + * μž„μ‹œλ‘œ 31일둜 μ„€μ •ν•΄λ‘  15일둜 변경해야됨. */ public static final int MODIFY_LIMIT_DAY = 31; diff --git a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java index 90e1a49c..7700d6d5 100644 --- a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java +++ b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java @@ -45,7 +45,6 @@ public class CreateCellService implements CreateCellPortIn { cell.setCellValue(Double.parseDouble(String.valueOf(cellValue))); } catch (NumberFormatException e) { cell.setCellValue(String.valueOf(cellValue)); // 숫자둜 λ³€ν™˜ λΆˆκ°€ μ‹œ λ¬Έμžμ—΄λ‘œ 처리 - // TODO: λ‘œκΉ… λ˜λŠ” μ˜ˆμ™Έ 처리 } } break; @@ -83,10 +82,6 @@ public class CreateCellService implements CreateCellPortIn { // μ…€ μŠ€νƒ€μΌ 적용 (null 체크) if (cellConfig.getCellStyle() != null) { cell.setCellStyle(cellConfig.getCellStyle()); - //} else { - // TODO: cellConfig.getCellStyle()이 null인 경우, μ›Œν¬λΆμ—μ„œ μƒˆλ‘œμš΄ μŠ€νƒ€μΌμ„ μƒμ„±ν•˜κ±°λ‚˜ κΈ°λ³Έ μŠ€νƒ€μΌμ„ μ μš©ν•˜λŠ” 둜직 κ³ λ € - // XSSFWorkbook workbook = (XSSFWorkbook) sheet.getWorkbook(); - // cell.setCellStyle(workbook.createCellStyle()); } // MERGE 병합 @@ -108,7 +103,7 @@ public class CreateCellService implements CreateCellPortIn { private void setMergedRegionBorderStyle( XSSFCellStyle style, CellRangeAddress cellRangeAddress, Sheet sheet) { if (style == null) { - // TODO: μŠ€νƒ€μΌμ΄ μ œκ³΅λ˜μ§€ μ•ŠμœΌλ©΄ κ²½κ³  λ‘œκΉ… λ˜λŠ” κΈ°λ³Έ μŠ€νƒ€μΌ 적용 κ³ λ € + // μŠ€νƒ€μΌμ΄ μ œκ³΅λ˜μ§€ μ•ŠμœΌλ©΄ κ²½κ³  λ‘œκΉ… λ˜λŠ” κΈ°λ³Έ μŠ€νƒ€μΌ 적용 κ³ λ € return; } diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java index 3de8502b..b0a57a6f 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.file.createFile.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UploadFile; +import app.module.core.usecase.file.model.UploadFile; import app.module.core.config.application.enums.FileStorageType; import app.module.core.usecase.file.createFile.ports.CreateFilePortOut; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile; diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileMapper.java b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileMapper.java index b031aef7..5abbb20b 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileMapper.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.file.createFile.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UploadFile; +import app.module.core.usecase.file.model.UploadFile; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/core/src/main/java/app/module/core/usecase/file/downloadFile/adapters/DownloadFileController.java b/core/src/main/java/app/module/core/usecase/file/downloadFile/adapters/DownloadFileController.java deleted file mode 100644 index d9a8f718..00000000 --- a/core/src/main/java/app/module/core/usecase/file/downloadFile/adapters/DownloadFileController.java +++ /dev/null @@ -1,60 +0,0 @@ -package app.module.core.usecase.file.downloadFile.adapters; - -import app.module.core.config.application.util.SftpFileDownloader; -import app.module.core.usecase.file.getFile.ports.GetFilePortIn; -import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; -import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.SftpException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.core.io.FileSystemResource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RestController; - -import java.io.File; -import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - -@Slf4j -@RestController -@RequiredArgsConstructor -class DownloadFileController { - private final GetFilePortIn getFilePortIn; - private final SftpFileDownloader sftpFileDownloader; - - @GetMapping(path = "/api/file/download/{fileId}") - ResponseEntity downloadFile(@PathVariable Long fileId) throws JSchException, SftpException, IOException { - GetFile file = getFilePortIn.operate(new GetFileCmd(fileId)).orElseThrow(() -> new IllegalArgumentException("File not found: " + fileId)); - - // SFTPμ—μ„œ 파일 λ‹€μš΄λ‘œλ“œ - sftpFileDownloader.downloadFile(file); - - // 둜컬 파일 경둜 - File downloadedFile = new File(file.getLocalPath()); - if (!downloadedFile.exists()) { - throw new IllegalStateException("파일 λ‹€μš΄λ‘œλ“œμ— μ‹€νŒ¨ν•˜μ˜€μŠ΅λ‹ˆλ‹€."); - } - - - String encodedFileName = URLEncoder.encode(file.getOriginName(), StandardCharsets.UTF_8) - .replace("+", "%20"); - // HTTP 헀더 μ„€μ • - HttpHeaders headers = new HttpHeaders(); - headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + encodedFileName); - headers.add(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate"); - headers.add(HttpHeaders.PRAGMA, "no-cache"); - headers.add(HttpHeaders.EXPIRES, "0"); - - return ResponseEntity.ok() - .headers(headers) - .contentLength(downloadedFile.length()) - .contentType(MediaType.APPLICATION_OCTET_STREAM) - .body(new FileSystemResource(downloadedFile)); - } -} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java b/core/src/main/java/app/module/core/usecase/file/model/UploadFile.java similarity index 90% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java rename to core/src/main/java/app/module/core/usecase/file/model/UploadFile.java index 42d06f28..1bab2526 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java +++ b/core/src/main/java/app/module/core/usecase/file/model/UploadFile.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.file.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.FileUploadType; diff --git a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpConnector.java b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpConnector.java deleted file mode 100644 index df3a3e46..00000000 --- a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpConnector.java +++ /dev/null @@ -1,71 +0,0 @@ -package app.module.core.usecase.file.saveToStorage.ports.application.strategy; - -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -@Component -@Slf4j -public class SftpConnector { - @Value("${file.upload.sftp.ip}") - private String host; - @Value("${file.upload.sftp.id}") - private String id; - @Value("${file.upload.sftp.password}") - private String password; - - @Value("${file.upload.sftp.port}") - private int port; - - private Session session; - private ChannelSftp channelSftp; - - public void connect() throws JSchException { - - if (host == null || id == null || password == null) { - throw new IllegalStateException("SFTP configuration is incomplete: host=" + host + ", id=" + id + ", password=" + (password != null ? "****" : null)); - } - - try { - JSch jsch = new JSch(); - // μ„Έμ…˜ μ„€μ • - session = jsch.getSession(id, host, port); - session.setPassword(password); - // 호슀트 ν‚€ 검증 λΉ„ν™œμ„±ν™” (개발 ν™˜κ²½μ—μ„œλ§Œ μ‚¬μš©, ν”„λ‘œλ•μ…˜μ—μ„œλŠ” 적절히 μ„€μ •) - session.setConfig("StrictHostKeyChecking", "no"); - // μ—°κ²° - session.connect(); - - // SFTP 채널 μ—΄κΈ° - channelSftp = (ChannelSftp) session.openChannel("sftp"); - channelSftp.connect(); - log.info("SFTP connection established successfully"); - }catch (JSchException e){ - log.error("Failed to connect to SFTP server", e); - } - } - - public void disconnect() { - if (channelSftp != null && channelSftp.isConnected()) { - channelSftp.disconnect(); - log.info("SFTP channel disconnected"); - } - if (session != null && session.isConnected()) { - session.disconnect(); - log.info("SFTP channel disconnected"); - } - } - public boolean isConnected() { - return channelSftp != null && channelSftp.isConnected() && session != null && session.isConnected(); - } - - // ChannelSftp 객체 λ°˜ν™˜ - public ChannelSftp getChannelSftp() { - return channelSftp; - } - -} diff --git a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java deleted file mode 100644 index 606b6a83..00000000 --- a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java +++ /dev/null @@ -1,129 +0,0 @@ -package app.module.core.usecase.file.saveToStorage.ports.application.strategy; - -import app.module.core.config.application.enums.FileStorageType; -import app.module.core.config.application.util.AESEncryptUtil; -import app.module.core.config.application.util.CommonUtil; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.SftpException; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.io.ByteArrayInputStream; -import java.io.IOException; - -@Service -@RequiredArgsConstructor -@Slf4j -public class SftpStorageFileUploadStrategy implements FileUploadStrategy { - @Value("${path.upload.sftp.public}") - private String publicPath; - - private final SftpConnector sftpConnector; - private final AESEncryptUtil aesEncryptUtil; - - @PostConstruct - public void initialize() throws Exception { - log.info("FileIoService - initialize : path.upload.public is {}", publicPath); - - try { - // SFTP μ—°κ²° μ΄ˆκΈ°ν™” - sftpConnector.connect(); - // 원격 디렉토리 생성 - createRemoteDirectories(publicPath); - } catch (JSchException | SftpException e) { - throw new IOException("Could not initialize SFTP connection or directories", e); - } - } - - private void createRemoteDirectories(String path) throws SftpException { - ChannelSftp channelSftp = sftpConnector.getChannelSftp(); - if (channelSftp != null) { - String[] folders = path.split("/"); - String currentPath = ""; - for (String folder : folders) { - if (!folder.isEmpty()) { - currentPath += "/" + folder; - try { - channelSftp.cd(currentPath); - } catch (SftpException e) { - channelSftp.mkdir(currentPath); - channelSftp.cd(currentPath); - } - } - } - } - } - - @Override - public FileStorageType getStorageType() { - return FileStorageType.SFTP; - } - - @Override - public void operate(MultipartFile multipartFile, String createSubPath, String createFilename) throws IOException { - if (multipartFile == null || multipartFile.isEmpty()) { - throw new IllegalArgumentException("파일이 λΉ„μ–΄ μžˆκ±°λ‚˜ nullμž…λ‹ˆλ‹€."); - } - - // 경둜 μ‘°μž‘ λ°©μ§€λ₯Ό μœ„ν•΄ subPath와 filename μœ νš¨μ„± 검사 - if (createSubPath == null || createSubPath.contains("..") || createFilename == null || createFilename.contains("..")) { - throw new IllegalArgumentException("잘λͺ»λœ 파일 경둜 λ˜λŠ” μ΄λ¦„μž…λ‹ˆλ‹€."); - } - - // λ©”λͺ¨λ¦¬ λ‚΄μ—μ„œ 파일 μ•”ν˜Έν™” - byte[] encryptedContent; - try { - byte[] fileContent = multipartFile.getBytes(); // νŒŒμΌμ„ λ©”λͺ¨λ¦¬λ‘œ 직접 읽음 - encryptedContent = aesEncryptUtil.encryptAesCbc(fileContent); // μ•”ν˜Έν™” - } catch (Exception e) { - log.error("파일 μ•”ν˜Έν™” μ‹€νŒ¨: {}", createFilename, e); - throw new IOException("파일 μ•”ν˜Έν™”μ— μ‹€νŒ¨ν–ˆμŠ΅λ‹ˆλ‹€.", e); - } - - // SFTP 경둜 생성 - String remotePath = CommonUtil.removeLastChar(publicPath, "/") + createSubPath; - String remoteFilePath = remotePath + "/encrypted_" + createFilename; - - // SFTP μ—…λ‘œλ“œ - try { - // μ—°κ²° μƒνƒœ 확인 및 μž¬μ—°κ²° (μ΅œλŒ€ 3회 μ‹œλ„) - int retryCount = 0; - while (!sftpConnector.isConnected() && retryCount < 3) { - log.warn("SFTP 연결이 λŠκ²ΌμŠ΅λ‹ˆλ‹€. μž¬μ—°κ²° μ‹œλ„ {}회", retryCount + 1); - sftpConnector.connect(); - retryCount++; - } - if (!sftpConnector.isConnected()) { - throw new IOException("SFTP μ„œλ²„μ— μ—°κ²°ν•  수 μ—†μŠ΅λ‹ˆλ‹€."); - } - - createRemoteDirectories(remotePath); - ChannelSftp channelSftp = sftpConnector.getChannelSftp(); - if (channelSftp == null) { - throw new SftpException(ChannelSftp.SSH_FX_NO_CONNECTION, "SFTP 채널이 μ΄ˆκΈ°ν™”λ˜μ§€ μ•Šμ•˜μŠ΅λ‹ˆλ‹€."); - } - - // μ•”ν˜Έν™”λœ λ‚΄μš©μ„ SFTP에 직접 μ—…λ‘œλ“œ - try (ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(encryptedContent)) { - channelSftp.put(encryptedInputStream, remoteFilePath); - channelSftp.chmod(0644, remoteFilePath); // 파일 κΆŒν•œ μ„€μ • - log.info("μ•”ν˜Έν™”λœ 파일이 SFTP에 μ—…λ‘œλ“œλ˜μ—ˆμŠ΅λ‹ˆλ‹€: {}", remoteFilePath); - } - } catch (SftpException | JSchException e) { - log.error("SFTP μ—…λ‘œλ“œ μ‹€νŒ¨: {}", remoteFilePath, e); - throw new IOException("SFTP에 파일 μ—…λ‘œλ“œ μ‹€νŒ¨", e); - } - - } - - @PreDestroy - public void cleanup() { - sftpConnector.disconnect(); - } -} diff --git a/core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java b/core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java index e25e5a0e..b1441115 100644 --- a/core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java +++ b/core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java @@ -2,7 +2,6 @@ package app.module.core.usecase.file.updateFile.adapters.persistence; import app.module.core.config.application.annotation.DeleteCommand; import app.module.core.config.application.util.AuditUtil; -import app.module.core.config.application.util.SftpFileDeleteUtil; import app.module.core.usecase.file.updateFile.ports.UpdateFilePortOut; import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateFileCmd; import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateUploadFileParam; @@ -18,7 +17,6 @@ import java.util.List; @RequiredArgsConstructor class UpdateFileDao implements UpdateFilePortOut { private final UpdateFileMapper mapper; - private final SftpFileDeleteUtil sftpFileDeleteUtil; @Override @DeleteCommand @@ -30,18 +28,6 @@ class UpdateFileDao implements UpdateFilePortOut { command.getType().getName() ))); -/* for (UploadFileDto file : deletedFileList) { - try { - sftpFileDeleteUtil.deleteRealFile(file); - } catch (JSchException | SftpException e) { - log.error("Failed to delete file from SFTP for mapping ID {}: {}", file.getId(), e.getMessage(), e); - throw new RuntimeException("Failed to delete file from SFTP", e); - } catch (Exception e) { - log.error("Unexpected error while deleting file for mapping ID {}: {}", file.getId(), e.getMessage(), e); - throw new RuntimeException("Unexpected error while deleting file", e); - } - }*/ - if (!deletedFileList.isEmpty()) { mapper.deleteFile( AuditUtil.delete(new UpdateUploadFileParam( diff --git a/core/src/main/java/app/module/core/usecase/file/url/strategy/SftpFileUrlStrategy.java b/core/src/main/java/app/module/core/usecase/file/url/strategy/SftpFileUrlStrategy.java deleted file mode 100644 index 34f25031..00000000 --- a/core/src/main/java/app/module/core/usecase/file/url/strategy/SftpFileUrlStrategy.java +++ /dev/null @@ -1,24 +0,0 @@ -package app.module.core.usecase.file.url.strategy; - -import app.module.core.config.application.enums.FileStorageType; -import org.springframework.stereotype.Service; - -@Service -public class SftpFileUrlStrategy implements FileUrlStrategy { - - @Override - public FileStorageType getStorageType() { - return FileStorageType.SFTP; - } - - @Override - public String getInlineURL(String subPath, String filename) { - return String.format("/content-disposition/inline%s/%s", subPath, filename); - } - - @Override - public String getAttachmentURL(Long fileId) { - return String.format("/content-disposition/attachment/%s", fileId); - } - -} diff --git a/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java b/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java index 11aa3da5..ca22f3c8 100644 --- a/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java +++ b/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java @@ -1,7 +1,6 @@ package app.module.core.usecase.getAttachment.adapters.web; import app.module.core.config.application.enums.FileStorageType; -import app.module.core.config.application.util.SftpFileDownloader; import app.module.core.usecase.file.getFile.ports.GetFilePortIn; import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd; @@ -33,7 +32,6 @@ import java.nio.file.Paths; class GetAttachmentController { private final GetFilePortIn getFilePortIn; - private final SftpFileDownloader sftpFileDownloader; @Value("${path.upload.public}") private String publicPath; @@ -56,22 +54,6 @@ class GetAttachmentController { .body("νŒŒμΌμ„ 찾을 수 μ—†μŠ΅λ‹ˆλ‹€: " + e.getMessage()); } -// TODO - private μ—…λ‘œλ“œ κΈ°λŠ₯을 일단 mute - -// boolean isPrivate = !getFile.getType().isPubic(); -// -// if (isPrivate) { -// Authentication auth = SecurityContextHolder.getContext().getAuthentication(); -// auth.getAuthorities().stream() -// .filter( -// grantedAuthority -> -// grantedAuthority.getAuthority().equals("ROLE_SUPER") -// || grantedAuthority.getAuthority().equals("PRIVATE_DOWNLOAD")) -// .findFirst() -// .orElseThrow( -// () -> new AccessDeniedException("[AccessDenied] Private 파일 λ¦¬μ†ŒμŠ€ μ ‘κ·Ό κΆŒν•œμ΄ μ—†μŠ΅λ‹ˆλ‹€.")); -// } - // HTTP 헀더 μ„€μ • String encodedFileName = URLEncoder.encode(getFile.getOriginName(), StandardCharsets.UTF_8) .replace("+", "%20"); @@ -109,25 +91,6 @@ class GetAttachmentController { .contentType(MediaType.APPLICATION_OCTET_STREAM) .body(s3Resource); - case SFTP: - try { - sftpFileDownloader.downloadFile(getFile); - } catch (JSchException | SftpException | IOException e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) - .body("SFTP 파일 λ‹€μš΄λ‘œλ“œμ— μ‹€νŒ¨ν–ˆμŠ΅λ‹ˆλ‹€ " + e.getMessage()); - } - File downloadedFile = new File(getFile.getLocalPath()); - if (!downloadedFile.exists()) { - return ResponseEntity.status(HttpStatus.NOT_FOUND) - .body("λ‹€μš΄λ‘œλ“œλœ νŒŒμΌμ„ 찾을 수 μ—†μŠ΅λ‹ˆλ‹€ " + getFile.getLocalPath()); - } - - return ResponseEntity.ok() - .headers(headers) - .contentLength(downloadedFile.length()) - .contentType(MediaType.APPLICATION_OCTET_STREAM) - .body(new FileSystemResource(downloadedFile)); - default: return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body("μ§€μ›λ˜μ§€ μ•ŠλŠ” μ €μž₯μ†Œ νƒ€μž…μž…λ‹ˆλ‹€: " + uploadStorageType); diff --git a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java index 47d42c27..987aaf86 100644 --- a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.loggedinuser.save.adapter.persistence; -import app.module.core.config.adapters.persistence.entity.LoggedInUser; +import app.module.core.usecase.loggedinuser.save.adapter.persistence.model.LoggedInUser; import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortOut; import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveMapper.java b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveMapper.java index 2a8732a4..5b0864a5 100644 --- a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.loggedinuser.save.adapter.persistence; -import app.module.core.config.adapters.persistence.entity.LoggedInUser; +import app.module.core.usecase.loggedinuser.save.adapter.persistence.model.LoggedInUser; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/model/LoggedInUser.java similarity index 54% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java rename to core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/model/LoggedInUser.java index cd328306..88485e6a 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java +++ b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/model/LoggedInUser.java @@ -1,20 +1,18 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.loggedinuser.save.adapter.persistence.model; -import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; import lombok.*; import java.time.LocalDateTime; /** - * λ™μ‹œμ ‘μ† μ‚¬μš©μž 체크λ₯Ό μœ„ν•œ 기둝용 μ—”ν‹°ν‹° + * μ‚¬μš©μž 둜그 */ -@Builder @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class LoggedInUser extends AuditEntity { +public class LoggedInUser { private AppType appType; diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java b/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java deleted file mode 100644 index 49ad29fc..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java +++ /dev/null @@ -1,35 +0,0 @@ -package app.module.core.usecase.operationlog.list.adapter.persistence; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import app.module.core.usecase.operationlog.list.application.port.out.OperationLogListPortOut; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.ListUtils; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -@RequiredArgsConstructor -class OperationLogListDao implements OperationLogListPortOut { - - private final OperationLogMapper operationLogMapper; - - @Override - public Page connect( - Pageable pageable, OperationLogListFilterCommand operationLogListFilterCommand) { - - // 둜그 λͺ©λ‘ 쑰회 - List contents = ListUtils.emptyIfNull( - operationLogMapper.getLogs(pageable, operationLogListFilterCommand)); - - return new PageImpl<>( - contents, - pageable, - contents.isEmpty() ? 0 : contents.get(0).getTotal() - ); - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java b/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java deleted file mode 100644 index adca345e..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.operationlog.list.adapter.persistence; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; - -import java.util.List; - -@Mapper -public interface OperationLogMapper { - List getLogs( - @Param("pageable") Pageable pageable, - @Param("cmd") OperationLogListFilterCommand cmd - ); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java deleted file mode 100644 index cde4c942..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java +++ /dev/null @@ -1,42 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.domain; - -import app.module.core.config.application.component.AuditOutput; -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.enums.OperationLogType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -public class OperationLogElement implements AuditOutput { - private String createdBy; - private LocalDateTime createdAt; - // κ³ μœ ν‚€ - private Long id; - // App νƒ€μž… - private AppType appType; - // μˆ˜ν–‰ μž‘μ—… νƒ€μž… - private OperationLogType operationLogType; - // νƒ€κ²Ÿ 계정 - private String targetId; - // 접속 아이피 - private String ip; - // μˆ˜ν–‰ λ‚΄μš© μ„€λͺ… - private String taskDesc; - // 총개수 - Long total; - - @Override - public String getUpdatedBy() { - return null; - } - - @Override - public LocalDateTime getUpdatedAt() { - return null; - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogListFilterCommand.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogListFilterCommand.java deleted file mode 100644 index 75698944..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogListFilterCommand.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.domain; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class OperationLogListFilterCommand { - - private String searchField; - private String searchValue; - private String searchAppType; - private String searchOperationType; -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListPortIn.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListPortIn.java deleted file mode 100644 index 94015040..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.port.in; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -public interface OperationLogListPortIn { - - Page connect(Pageable pageable, OperationLogListFilterCommand condition); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListService.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListService.java deleted file mode 100644 index 8286af30..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/in/OperationLogListService.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.port.in; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import app.module.core.usecase.operationlog.list.application.port.out.OperationLogListPortOut; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class OperationLogListService implements OperationLogListPortIn { - - private final OperationLogListPortOut portOut; - - @Override - public Page connect( - Pageable pageable, OperationLogListFilterCommand condition) { - return portOut.connect(pageable, condition); - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/out/OperationLogListPortOut.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/out/OperationLogListPortOut.java deleted file mode 100644 index cbff12f1..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/port/out/OperationLogListPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.operationlog.list.application.port.out; - -import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; -import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -public interface OperationLogListPortOut { - - Page connect(Pageable pageable, OperationLogListFilterCommand condition); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveDao.java b/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveDao.java deleted file mode 100644 index 97bc9edc..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveDao.java +++ /dev/null @@ -1,26 +0,0 @@ -package app.module.core.usecase.operationlog.save.adapter.persistence; - -import app.module.core.config.adapters.persistence.entity.OperationLog; -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.out.OperationLogSavePortOut; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class OperationLogSaveDao implements OperationLogSavePortOut { - - private final OperationLogSaveMapper mapper; - - @Override - public void connect(OperationLogSaveCommand saveCommand) { - mapper.insertOperationLog(new OperationLog( - null, - saveCommand.getAppType(), - saveCommand.getOperationLogType(), - saveCommand.getTargetId(), - saveCommand.getIp(), - saveCommand.getTaskDesc() - )); - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveMapper.java b/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveMapper.java deleted file mode 100644 index 1cff444c..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/adapter/persistence/OperationLogSaveMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.core.usecase.operationlog.save.adapter.persistence; - -import app.module.core.config.adapters.persistence.entity.OperationLog; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface OperationLogSaveMapper { - void insertOperationLog(OperationLog log); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/application/domain/OperationLogSaveCommand.java b/core/src/main/java/app/module/core/usecase/operationlog/save/application/domain/OperationLogSaveCommand.java deleted file mode 100644 index 00043e9f..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/application/domain/OperationLogSaveCommand.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.usecase.operationlog.save.application.domain; - -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.enums.OperationLogType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -public class OperationLogSaveCommand { - - // App νƒ€μž… - private AppType appType; - // μˆ˜ν–‰ μž‘μ—… νƒ€μž… - private OperationLogType operationLogType; - // νƒ€κ²Ÿ 계정 - private String targetId; - - // 접속 아이피 - private String ip; - // μˆ˜ν–‰ λ‚΄μš© μ„€λͺ… - private String taskDesc; -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSavePortIn.java b/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSavePortIn.java deleted file mode 100644 index 91ff00dc..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSavePortIn.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.operationlog.save.application.port.in; - -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; - -public interface OperationLogSavePortIn { - - void connect(OperationLogSaveCommand saveCommand); -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSaveService.java b/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSaveService.java deleted file mode 100644 index 6ff2fd99..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/in/OperationLogSaveService.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.operationlog.save.application.port.in; - -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; -import app.module.core.usecase.operationlog.save.application.port.out.OperationLogSavePortOut; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class OperationLogSaveService implements OperationLogSavePortIn { - - private final OperationLogSavePortOut operationLogSavePortout; - - @Override - public void connect(OperationLogSaveCommand saveCommand) { - operationLogSavePortout.connect(saveCommand); - } -} diff --git a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/out/OperationLogSavePortOut.java b/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/out/OperationLogSavePortOut.java deleted file mode 100644 index cef8f2ca..00000000 --- a/core/src/main/java/app/module/core/usecase/operationlog/save/application/port/out/OperationLogSavePortOut.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.operationlog.save.application.port.out; - -import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; - -public interface OperationLogSavePortOut { - - void connect(OperationLogSaveCommand saveCommand); -} diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java index 52d71432..9cbe2be9 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.role.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeDeleteParam; diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveMapper.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveMapper.java index de2d3a4e..3fd0dff1 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.role.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeDeleteParam; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam; import org.apache.ibatis.annotations.Mapper; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java b/core/src/main/java/app/module/core/usecase/uicode/model/UICode.java similarity index 82% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java rename to core/src/main/java/app/module/core/usecase/uicode/model/UICode.java index 3ce8ee01..4efa5f56 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java +++ b/core/src/main/java/app/module/core/usecase/uicode/model/UICode.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.uicode.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import lombok.AllArgsConstructor; @@ -10,7 +10,7 @@ import lombok.Setter; @Setter @RequiredArgsConstructor @AllArgsConstructor -public class UICode extends AuditEntity { +public class UICode { private String id; diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java index a31ec87f..ddd17a8a 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uicode.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UICode; +import app.module.core.usecase.uicode.model.UICode; import app.module.core.usecase.uicode.save.ports.UICodeSavePortOut; import app.module.core.usecase.uicode.save.ports.application.domain.UICodeSaveCommand; import app.module.core.usecase.uicode.view.adapters.persistence.UICodeViewMapper; diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveMapper.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveMapper.java index 8b5ee972..71befefe 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uicode.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UICode; +import app.module.core.usecase.uicode.model.UICode; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/domain/UICodeSortCommand.java b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/domain/UICodeSortCommand.java index ab65f641..4bc7d01a 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/domain/UICodeSortCommand.java +++ b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/domain/UICodeSortCommand.java @@ -1,5 +1,6 @@ package app.module.core.usecase.uicode.sort.ports.application.domain; +import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -7,7 +8,7 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class UICodeSortCommand { +public class UICodeSortCommand extends AuditCommand { private String id; private Integer orderNo; diff --git a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java index dfcfd939..07169cdb 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uicode.toptier.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UICode; +import app.module.core.usecase.uicode.model.UICode; import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortOut; import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTopTier; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java index 9a92296c..222a67fb 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uicode.toptier.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UICode; +import app.module.core.usecase.uicode.model.UICode; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java index 505b5420..b8754daf 100644 --- a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java +++ b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.currentmatch.ports.application; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.uri.currentmatch.ports.URICurrentMatchingPortIn; diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java index 6d2ebef9..4de2ffcf 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java @@ -1,7 +1,7 @@ package app.module.core.usecase.uri.getUris.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; -import app.module.core.config.adapters.persistence.entity.RoleHasPrivilege; +import app.module.core.usecase.uri.model.Role; +import app.module.core.usecase.uri.model.RoleHasPrivilege; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetRolesDto; import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetUrisDto; diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java index 49a64940..5fc346b4 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.getUris.ports.application.domain; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java b/core/src/main/java/app/module/core/usecase/uri/model/Role.java similarity index 93% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java rename to core/src/main/java/app/module/core/usecase/uri/model/Role.java index 9b001646..bb2602e6 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java +++ b/core/src/main/java/app/module/core/usecase/uri/model/Role.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.uri.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java b/core/src/main/java/app/module/core/usecase/uri/model/RoleHasPrivilege.java similarity index 86% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java rename to core/src/main/java/app/module/core/usecase/uri/model/RoleHasPrivilege.java index 1f8f4109..96e56ab7 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java +++ b/core/src/main/java/app/module/core/usecase/uri/model/RoleHasPrivilege.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.uri.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java b/core/src/main/java/app/module/core/usecase/uri/model/URI.java similarity index 94% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java rename to core/src/main/java/app/module/core/usecase/uri/model/URI.java index e10ef5d7..f0ea9698 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java +++ b/core/src/main/java/app/module/core/usecase/uri/model/URI.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.uri.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java index 991e9cf6..3b923c35 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.URI; +import app.module.core.usecase.uri.model.URI; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleDeleteParam; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleSaveParam; diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java index c32d5a9c..6b985547 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.URI; +import app.module.core.usecase.uri.model.URI; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleDeleteParam; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleSaveParam; import org.apache.ibatis.annotations.Mapper; diff --git a/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java b/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java index 40687f72..7d8737c1 100644 --- a/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java +++ b/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java @@ -1,6 +1,6 @@ package app.module.core.usecase.uri.view.ports.application; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; import app.module.core.usecase.uri.view.ports.URIViewPortIn; diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java deleted file mode 100644 index 5af5fd60..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java +++ /dev/null @@ -1,60 +0,0 @@ -package app.module.core.usecase.user.createUser.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.user.createUser.adapters.persistence.model.SaveFrontUserHasRoleParam; -import app.module.core.usecase.user.createUser.ports.CreateUserPortOut; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.Optional; - -@Repository -@RequiredArgsConstructor -class CreateUserDao implements CreateUserPortOut { - - private final CreateUserMapper mapper; - - @Override - @Transactional - public Optional operate(CreateUserCmd cmd) { - - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - mapper.insertFrontUser( - new FrontUser( - cmd.getId(), - cmd.getPassword(), - cmd.getEmail(), - cmd.getNickname(), - cmd.getSignUpType(), - LocalDateTime.now(), - cmd.isAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked(), - null - )); - - if(CollectionUtils.isNotEmpty(cmd.getRoles())) { - mapper.insertFrontUserHasRoles(new SaveFrontUserHasRoleParam( - cmd.getId(), cmd.getRoles(), now, userId, now, userId, false - )); - } - - return Optional.of(new CreateUser( - cmd.getId(), - cmd.getPassword(), - cmd.getEmail(), - cmd.isAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked(), - cmd.getRoles() - )); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserMapper.java b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserMapper.java deleted file mode 100644 index aaea5c46..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.createUser.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.usecase.user.createUser.adapters.persistence.model.SaveFrontUserHasRoleParam; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CreateUserMapper { - void insertFrontUser(FrontUser user); - void insertFrontUserHasRoles(SaveFrontUserHasRoleParam param); -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java deleted file mode 100644 index f6f5a1b5..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java +++ /dev/null @@ -1,21 +0,0 @@ -package app.module.core.usecase.user.createUser.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -public class SaveFrontUserHasRoleParam { - private String userId; - private Set roleIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private boolean deleted; -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java deleted file mode 100644 index 7d6fb3f3..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.createUser.ports; - -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; - -import java.util.Optional; - -public interface CreateUserPortIn { - - Optional operate(CreateUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java deleted file mode 100644 index 5e842578..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.createUser.ports; - -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; - -import java.util.Optional; - -public interface CreateUserPortOut { - - Optional operate(CreateUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java deleted file mode 100644 index 37a01e5d..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.usecase.user.createUser.ports.application; - -import app.module.core.usecase.user.createUser.ports.CreateUserPortIn; -import app.module.core.usecase.user.createUser.ports.CreateUserPortOut; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -@Service -@RequiredArgsConstructor -class CreateUserService implements CreateUserPortIn { - - private final CreateUserPortOut portOut; - private final BCryptPasswordEncoder passwordEncoder; - - @Override - public Optional operate(CreateUserCmd command) { - command.setPassword(passwordEncoder.encode(command.getPassword())); - return portOut.operate(command); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java deleted file mode 100644 index f42225a3..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.createUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateUser { - private String id; - private String password; - private String email; - private boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java deleted file mode 100644 index 46ac6445..00000000 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.usecase.user.createUser.ports.application.domain; - -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateUserCmd { - private String id; - private String password; - private String email; - private String nickname; - private SignUpType signUpType; - private boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java deleted file mode 100644 index c5e19d6f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java +++ /dev/null @@ -1,51 +0,0 @@ -package app.module.core.usecase.user.findUser.adapters.persistence; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.application.enums.FileUploadType; -import app.module.core.usecase.user.findUser.adapters.persistence.model.FindUserDto; -import app.module.core.usecase.user.findUser.ports.FindUserPortOut; -import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Optional; -import java.util.Set; - -@Repository -@RequiredArgsConstructor -class FindUserDao implements FindUserPortOut { - - private final FindUserMapper mapper; - - @Override - @Transactional - public Optional operate(FindUserCmd command) { - String id = command.getId(); - - FindUserDto dto = mapper.findUserById(id); - List roles = mapper.findRolesWithPrivilegesByUserId(id); - FindProfileImages image = mapper.findProfileImageByUserId(id, FileUploadType.PRIVATE.name()); - - return Optional.of(new FindUser( - dto.getId(), - dto.getPassword(), - dto.getEmail(), - dto.getNickname(), - dto.getSignUpType(), - dto.getPasswordUpdatedAt(), - dto.getAccountDisabled(), - dto.getLoginFailCnt(), - dto.getAccountLocked(), - dto.getCreatedAt(), - dto.getCreatedBy(), - dto.getUpdatedAt(), - dto.getUpdatedBy(), - Set.copyOf(roles), - image - )); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java deleted file mode 100644 index d1d2f43c..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.user.findUser.adapters.persistence; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.usecase.user.findUser.adapters.persistence.model.FindUserDto; -import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface FindUserMapper { - FindUserDto findUserById(String id); - List findRolesWithPrivilegesByUserId(String userId); - FindProfileImages findProfileImageByUserId( - @Param("userId") String userId, - @Param("fileUploadType") String fileUploadType); -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java deleted file mode 100644 index b89174b5..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package app.module.core.usecase.user.findUser.adapters.persistence.model; - -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -public class FindUserDto { - private String id; - private String password; - private String email; - private String nickname; - private SignUpType signUpType; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java deleted file mode 100644 index df97bbf9..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.findUser.ports; - -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; - -import java.util.Optional; - -public interface FindUserPortIn { - - Optional operate(FindUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java deleted file mode 100644 index 1a21eb90..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.findUser.ports; - -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; - -import java.util.Optional; - -public interface FindUserPortOut { - - Optional operate(FindUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java deleted file mode 100644 index 7c85a835..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java +++ /dev/null @@ -1,51 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application; - -import app.module.core.config.application.enums.FileStorageType; -import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; -import app.module.core.usecase.user.findUser.ports.FindUserPortIn; -import app.module.core.usecase.user.findUser.ports.FindUserPortOut; -import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -@Service -@RequiredArgsConstructor -class FindUserService implements FindUserPortIn { - - private final FindUserPortOut portOut; - private final FileUrlPortIn fileUrlPortIn; - - @Value("${path.upload.storage}") - private String uploadStorageType; - - @Override - public Optional operate(FindUserCmd command) { - return portOut - .operate(command) - .flatMap( - findUser -> { - FindProfileImages profileImg = findUser.getUploadFile(); - - if (profileImg != null) { - // μ°Έμ‘° URL 전달 - profileImg.setReferURL( - fileUrlPortIn.getInline( - FileStorageType.valueOf(uploadStorageType), - profileImg.getPath(), - profileImg.getName())); - - // attachment URL 전달 - profileImg.setAttachmentURL( - fileUrlPortIn.getAttachment( - FileStorageType.valueOf(uploadStorageType), profileImg.getId())); - } - - return Optional.of(findUser); - }); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java deleted file mode 100644 index 0f6299e4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import app.module.core.config.application.enums.FileUploadType; -import lombok.*; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -public class FindProfileImages { - private Long id; - private FileUploadType type; - private String path; - private String name; - private String originName; - private Long fileLength; - private String referURL; - private String attachmentURL; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java deleted file mode 100644 index 74e7631a..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java +++ /dev/null @@ -1,33 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class FindUser { - private String id; - private String password; - private String email; - private String nickname; - private SignUpType signUpType; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private Set roles; - private FindProfileImages uploadFile; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserCmd.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserCmd.java deleted file mode 100644 index 5e36de37..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserCmd.java +++ /dev/null @@ -1,15 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class FindUserCmd { - - private String id; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserPrivilege.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserPrivilege.java deleted file mode 100644 index d0604b85..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserPrivilege.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class FindUserPrivilege { - - private String id; - private String description; - private Integer orderNo; -} diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java deleted file mode 100644 index efb8b4c4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.user.findUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class FindUserRole { - - private String id; - private String description; - private Integer orderNo; - private Set privileges; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java b/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java deleted file mode 100644 index ab7d5af3..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java +++ /dev/null @@ -1,21 +0,0 @@ -package app.module.core.usecase.user.getRoles.adapters.persistence; - -import app.module.core.usecase.user.getRoles.ports.GetRolesPortOut; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -@RequiredArgsConstructor -class GetRolesDao implements GetRolesPortOut { - - private final GetRolesMapper mapper; - - @Override - public List operate(GetRolesCmd command) { - return mapper.findByAppType(command); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java b/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java deleted file mode 100644 index dd3d158f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.core.usecase.user.getRoles.adapters.persistence; - -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface GetRolesMapper { - List findByAppType(GetRolesCmd cmd); -} diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java deleted file mode 100644 index 7ce9107c..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports; - -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; - -import java.util.List; - -public interface GetRolesPortIn { - - List operate(GetRolesCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java deleted file mode 100644 index a5fc84ca..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports; - -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; - -import java.util.List; - -public interface GetRolesPortOut { - - List operate(GetRolesCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java deleted file mode 100644 index 8c5fa4f0..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports.application; - -import app.module.core.usecase.user.getRoles.ports.GetRolesPortIn; -import app.module.core.usecase.user.getRoles.ports.GetRolesPortOut; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; -import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@RequiredArgsConstructor -class GetRolesService implements GetRolesPortIn { - - private final GetRolesPortOut portOut; - - @Override - public List operate(GetRolesCmd command) { - return portOut.operate(command); - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java deleted file mode 100644 index be90704f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetRoles { - private String id; - private String description; - private Integer orderNo; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRolesCmd.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRolesCmd.java deleted file mode 100644 index 36becaf6..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRolesCmd.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.user.getRoles.ports.application.domain; - -import app.module.core.config.application.enums.AppType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetRolesCmd { - - private AppType appType; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java deleted file mode 100644 index 95574a6a..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java +++ /dev/null @@ -1,56 +0,0 @@ -package app.module.core.usecase.user.getUsers.adapters.persistence; - -import app.module.core.usecase.user.getUsers.adapters.persistence.model.GetUsersDto; -import app.module.core.usecase.user.getUsers.ports.GetUsersPortOut; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersRole; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.stream.Collectors; - -@Repository -@RequiredArgsConstructor -class GetUsersDao implements GetUsersPortOut { - - private final GetUsersMapper mapper; - - @Override - @Transactional - public Page operate(Pageable pageable, GetUsersCmd command) { - // μ‚¬μš©μž λͺ©λ‘ 쑰회 - List users = mapper.getUsers(command, pageable); - - // μ‚¬μš©μžμ˜ μ—­ν•  λͺ©λ‘ μ–»κΈ° - List roles = - mapper.findRolesWithPrivilegesByUserIds(users.stream().map(GetUsersDto::getId).toList()); - - return new PageImpl<>( - users.stream() - .map(user -> new GetUsers( - user.getId(), - user.getEmail(), - user.getNickname(), - user.getSignUpType(), - user.getPasswordUpdatedAt(), - user.getAccountDisabled(), - user.getLoginFailCnt(), - user.getAccountLocked(), - user.getCreatedAt(), - user.getCreatedBy(), - user.getUpdatedAt(), - user.getUpdatedBy(), - roles.stream() - .filter(r -> r.getUserId().equals(user.getId())) - .collect(Collectors.toSet()) - )).toList(), - pageable, - users.isEmpty() ? 0 : users.get(0).getTotal()); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java deleted file mode 100644 index 45259c75..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.core.usecase.user.getUsers.adapters.persistence; - -import app.module.core.usecase.user.getUsers.adapters.persistence.model.GetUsersDto; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersRole; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; - -import java.util.List; - -@Mapper -public interface GetUsersMapper { - List getUsers( - @Param("cmd") GetUsersCmd cmd, - @Param("pageable") Pageable pageable); - - List findRolesWithPrivilegesByUserIds(@Param("ids") List ids); -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java deleted file mode 100644 index 213906ea..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java +++ /dev/null @@ -1,25 +0,0 @@ -package app.module.core.usecase.user.getUsers.adapters.persistence.model; - -import app.module.core.config.application.enums.SignUpType; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -public class GetUsersDto { - private String id; - private String email; - private String nickname; - private SignUpType signUpType; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private Long total; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortIn.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortIn.java deleted file mode 100644 index bf5d5868..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortIn.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports; - -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -public interface GetUsersPortIn { - - Page operate(Pageable pageable, GetUsersCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortOut.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortOut.java deleted file mode 100644 index 84d5e6ad..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/GetUsersPortOut.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports; - -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - -public interface GetUsersPortOut { - - Page operate(Pageable pageable, GetUsersCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/GetUsersService.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/GetUsersService.java deleted file mode 100644 index acf0a1e4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/GetUsersService.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application; - -import app.module.core.usecase.user.getUsers.ports.GetUsersPortIn; -import app.module.core.usecase.user.getUsers.ports.GetUsersPortOut; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; -import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetUsersService implements GetUsersPortIn { - - private final GetUsersPortOut portOut; - - @Override - public Page operate(Pageable pageable, GetUsersCmd command) { - return portOut.operate(pageable, command); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java deleted file mode 100644 index 1d64e9e5..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java +++ /dev/null @@ -1,30 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application.domain; - -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetUsers { - private String id; - private String email; - private String nickname; - private SignUpType signUpType; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersCmd.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersCmd.java deleted file mode 100644 index 1d9a3fea..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersCmd.java +++ /dev/null @@ -1,16 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetUsersCmd { - private final String searchField; - private final String searchValue; - private final String searchRole; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java deleted file mode 100644 index 29c5c2ac..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java +++ /dev/null @@ -1,13 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application.domain; - -import lombok.*; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -public class GetUsersPrivilege { - private String id; - private String description; -} diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java deleted file mode 100644 index 58d077f4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.core.usecase.user.getUsers.ports.application.domain; - -import lombok.*; - -import java.util.Set; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode -public class GetUsersRole { - private String id; - private String userId; - private String description; - private Set privileges; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java deleted file mode 100644 index 54b14c34..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java +++ /dev/null @@ -1,56 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserHasUploadFileParam; -import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserParam; -import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortOut; -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserOutCmd; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; - -import java.time.LocalDateTime; - -@Repository -@RequiredArgsConstructor -class UpdateFrontUserDao implements UpdateFrontUserPortOut { - - private final UpdateFrontUserMapper mapper; - - @Override - public void operate(UpdateFrontUserOutCmd cmd) { - String userId = cmd.getId(); - String loginUser = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - // μ‚¬μš©μž κΈ°λ³Έ 정보 μˆ˜μ • - mapper.updateFrontUser( - new FrontUser( - userId, - cmd.getPassword(), - cmd.getEmail(), - cmd.getNickname(), - cmd.getSignUpType(), - cmd.getPasswordUpdatedAt(), - cmd.getAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked(), - null - ) - ); - - // μ—…λ‘œλ“œ 파일 λ§€ν•‘ 재처리 - if (CollectionUtils.isNotEmpty(cmd.getFileMappingId())) { - // 파일 μ‚­μ œ - mapper.deleteFrontUserHasUploadFiles( - new UpdateFrontUserParam(userId, now, loginUser, now, loginUser)); - // μ €μž₯ - mapper.insertFrontUserHasUploadFiles( - new UpdateFrontUserHasUploadFileParam( - userId, - cmd.getFileMappingId().stream().map(Long::parseLong).toList(), - now, loginUser, now, loginUser)); - } - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java deleted file mode 100644 index 0b0fd8b6..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserHasUploadFileParam; -import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserParam; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UpdateFrontUserMapper { - void updateFrontUser(FrontUser user); - void deleteFrontUserHasUploadFiles(UpdateFrontUserParam param); - void insertFrontUserHasUploadFiles(UpdateFrontUserHasUploadFileParam param); -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java deleted file mode 100644 index d41d8e2b..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.List; - -@Getter -@Setter -@AllArgsConstructor -public class UpdateFrontUserHasUploadFileParam { - private String userId; - private List fileIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java deleted file mode 100644 index 0b399dd3..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -public class UpdateFrontUserParam { - private String userId; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortIn.java deleted file mode 100644 index c6b01056..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortIn.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports; - -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserInCmd; - -public interface UpdateFrontUserPortIn { - - void operate(UpdateFrontUserInCmd inCommand); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortOut.java deleted file mode 100644 index bb89956f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/UpdateFrontUserPortOut.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports; - -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserOutCmd; - -public interface UpdateFrontUserPortOut { - - void operate(UpdateFrontUserOutCmd outCommand); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java deleted file mode 100644 index aae83b3c..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java +++ /dev/null @@ -1,54 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports.application; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.user.findUser.ports.FindUserPortIn; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortIn; -import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortOut; -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserInCmd; -import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserOutCmd; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.stereotype.Service; -import org.thymeleaf.util.StringUtils; - -import java.time.LocalDateTime; -import java.util.stream.Collectors; - -@Service -@RequiredArgsConstructor -class UpdateFrontUserService implements UpdateFrontUserPortIn { - - private final UpdateFrontUserPortOut portOut; - private final FindUserPortIn findUserPortIn; - private final BCryptPasswordEncoder passwordEncoder; - - @Override - public void operate(UpdateFrontUserInCmd cmd) { - FindUser findUser = - findUserPortIn.operate(new FindUserCmd(CommonUtil.getLoginUsername())).orElseThrow(); - - portOut.operate( - new UpdateFrontUserOutCmd( - findUser.getId(), - StringUtils.isEmptyOrWhitespace(cmd.getPassword()) - ? findUser.getPassword() - : passwordEncoder.encode(cmd.getPassword()), - StringUtils.isEmptyOrWhitespace(cmd.getPassword()) - ? findUser.getPasswordUpdatedAt() - : LocalDateTime.now(), - cmd.getEmail(), - cmd.getNickname(), - findUser.getSignUpType(), - cmd.getFileMappingId(), - findUser.getAccountDisabled(), - findUser.getLoginFailCnt(), - findUser.getAccountLocked(), - CollectionUtils.emptyIfNull(findUser.getRoles()).stream() - .map(CoreRole::getId) - .collect(Collectors.toSet()))); - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java deleted file mode 100644 index 7c486f0f..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateFrontUserInCmd { - private String password; - private String email; - private String nickname; - private List fileMappingId; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java deleted file mode 100644 index 5eb189fb..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java +++ /dev/null @@ -1,29 +0,0 @@ -package app.module.core.usecase.user.updateFrontUser.ports.application.domain; - -import app.module.core.config.application.enums.SignUpType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateFrontUserOutCmd { - private String id; - private String password; - private LocalDateTime passwordUpdatedAt; - private String email; - private String nickname; - private SignUpType signUpType; - private List fileMappingId; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java deleted file mode 100644 index 1c38ec8c..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java +++ /dev/null @@ -1,52 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserByAdminParam; -import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserHasRoleParam; -import app.module.core.usecase.user.updateUserByAdmin.ports.UpdateUserPortOut; -import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; - -@Repository -@RequiredArgsConstructor -class UpdateUserDao implements UpdateUserPortOut { - - private final UpdateUserMapper mapper; - - @Override - @Transactional - public void operate(UpdateUserCmd cmd) { - String userId = cmd.getId(); - String loginUser = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - - // κ΄€λ¦¬μžμ˜ μ‚¬μš©μž 정보 μˆ˜μ • - mapper.updateFrontUser( - new FrontUser( - userId, - cmd.getEmail(), - cmd.getNickname(), - cmd.getAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked() - ) - ); - - // κΈ°μ‘΄ μ—­ν•  μ‚­μ œ - mapper.deleteFrontUserHasRoles( - new UpdateFrontUserByAdminParam(userId, now, loginUser, now, loginUser)); - - // μƒˆλ‘œμš΄ μ—­ν•  등둝 - if (CollectionUtils.isNotEmpty(cmd.getRoles())) { - mapper.insertFrontUserHasRoles( - new UpdateFrontUserHasRoleParam( - userId, cmd.getRoles().stream().toList(), now, loginUser, now, loginUser)); - } - } -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserMapper.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserMapper.java deleted file mode 100644 index a5270926..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUser; -import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserByAdminParam; -import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserHasRoleParam; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UpdateUserMapper { - void updateFrontUser(FrontUser user); - void deleteFrontUserHasRoles(UpdateFrontUserByAdminParam param); - void insertFrontUserHasRoles(UpdateFrontUserHasRoleParam param); -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java deleted file mode 100644 index c973b888..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -public class UpdateFrontUserByAdminParam { - private String userId; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java deleted file mode 100644 index 4b3df653..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.List; - -@Getter -@Setter -@AllArgsConstructor -public class UpdateFrontUserHasRoleParam { - private String userId; - List roleIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; -} diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortIn.java deleted file mode 100644 index f7932f26..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortIn.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.ports; - -import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; - -public interface UpdateUserPortIn { - - void operate(UpdateUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortOut.java deleted file mode 100644 index 1f2a2f1b..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/UpdateUserPortOut.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.ports; - -import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; - -public interface UpdateUserPortOut { - - void operate(UpdateUserCmd command); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/UpdateUserService.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/UpdateUserService.java deleted file mode 100644 index 9f6a16a4..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/UpdateUserService.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.ports.application; - -import app.module.core.usecase.user.updateUserByAdmin.ports.UpdateUserPortIn; -import app.module.core.usecase.user.updateUserByAdmin.ports.UpdateUserPortOut; -import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class UpdateUserService implements UpdateUserPortIn { - - private final UpdateUserPortOut portOut; - - @Override - public void operate(UpdateUserCmd command) { - portOut.operate(command); - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java deleted file mode 100644 index 7a72457d..00000000 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.core.usecase.user.updateUserByAdmin.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -import java.util.Set; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class UpdateUserCmd { - private String id; - private String email; - private String nickname; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private Set roles; -} diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java index 3a35702c..5ac2aa02 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Privilege; +import app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence.model.Privilege; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userPrivilege.getUserPrivilege.adapters.persistence.GetUserPrivilegeMapper; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege; diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java index f7f4076b..36e0c86b 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Privilege; +import app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence.model.Privilege; import app.module.core.config.application.enums.AppType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/Privilege.java similarity index 85% rename from core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java rename to core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/Privilege.java index 942c5d7c..6172ed5c 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/Privilege.java @@ -1,4 +1,4 @@ -package app.module.core.config.adapters.persistence.entity; +package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java index 66759342..a7a5f5e4 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java @@ -1,6 +1,6 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.role.view.adapters.persistence.RoleViewMapper; diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java index c3030a1c..df4f90ed 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java @@ -1,6 +1,6 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; +import app.module.core.usecase.uri.model.Role; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model.RoleHasPrivilegeDeleteParam; import app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model.RoleHasPrivilegeSaveParam; diff --git a/core/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml b/core/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml index 655bafe3..4cea5e5a 100644 --- a/core/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml +++ b/core/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml @@ -4,7 +4,7 @@ - + INSERT INTO logged_in_user ( id, @@ -23,7 +23,7 @@ ) - + UPDATE logged_in_user SET clientip = #{clientIP}, diff --git a/core/src/main/resources/mappers/operationlog/OperationLogMapper.xml b/core/src/main/resources/mappers/operationlog/OperationLogMapper.xml deleted file mode 100644 index 01c8b258..00000000 --- a/core/src/main/resources/mappers/operationlog/OperationLogMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/src/main/resources/mappers/operationlog/OperationLogSaveMapper.xml b/core/src/main/resources/mappers/operationlog/OperationLogSaveMapper.xml deleted file mode 100644 index 0e786788..00000000 --- a/core/src/main/resources/mappers/operationlog/OperationLogSaveMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO operation_log ( - id, - app_type, - operation_log_type, - target_id, - ip, - task_desc, - - ) VALUES ( - nextval('operation_log_seq'), - #{appType}, - #{operationLogType}, - #{targetId}, - #{ip}, - #{taskDesc}, - - ) - - \ No newline at end of file diff --git a/core/src/main/resources/mappers/uicode/UICodeTopTierMapper.xml b/core/src/main/resources/mappers/uicode/UICodeTopTierMapper.xml index 4c443d9e..344fd681 100644 --- a/core/src/main/resources/mappers/uicode/UICodeTopTierMapper.xml +++ b/core/src/main/resources/mappers/uicode/UICodeTopTierMapper.xml @@ -4,7 +4,7 @@ -
-
@@ -52,7 +40,18 @@
- + +
+
+ +
+
+ +
+
diff --git a/front/src/main/resources/templates/info/monthly/monthlys.html b/front/src/main/resources/templates/info/monthly/monthlys.html index 82c1c293..4e0864c5 100644 --- a/front/src/main/resources/templates/info/monthly/monthlys.html +++ b/front/src/main/resources/templates/info/monthly/monthlys.html @@ -20,13 +20,6 @@ - -
diff --git a/front/src/main/resources/templates/info/monthly/{id}.html b/front/src/main/resources/templates/info/monthly/{id}.html index e84a7e23..264a0cb8 100644 --- a/front/src/main/resources/templates/info/monthly/{id}.html +++ b/front/src/main/resources/templates/info/monthly/{id}.html @@ -382,10 +382,14 @@ }); const errors = []; + if (form.availableArea.value && form.availableArea.value <= 0) errors.push({field: 'availableArea', message: 'μž…λ ₯값은 0보닀 컀야 ν•©λ‹ˆλ‹€. '}); if (!form.cropName.value) errors.push({field: 'cropName', message: '재배 μž‘λ¬Όλͺ…을 μž…λ ₯ν•΄μ£Όμ„Έμš”.'}); + if (form.landArea.value && form.landArea.value <= 0) errors.push({field: 'landArea', message: 'μž…λ ₯값은 0보닀 컀야 ν•©λ‹ˆλ‹€. '}); if(form.mainYield.value){ + if (form.mainYield.value <= 0) errors.push({field: 'mainYield', message: 'μž…λ ₯값은 0보닀 컀야 ν•©λ‹ˆλ‹€. '}); + if(!form.mainYieldUnitCode.value){ errors.push({ field: 'mainYieldUnitCode', @@ -401,6 +405,7 @@ } if(form.mainSaleAmount.value){ + if (form.mainSaleAmount.value <= 0) errors.push({field: 'mainSaleAmount', message: 'μž…λ ₯값은 0보닀 컀야 ν•©λ‹ˆλ‹€. '}); if(!form.mainSaleUnitCode.value){ errors.push({ field: 'mainSaleUnitCode', @@ -417,6 +422,7 @@ if(form.subYield.value){ + if (form.subYield.value <= 0) errors.push({field: 'subYield', message: 'μž…λ ₯값은 0보닀 컀야 ν•©λ‹ˆλ‹€. '}); if(!form.subYieldUnitCode.value){ errors.push({ field: 'subYieldUnitCode', @@ -433,6 +439,7 @@ if(form.subSaleAmount.value){ + if (form.subSaleAmount.value <= 0) errors.push({field: 'subSaleAmount', message: 'μž…λ ₯값은 0보닀 컀야 ν•©λ‹ˆλ‹€. '}); if(!form.subSaleUnitCode.value){ errors.push({ field: 'subSaleUnitCode', @@ -530,7 +537,6 @@ document.getElementById('listBody').innerHTML = ''; formControl.updateLayout(); - // TODO(ks): 선택 μ‚­μ œ μ‹œ 전체 count 미반영 쀑. 일단 전체 μ΄ˆκΈ°ν™”μ—μ„œλ§Œ count κ°±μ‹ . document.getElementById('totalItems').textContent = ENV.data.productList.length; }, }); @@ -566,11 +572,6 @@ function (rstData, status) { if (rstData.code === 'SUCCESS') { ajaxUtil._alert('등둝이 μ™„λ£Œλ˜μ—ˆμŠ΅λ‹ˆλ‹€.', null, function () { - /** - * TODO - * λ‚΄μ •λ³΄μ—μ„œλ§Œ λ“€μ–΄μ˜¨λ‹€λŠ” κ°€μ •ν•˜μ—μ„œ back을 ν•˜κ²Œν•¨ SBμ—λŠ” λ‚΄μ •λ³΄λ‘œ μ΄λ™ν•˜κ²Œ λ˜μ–΄ 있음. - */ - // history.back() location.href = '/info/monthly'; }); } else if (rstData.code === 'ERROR') { diff --git a/front/src/main/resources/templates/info/notice/notices.html b/front/src/main/resources/templates/info/notice/notices.html index 0bf5ee93..af7c2807 100644 --- a/front/src/main/resources/templates/info/notice/notices.html +++ b/front/src/main/resources/templates/info/notice/notices.html @@ -108,8 +108,7 @@ }, /** - * TODO κ²€μƒ‰ν• λ•Œ 각 νŽ˜μ΄μ§€μ— ν•¨μˆ˜ κ΅¬ν˜„ ν•„μš”. - * TODO 일단 λ’€λ‘œκ°€κΈ°μ— λŒ€ν•œ λΆ€λΆ„ μ •μ˜κ°€ 없기에 νŽ˜μ΄μ§€ μ΄λ™μœΌλ‘œ μ²˜λ¦¬ν•΄λ‘ ... + * κ²€μƒ‰ν• λ•Œ 각 νŽ˜μ΄μ§€μ— ν•¨μˆ˜ κ΅¬ν˜„ ν•„μš”. */ goSearch() { const f = document.reqForm; diff --git a/front/src/main/resources/templates/info/notice/{id}.html b/front/src/main/resources/templates/info/notice/{id}.html index 674e3593..3668e9d3 100644 --- a/front/src/main/resources/templates/info/notice/{id}.html +++ b/front/src/main/resources/templates/info/notice/{id}.html @@ -57,10 +57,7 @@ root: /*[[|#{uri.front.info.user.path}/password|]]*/'rootUrl', }, goList() { - /** - * TODO μ™ΈλΆ€ μœ μž…μ— 따라 history.backκ³Ό location.href κ°€ μ μ ˆν•˜κ²Œ μ‚¬μš©λ˜μ–΄μ•Όν•¨... - * 전체적인 μˆ˜μ • ν•„μš”.(이전 νŽ˜μ΄μ§€ - */ + const previousUrl = document.referrer; /* if (previousUrl.includes('/info/notice')) { diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 6932b7a3..1c591ec2 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -254,7 +254,21 @@ const date = new Date(detail.viewDate) const monthKey = this._getMonthKey(date) - // this._setupMonth(date) + // μ£Ό λͺ¨λ“œμΌ λ•Œ 월이 λ³€κ²½λ˜λ©΄ weekStart μ—…λ°μ΄νŠΈ + if (this.state.mode === 'week') { + this._setFirstDateDay(date) + + // datepicker μ˜΅μ…˜ μ—…λ°μ΄νŠΈ + this.instances.datepicker.setOptions({ + ...this.instances.datepickerComp.core.props, + weekStart: this.state.weekStart + }) + + // refreshλ₯Ό 톡해 μš”μΌ 헀더 μ—…λ°μ΄νŠΈ + if (this.instances.datepicker.refresh) { + this.instances.datepicker.refresh() + } + } if (!this.state.isLoading) { await this.loadMonthData(date) @@ -263,6 +277,32 @@ this.callbacks.changeMonth(monthKey, date) } + async _finalizeDateLoading(date) { + this._setupMonth(date) + + const today = new Date() + const targetDate = this._getTargetDate(date, today) + this.instances.datepicker.setDate(targetDate) + + // μ£Ό λͺ¨λ“œμΌ λ•Œ μš”μΌ 헀더 μ—…λ°μ΄νŠΈ + if (this.state.mode === 'week') { + this._setFirstDateDay(date) + this.instances.datepicker.setOptions({ + ...this.instances.datepickerComp.core.props, + weekStart: this.state.weekStart + }) + } + + this._scheduleClick() + + if (date >= this.data.minDate) { + this.instances.datepicker.refresh() + } + + this._loadingEnd() + this.elements.datepicker.classList.remove(DatepickerComponent.CONSTANTS.CLASSES.LOADING) + } + _handleWeekChange({ detail }) { @@ -325,15 +365,30 @@ ...this.instances.datepickerComp.core.props, weekStart: this.state.weekStart }) + // μ˜΅μ…˜ λ³€κ²½ ν›„ μ¦‰μ‹œ refresh 호좜 + if (this.instances.datepicker.refresh) { + this.instances.datepicker.refresh() + } } _initializeWeekMode() { const selectedDate = this.instances.datepicker.getDate() const selectedDay = selectedDate.getDate() - // // μ„ νƒλœ λ‚ μ§œκ°€ ν¬ν•¨λœ μ£Όμ°¨ 계산 + // μ„ νƒλœ λ‚ μ§œκ°€ ν¬ν•¨λœ μ£Όμ°¨ 계산 this.state.weekPaging = Math.floor((selectedDay - 1) / DatepickerComponent.CONSTANTS.DAYS_PER_WEEK) + // weekStart μ„€μ • 및 μ˜΅μ…˜ μ—…λ°μ΄νŠΈ + this._setFirstDateDay(selectedDate) + this.instances.datepicker.setOptions({ + ...this.instances.datepickerComp.core.props, + weekStart: this.state.weekStart + }) + + // refreshλ₯Ό 톡해 μš”μΌ 헀더 μ—…λ°μ΄νŠΈ + if (this.instances.datepicker.refresh) { + this.instances.datepicker.refresh() + } this._weekPagination() this._updateWeekNavigationButtons() } @@ -367,15 +422,31 @@ if (this.state.mode !== 'week') return const currentDate = this.instances.datepicker.getDate() + const currentMonth = currentDate.getMonth() + const currentYear = currentDate.getFullYear() - // // 이전주 λ²„νŠΌ μƒνƒœ 확인 + // 이전주 λ²„νŠΌ μƒνƒœ 확인 const prevWeekDate = this._getPrevWeekDate(currentDate) const isPrevDisabled = prevWeekDate <= this.data.minDate this._toggleButtonDisabled(this.elements.prevWeek, isPrevDisabled) - // // λ‹€μŒμ£Ό λ²„νŠΌ μƒνƒœ 확인 - const nextWeekDate = this._getNextWeekDate(currentDate) - const isNextDisabled = nextWeekDate >= this.data.maxDate + // λ‹€μŒμ£Ό λ²„νŠΌ μƒνƒœ 확인 κ°œμ„  + const nextWeekStart = this._getNextWeekDate(currentDate) + + // maxDate와 비ꡐ할 λ•Œ 더 μ •ν™•ν•œ 계산 + // λ‹€μŒμ£Όκ°€ μ‹œμž‘λ˜λŠ” λ‚ μ§œκ°€ maxDateλ₯Ό μ΄ˆκ³Όν•˜λŠ”μ§€ 확인 + let isNextDisabled = false + + // λ‹€μŒμ£Όκ°€ λ‹€μŒ λ‹¬λ‘œ λ„˜μ–΄κ°€λŠ” 경우 체크 + if (nextWeekStart.getMonth() !== currentMonth) { + // λ‹€μŒ λ‹¬μ˜ 첫째 날이 maxDateλ₯Ό μ΄ˆκ³Όν•˜λŠ”μ§€ 확인 + const nextMonthFirstDay = new Date(currentYear, currentMonth + 1, 1) + isNextDisabled = nextMonthFirstDay > this.data.maxDate + } else { + // 같은 달 λ‚΄μ—μ„œ λ‹€μŒμ£Ό μ‹œμž‘μΌμ΄ maxDateλ₯Ό μ΄ˆκ³Όν•˜λŠ”μ§€ 확인 + isNextDisabled = nextWeekStart > this.data.maxDate + } + this._toggleButtonDisabled(this.elements.nextWeek, isNextDisabled) } @@ -385,8 +456,12 @@ } _getNextWeekDate(currentDate) { - const endWeekDate = (this.state.weekPaging + 2) * DatepickerComponent.CONSTANTS.DAYS_PER_WEEK - return new Date(currentDate.getFullYear(), currentDate.getMonth(), endWeekDate) + // ν˜„μž¬ 주의 μ‹œμž‘μΌ 계산 + const currentWeekStart = (this.state.weekPaging * DatepickerComponent.CONSTANTS.DAYS_PER_WEEK) + 1 + // λ‹€μŒμ£Όμ˜ μ‹œμž‘μΌ 계산 + const nextWeekStart = currentWeekStart + DatepickerComponent.CONSTANTS.DAYS_PER_WEEK + + return new Date(currentDate.getFullYear(), currentDate.getMonth(), nextWeekStart) } _weekPagingPrev() { @@ -412,11 +487,7 @@ this.state.maxWeekPaging = Math.ceil(lastDayOfMonth / DatepickerComponent.CONSTANTS.DAYS_PER_WEEK) - const endWeekDate = (this.state.weekPaging + 2) * DatepickerComponent.CONSTANTS.DAYS_PER_WEEK - const date = new Date(currentDate.getFullYear(), currentDate.getMonth(), endWeekDate) - - this._disablePrevNextButtons('next', date) - + // ν˜„μž¬ μ£Όκ°€ λ§ˆμ§€λ§‰ 주인지 확인 if (this.state.weekPaging >= this.state.maxWeekPaging - 1) { this._moveToNextMonth() return @@ -425,6 +496,8 @@ this.state.weekPaging += 1 this._clickFirstVisibleCell() this._dispatchWeekChangeEvent('next', currentDate) + this._weekPagination('next') + this._updateWeekNavigationButtons() // λ²„νŠΌ μƒνƒœ μ—…λ°μ΄νŠΈ μΆ”κ°€ } _clickFirstVisibleCell() { @@ -487,13 +560,31 @@ _moveToPreviousMonth() { const currentDate = this.instances.datepicker.getDate() + const prevMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, 1) const lastDayOfPrevMonth = new Date(currentDate.getFullYear(), currentDate.getMonth(), 0).getDate() const lastWeekOfPrevMonth = Math.ceil(lastDayOfPrevMonth / DatepickerComponent.CONSTANTS.DAYS_PER_WEEK) - 1 const firstDayOfLastWeek = (lastWeekOfPrevMonth * DatepickerComponent.CONSTANTS.DAYS_PER_WEEK) + 1 const targetDate = new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, firstDayOfLastWeek) + // λ¨Όμ € λ‚ μ§œ μ„€μ • this.instances.datepicker.setDate(targetDate) + + // μƒˆλ‘œμš΄ λ‹¬μ˜ 첫째 λ‚  κΈ°μ€€μœΌλ‘œ weekStart μ—…λ°μ΄νŠΈ + this._setFirstDateDay(prevMonth) + + // datepicker μ˜΅μ…˜ μ—…λ°μ΄νŠΈ + this.instances.datepicker.setOptions({ + ...this.instances.datepickerComp.core.props, + weekStart: this.state.weekStart + }) + this.state.weekPaging = lastWeekOfPrevMonth + + // refreshλ₯Ό 톡해 μš”μΌ 헀더 μ—…λ°μ΄νŠΈ + if (this.instances.datepicker.refresh) { + this.instances.datepicker.refresh() + } + this._weekPagination('prev') this._clickFirstVisibleCell() this._updateWeekNavigationButtons() @@ -503,18 +594,41 @@ const currentDate = this.instances.datepicker.getDate() const nextMonthFirstDay = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 1) + // λ¨Όμ € λ‚ μ§œ μ„€μ • this.instances.datepicker.setDate(nextMonthFirstDay) + + // μƒˆλ‘œμš΄ λ‹¬μ˜ 첫째 λ‚  κΈ°μ€€μœΌλ‘œ weekStart μ—…λ°μ΄νŠΈ + this._setFirstDateDay(nextMonthFirstDay) + + // datepicker μ˜΅μ…˜ μ—…λ°μ΄νŠΈ + this.instances.datepicker.setOptions({ + ...this.instances.datepickerComp.core.props, + weekStart: this.state.weekStart + }) + this.state.weekPaging = 0 - // // μ£Ό λͺ¨λ“œμ—μ„œ μ›” 이동 μ‹œ μ μ ˆν•œ λ‚ μ§œκ°€ μ„ νƒλ˜λ„λ‘ loadMonthData 호좜 - // // changeMonth μ΄λ²€νŠΈκ°€ μžλ™μœΌλ‘œ λ°œμƒν•˜μ—¬ loadMonthDataκ°€ 호좜됨 + // refreshλ₯Ό 톡해 μš”μΌ 헀더 μ—…λ°μ΄νŠΈ + if (this.instances.datepicker.refresh) { + this.instances.datepicker.refresh() + } + this._weekPagination('next') + this._clickFirstVisibleCell() this._updateWeekNavigationButtons() } _setFirstDateDay(date) { const firstDate = new Date(date.getFullYear(), date.getMonth(), 1) this.state.weekStart = firstDate.getDay() + + // μ£Ό λͺ¨λ“œμΌ λ•Œ datepicker μ˜΅μ…˜λ„ μ¦‰μ‹œ μ—…λ°μ΄νŠΈ + if (this.state.mode === 'week' && this.instances.datepicker) { + this.instances.datepicker.setOptions({ + ...this.instances.datepickerComp.core.props, + weekStart: this.state.weekStart + }) + } } _weekPagination(direction) { @@ -768,198 +882,198 @@
- - - + + - + - + - - + {{/for}} + + + {{include tmpl="#etcRowTmpl" /}} + + +
\ No newline at end of file diff --git a/front/src/main/resources/templates/record/work/form.html b/front/src/main/resources/templates/record/work/form.html index 41a4717a..b1d2a833 100644 --- a/front/src/main/resources/templates/record/work/form.html +++ b/front/src/main/resources/templates/record/work/form.html @@ -168,7 +168,6 @@
@@ -181,7 +180,6 @@
diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index 31ef079c..dc97541d 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -261,7 +261,15 @@ }, function () { // λ…Έλ™νˆ¬μž…μ‹œκ°„ invalid reset - $('.segment-label .guide-info li').eq(2).addClass('invalid'); + if($('.type-sub').find('.input-info').length > 0 && $('.type-sub').find('.input-info').first().text() === "ν•„μˆ˜μž…λ ₯ ν•­λͺ©μž…λ‹ˆλ‹€."){ + $('.segment-label .guide-info li').eq(2).text("μ΅œμ†Œ 1개의 λ…Έλ™νˆ¬μž…μ‹œκ°„μ„ μž…λ ₯ν•΄ μ£Όμ„Έμš”."); + $('.segment-label .guide-info li').eq(2).addClass('invalid'); + }else if($('.type-sub').find('.input-info').length > 0 ){ + $('.segment-label .guide-info li').eq(2).text("μž…λ ₯값은 0보닀 컀야 ν•©λ‹ˆλ‹€."); + $('.segment-label .guide-info li').eq(2).addClass('invalid'); + }else{ + $('.segment-label .guide-info li').eq(2).removeClass('invalid'); + } $('.type-sub').find('.input-info').remove(); $('.input-flex-group').find('.input-info').remove(); }