@@ -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 @@
- | κ°μ‘±λ
Έλ(λ¨) |
+ κ°μ‘±λ
Έλ(μ¬) |
|
- κ³ μ©λ
Έλ(λ¨) |
+ κ³ μ©λ
Έλ(μ¬) |
|
- νμμ΄(λ¨) |
+ νμμ΄(μ¬) |
|
- μΌμλκΈ°(λ¨) |
+ μΌμλκΈ°(μ¬) |
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 @@
@@ -198,10 +189,6 @@
//μ΄μ λ°μ΄ν° μ·¨λ λ²νΌ
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
- //λ°μ΄ν° μμ λ²νΌ
-
- // const forestProductStatus = document.getElementById("forestProductStatus");
-
//λ±λ‘ μλ£ λ²νΌ
const next = document.getElementById('complateBtn');
@@ -250,16 +237,6 @@
if (ENV.data.pastStatus && ENV.data.pastStatus == "REGISTERED" && ENV.data.pastBankList.length > 0) {
this.checkUsePastData();
}
-
- // } else if (ENV.data.currentStatus == "NOTHING") {
- //
- //
- // addItemBtn.disabled = true;
- // icon.classList.toggle("ico-add", false);
- // icon.classList.toggle("ico-add-disabled", true);
- // callPastInfoBtn.disabled = true;
- // forestProductStatus.checked = true;
- // next.disabled = true;
} else if (ENV.data.currentStatus == "REGISTERED") {
if (ENV.data.bankList.length > 0) {
@@ -359,12 +336,6 @@
},
updateLayout() {
-
-
- // const isChecked = ENV.elementRefs.noDataCheckbox.checked;
- // const btn = document.getElementById("addItemBtn");
- // const icon = btn.querySelector("i");
- // const status = document.getElementById('forestProductStatusDiv');
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
const next = document.getElementById('complateBtn');
@@ -381,10 +352,6 @@
count.textContent = total;
totalItems.textContent = total;
-
- // btn.disabled = isData;
- // icon.classList.toggle("ico-add", !isData);
- // icon.classList.toggle("ico-add-disabled", isData);
if (isData) {
next.disabled = !isData;
} else {
@@ -411,6 +378,8 @@
}
}
+ if (form.count.value && form.count.value <= 0) errors.push({field: 'count', message: 'μ
λ ₯κ°μ 0λ³΄λ€ μ»€μΌ ν©λλ€. '});
+
if(form.count.value){
if(!form.unitCode.value){
errors.push({
@@ -429,6 +398,8 @@
if (!form.price.value) errors.push({field: 'price', message: 'κΈμ‘μ μ
λ ₯ν΄μ£ΌμΈμ.'});
+ else if (form.price.value && form.price.value <= 0) errors.push({field: 'price', message: 'μ
λ ₯κ°μ 0λ³΄λ€ μ»€μΌ ν©λλ€. '});
+
console.log(errors) //////////////////////////
kri.form.error(errors);
if (errors.length > 0) {
diff --git a/front/src/main/resources/templates/info/main.html b/front/src/main/resources/templates/info/main.html
index f403b3fd..38b724a4 100644
--- a/front/src/main/resources/templates/info/main.html
+++ b/front/src/main/resources/templates/info/main.html
@@ -36,7 +36,7 @@
-
+
-
μ΅κ·Όλ±λ‘ :
- λ±λ‘λ μΌκ³λΆκ° μμ΅λλ€.
diff --git a/front/src/main/resources/templates/info/monthly/form.html b/front/src/main/resources/templates/info/monthly/form.html
index ad479b08..57b975a4 100644
--- a/front/src/main/resources/templates/info/monthly/form.html
+++ b/front/src/main/resources/templates/info/monthly/form.html
@@ -15,18 +15,6 @@
νμμ
λ ₯
|