diff --git a/admin/src/main/java/app/module/admin/usecase/loggedinuser/remove/adapters/persistence/LoggedInUserRemoveDao.java b/admin/src/main/java/app/module/admin/usecase/loggedinuser/remove/adapters/persistence/LoggedInUserRemoveDao.java index f6b5f69a..37344715 100644 --- a/admin/src/main/java/app/module/admin/usecase/loggedinuser/remove/adapters/persistence/LoggedInUserRemoveDao.java +++ b/admin/src/main/java/app/module/admin/usecase/loggedinuser/remove/adapters/persistence/LoggedInUserRemoveDao.java @@ -22,8 +22,7 @@ public class LoggedInUserRemoveDao implements LoggedInUserRemovePortOut { LocalDateTime.now(), CommonUtil.getLoginUsername(), LocalDateTime.now(), - CommonUtil.getLoginUsername(), - false + CommonUtil.getLoginUsername() )); } } diff --git a/admin/src/main/java/app/module/admin/usecase/loggedinuser/remove/adapters/persistence/model/LoggedInUserRemoveParam.java b/admin/src/main/java/app/module/admin/usecase/loggedinuser/remove/adapters/persistence/model/LoggedInUserRemoveParam.java index 3da6cf8f..b2796d87 100644 --- a/admin/src/main/java/app/module/admin/usecase/loggedinuser/remove/adapters/persistence/model/LoggedInUserRemoveParam.java +++ b/admin/src/main/java/app/module/admin/usecase/loggedinuser/remove/adapters/persistence/model/LoggedInUserRemoveParam.java @@ -16,5 +16,4 @@ public class LoggedInUserRemoveParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditEntity.java b/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditEntity.java index 85871116..9bbdb887 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditEntity.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditEntity.java @@ -11,7 +11,6 @@ import lombok.Setter; @Getter @Setter public class AuditEntity { - private LocalDateTime createdAt; private String createdBy; private LocalDateTime updatedAt; 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 index 03cbe757..8e4c4f56 100644 --- 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 @@ -12,12 +12,19 @@ import lombok.Setter; @NoArgsConstructor @AllArgsConstructor public class Admin extends AuditEntity { + 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) { diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Article.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Article.java index 74477fd2..a52f52c5 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Article.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Article.java @@ -12,14 +12,23 @@ import lombok.Setter; @Setter @NoArgsConstructor public class Article extends AuditEntity { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private Integer orderNo; + private List uploadFiles = Collections.emptyList(); + private List articleComments = Collections.emptyList(); public Article(Long id) { diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/ArticleHasUploadFile.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/ArticleHasUploadFile.java index 0f3bff08..bf4b25a4 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/ArticleHasUploadFile.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/ArticleHasUploadFile.java @@ -11,7 +11,9 @@ import lombok.Setter; @NoArgsConstructor @AllArgsConstructor public class ArticleHasUploadFile extends AuditEntity { + private Long articleId; + private Long uploadFilesId; public ArticleHasUploadFile(Long articleId) { 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 index 3bfaa439..0bd315d3 100644 --- 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 @@ -15,15 +15,25 @@ import lombok.Setter; 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) { 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 index 7c93c085..c5a539c3 100644 --- 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 @@ -9,7 +9,10 @@ import lombok.Setter; @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 index 510d2ea5..7ebc8e03 100644 --- 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 @@ -11,7 +11,9 @@ import lombok.Setter; @NoArgsConstructor @AllArgsConstructor public class FrontUserHasUploadFile extends AuditEntity { + private String frontUserId; + private Long uploadFilesId; public FrontUserHasUploadFile(String frontUserId) { diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java index cc47cdd4..93784cca 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java @@ -18,8 +18,12 @@ import lombok.Setter; @NoArgsConstructor @AllArgsConstructor public class LoggedInUser extends AuditEntity { + private AppType appType; + private String id; + private String clientIP; + private LocalDateTime lastLoggedInAt; } 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 index 2f941200..da017269 100644 --- 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 @@ -13,7 +13,10 @@ import lombok.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/Privilege.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java index 74ac1b01..942c5d7c 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Privilege.java @@ -12,9 +12,13 @@ import lombok.Setter; @NoArgsConstructor @AllArgsConstructor public class Privilege extends AuditEntity { + private String id; + private String description; + private AppType appType; + private Integer orderNo; public Privilege(String id) { diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java index 2a758b86..e77b1a50 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java @@ -13,9 +13,13 @@ import lombok.Setter; public class Role extends AuditEntity { private String id; + private String description; + private AppType appType; + private Integer orderNo; + private Set hasPrivileges; public Role(String id) { diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java index 101d29f9..1f8f4109 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/RoleHasPrivilege.java @@ -11,10 +11,7 @@ import lombok.Setter; @NoArgsConstructor @AllArgsConstructor public class RoleHasPrivilege extends AuditEntity { - private Integer id; - private String roleId; - private String privilegeId; } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitArticleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitArticleData.java index 915da123..a1d6180a 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitArticleData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitArticleData.java @@ -1,6 +1,6 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleRepo; +import app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleMapper; import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn; import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd; import java.time.LocalDateTime; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; public class InitArticleData implements ApplicationRunner { private final CreateArticlePortIn createArticlePortIn; - private final RemoveAllArticleRepo removeAllArticleRepo; + private final RemoveAllArticleMapper removeAllArticleMapper; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -27,8 +27,8 @@ public class InitArticleData implements ApplicationRunner { return; } -/* // 전체 데이터 삭제 - removeAllArticleRepo.deleteAll(); + // 전체 데이터 삭제 + removeAllArticleMapper.deleteAll(); IntStream.range(0, 25) .forEach( @@ -40,6 +40,6 @@ public class InitArticleData implements ApplicationRunner { true, LocalDateTime.now(), LocalDateTime.now().plusMonths(2), - null)));*/ + null))); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java index d3ece7cb..4007e81c 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java @@ -2,6 +2,7 @@ package app.module.core.config.adapters.persistence.initData; import app.module.core.config.adapters.persistence.entity.Privilege; import app.module.core.config.application.enums.AppType; +import app.module.core.usecase.privilege.save.adapters.persistence.PrivilegeSaveMapper; import app.module.core.usecase.privilege.save.adapters.persistence.PrivilegeSaveRepo; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -15,7 +16,7 @@ import org.springframework.stereotype.Component; @Order(1) public class InitPrivilegeData implements ApplicationRunner { - private final PrivilegeSaveRepo privilegeRepo; + private final PrivilegeSaveMapper privilegeSaveMapper; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -26,7 +27,7 @@ public class InitPrivilegeData implements ApplicationRunner { return; } - /*privilegeRepo.save(new Privilege("ADMIN_API", "ADMIN API 이용 권한", AppType.ADMIN, 0)); - privilegeRepo.save(new Privilege("ADMIN_ACCESS", "ADMIN 사이트 접근 권한", AppType.ADMIN, 1));*/ + privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_API", "ADMIN API 이용 권한", AppType.ADMIN, 0)); + privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_ACCESS", "ADMIN 사이트 접근 권한", AppType.ADMIN, 1)); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java index 16faba70..aa371caf 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java @@ -6,6 +6,13 @@ import app.module.core.config.adapters.persistence.entity.RoleHasPrivilege; import app.module.core.config.adapters.persistence.repository.PrivilegeRepo; import app.module.core.config.adapters.persistence.repository.RoleRepo; import app.module.core.config.application.enums.AppType; +import app.module.core.config.application.util.CommonUtil; +import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper; +import app.module.core.usecase.privilege.view.ports.application.domain.PrivilegeView; +import app.module.core.usecase.role.save.adapters.persistence.RoleSaveMapper; +import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam; +import java.time.LocalDateTime; +import java.util.List; import java.util.Set; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -19,8 +26,8 @@ import org.springframework.stereotype.Component; @Order(2) public class InitRoleData implements ApplicationRunner { - private final RoleRepo roleRepo; - private final PrivilegeRepo privilegeViewRepo; + private final RoleSaveMapper roleSaveMapper; + private final PrivilegeViewMapper privilegeViewRepo; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -32,39 +39,42 @@ public class InitRoleData implements ApplicationRunner { } // 권한 `privilege` 정보 가져오기 - /*Privilege apiPrivilege = privilegeViewRepo.findById("ADMIN_API").orElseThrow(); - Privilege privilege = privilegeViewRepo.findById("ADMIN_ACCESS").orElseThrow();*/ + PrivilegeView apiPrivilege = privilegeViewRepo.findById("ADMIN_API").orElseThrow(); + PrivilegeView privilege = privilegeViewRepo.findById("ADMIN_ACCESS").orElseThrow(); int orderNo = 0; - /*roleRepo.save( - new Role( + roleSaveMapper.insertRole(new Role("ROLE_SUPER", "SUPER 관리자", AppType.ADMIN, orderNo++)); + roleSaveMapper.insertRoleHasPrivileges( + new RoleHasPrivilegeSaveParam( "ROLE_SUPER", - "SUPER 관리자", - AppType.ADMIN, - orderNo++, - Set.of( - new RoleHasPrivilege(null, new Role("ROLE_SUPER"), apiPrivilege), - new RoleHasPrivilege(null, new Role("ROLE_SUPER"), privilege)))); + List.of(apiPrivilege.getId(), privilege.getId()), + LocalDateTime.now(), + "INIT_DATA", + LocalDateTime.now(), + "INIT_DATA" + )); - roleRepo.save( - new Role( + roleSaveMapper.insertRole(new Role("ROLE_MANAGER", "매니저", AppType.ADMIN, orderNo++)); + roleSaveMapper.insertRoleHasPrivileges( + new RoleHasPrivilegeSaveParam( "ROLE_MANAGER", - "매니저", - AppType.ADMIN, - orderNo++, - Set.of( - new RoleHasPrivilege(null, new Role("ROLE_MANAGER"), apiPrivilege), - new RoleHasPrivilege(null, new Role("ROLE_MANAGER"), privilege)))); + List.of(apiPrivilege.getId(), privilege.getId()), + LocalDateTime.now(), + "INIT_DATA", + LocalDateTime.now(), + "INIT_DATA" + )); - roleRepo.save( - new Role( + roleSaveMapper.insertRole(new Role("ROLE_STAFF", "스텝", AppType.ADMIN, orderNo++)); + roleSaveMapper.insertRoleHasPrivileges( + new RoleHasPrivilegeSaveParam( "ROLE_STAFF", - "스텝", - AppType.ADMIN, - orderNo++, - Set.of( - new RoleHasPrivilege(null, new Role("ROLE_STAFF"), apiPrivilege), - new RoleHasPrivilege(null, new Role("ROLE_STAFF"), privilege))));*/ + List.of(apiPrivilege.getId(), privilege.getId()), + LocalDateTime.now(), + "INIT_DATA", + LocalDateTime.now(), + "INIT_DATA" + )); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java index 28fa6334..a41d16bb 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java @@ -1,11 +1,15 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.adapters.persistence.initData.helper.RemoveAllAdminURIRepo; +import app.module.core.config.adapters.persistence.initData.helper.RemoveAllAdminURIMapper; import app.module.core.config.application.enums.AppType; +import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; +import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement; import app.module.core.usecase.uri.save.ports.URISavePortIn; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; import java.io.IOException; +import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -21,8 +25,9 @@ import org.springframework.transaction.annotation.Transactional; @Order(3) public class InitUriAdminData implements ApplicationRunner { + private final GetUrisPortIn getUrisPortIn; private final URISavePortIn uriSavePortIn; - private final RemoveAllAdminURIRepo removeAllAdminURIRepo; + private final RemoveAllAdminURIMapper removeAllAdminURIMapper; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -34,7 +39,10 @@ public class InitUriAdminData implements ApplicationRunner { return; } - removeAllAdminURIRepo.deleteAllByAppType(AppType.ADMIN); + List uris = getUrisPortIn.connect(AppType.ADMIN); + removeAllAdminURIMapper.deleteAllByAdminUriIds( + uris.stream().map(URIElement::getId).collect(Collectors.toList())); + removeAllAdminURIMapper.deleteAllByAppType(AppType.ADMIN); final String ADMIN = "uri.admin"; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java index 42bb4758..aca9ae66 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java @@ -1,12 +1,15 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.adapters.persistence.initData.helper.RemoveAllFrontURIRepo; +import app.module.core.config.adapters.persistence.initData.helper.RemoveAllFrontURIMapper; import app.module.core.config.application.enums.AppType; +import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; +import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement; import app.module.core.usecase.uri.save.ports.URISavePortIn; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; -import org.springframework.transaction.annotation.Transactional; import java.io.IOException; +import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -14,6 +17,7 @@ import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; @Component @RequiredArgsConstructor @@ -21,8 +25,9 @@ import org.springframework.stereotype.Component; @Order(3) public class InitUriFrontData implements ApplicationRunner { + private final GetUrisPortIn getUrisPortIn; private final URISavePortIn uriSavePortIn; - private final RemoveAllFrontURIRepo removeAllFrontURIRepo; + private final RemoveAllFrontURIMapper removeAllFrontURIMapper; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -34,7 +39,10 @@ public class InitUriFrontData implements ApplicationRunner { return; } - removeAllFrontURIRepo.deleteAllByAppType(AppType.FRONT); + List uris = getUrisPortIn.connect(AppType.FRONT); + removeAllFrontURIMapper.deleteAllByFrontUriIds( + uris.stream().map(URIElement::getId).collect(Collectors.toList())); + removeAllFrontURIMapper.deleteAllByAppType(AppType.FRONT); final String FRONT_ROOT_ID = "uri.front"; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java similarity index 65% rename from core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIRepo.java rename to core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java index e80e3051..4647abdf 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIRepo.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java @@ -1,10 +1,11 @@ package app.module.core.config.adapters.persistence.initData.helper; import app.module.core.config.application.enums.AppType; +import java.util.List; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface RemoveAllAdminURIRepo { - +public interface RemoveAllAdminURIMapper { void deleteAllByAppType(AppType appType); + void deleteAllByAdminUriIds(List uriIds); } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllArticleRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllArticleMapper.java similarity index 53% rename from core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllArticleRepo.java rename to core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllArticleMapper.java index ce72cd3a..e4358018 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllArticleRepo.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllArticleMapper.java @@ -1,9 +1,8 @@ package app.module.core.config.adapters.persistence.initData.helper; -import app.module.core.config.adapters.persistence.entity.Article; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface RemoveAllArticleRepo { - +public interface RemoveAllArticleMapper { + void deleteAll(); } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java similarity index 65% rename from core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIRepo.java rename to core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java index c0e1e2b0..3f3cc980 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIRepo.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java @@ -1,10 +1,11 @@ package app.module.core.config.adapters.persistence.initData.helper; import app.module.core.config.application.enums.AppType; +import java.util.List; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface RemoveAllFrontURIRepo { - +public interface RemoveAllFrontURIMapper { void deleteAllByAppType(AppType appType); + void deleteAllByFrontUriIds(List uriIds); } diff --git a/core/src/main/java/app/module/core/config/adapters/web/interceptor/AuditFieldInterceptor.java b/core/src/main/java/app/module/core/config/adapters/web/interceptor/AuditFieldInterceptor.java index 929961a6..e3f15e9e 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/interceptor/AuditFieldInterceptor.java +++ b/core/src/main/java/app/module/core/config/adapters/web/interceptor/AuditFieldInterceptor.java @@ -46,7 +46,6 @@ public class AuditFieldInterceptor implements Interceptor { auditEntity.setCreatedAt(now); auditEntity.setUpdatedBy(userId); auditEntity.setUpdatedAt(now); - auditEntity.setIsDeleted(false); } else if (SqlCommandType.UPDATE.equals(sqlCommandType)) { auditEntity.setUpdatedBy(userId); auditEntity.setUpdatedAt(now); diff --git a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/RemoveAdminDao.java b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/RemoveAdminDao.java index 7c031e90..34e697e0 100644 --- a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/RemoveAdminDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/RemoveAdminDao.java @@ -19,7 +19,7 @@ class RemoveAdminDao implements RemoveAdminPortOut { String loginUser = CommonUtil.getLoginUsername(); LocalDateTime now = LocalDateTime.now(); RemoveAdminParam param = - new RemoveAdminParam(checkedIds, now, loginUser, now, loginUser, true); + new RemoveAdminParam(checkedIds, now, loginUser, now, loginUser); // 매핑된 역할 먼저 삭제 mapper.deleteAdminHasRoleByAdminId(param); diff --git a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java index 288bc999..52c621e0 100644 --- a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java @@ -15,5 +15,4 @@ public class RemoveAdminParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java index 2d6b5623..16e08a70 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java @@ -49,12 +49,12 @@ class SaveAdminDao implements SaveAdminPortOut { private void updateAdmin(Admin admin, SaveAdminCmd cmd, String userId, LocalDateTime now) { mapper.updateAdmin(admin); mapper.deleteAdminRolesByAdminId(new DeleteAdminHasRoleParam( - cmd.getId(), now, userId, now, userId, true + cmd.getId(), now, userId, now, userId )); if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { mapper.insertAdminHasRoles(new SaveAdminHasRoleParam( - cmd.getId(), cmd.getRoleIds(), now, userId, now, userId, false + cmd.getId(), cmd.getRoleIds(), now, userId, now, userId )); } } @@ -64,7 +64,7 @@ class SaveAdminDao implements SaveAdminPortOut { if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { mapper.insertAdminHasRoles(new SaveAdminHasRoleParam( - cmd.getId(), cmd.getRoleIds(), now, userId, now, userId, false + cmd.getId(), cmd.getRoleIds(), now, userId, now, userId )); } } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java index ef1afb43..6558861c 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java @@ -14,5 +14,4 @@ public class DeleteAdminHasRoleParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java index 8ac4ebba..042d9488 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java @@ -16,5 +16,4 @@ public class SaveAdminHasRoleParam { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/article/comment/removeArticleComment/adapters/persistence/RemoveArticleCommentDao.java b/core/src/main/java/app/module/core/usecase/article/comment/removeArticleComment/adapters/persistence/RemoveArticleCommentDao.java index fed8f933..42f939f8 100644 --- a/core/src/main/java/app/module/core/usecase/article/comment/removeArticleComment/adapters/persistence/RemoveArticleCommentDao.java +++ b/core/src/main/java/app/module/core/usecase/article/comment/removeArticleComment/adapters/persistence/RemoveArticleCommentDao.java @@ -22,6 +22,6 @@ class RemoveArticleCommentDao implements RemoveArticleCommentPortOut { mapper.deleteById( new RemoveArticleCommentParam( - command.getRemoveId(), now, loginUser, now, loginUser, true)); + command.getRemoveId(), now, loginUser, now, loginUser)); } } diff --git a/core/src/main/java/app/module/core/usecase/article/comment/removeArticleComment/adapters/persistence/model/RemoveArticleCommentParam.java b/core/src/main/java/app/module/core/usecase/article/comment/removeArticleComment/adapters/persistence/model/RemoveArticleCommentParam.java index 02c256e8..eada47f2 100644 --- a/core/src/main/java/app/module/core/usecase/article/comment/removeArticleComment/adapters/persistence/model/RemoveArticleCommentParam.java +++ b/core/src/main/java/app/module/core/usecase/article/comment/removeArticleComment/adapters/persistence/model/RemoveArticleCommentParam.java @@ -12,5 +12,4 @@ public class RemoveArticleCommentParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/CreateArticleDao.java b/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/CreateArticleDao.java index 0059ee2b..8c0b6904 100644 --- a/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/CreateArticleDao.java +++ b/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/CreateArticleDao.java @@ -41,8 +41,7 @@ class CreateArticleDao implements CreateArticlePortOut { LocalDateTime.now(), CommonUtil.getLoginUsername(), LocalDateTime.now(), - CommonUtil.getLoginUsername(), - false); + CommonUtil.getLoginUsername()); mapper.createArticle(dto); @@ -55,8 +54,7 @@ class CreateArticleDao implements CreateArticlePortOut { LocalDateTime.now(), CommonUtil.getLoginUsername(), LocalDateTime.now(), - CommonUtil.getLoginUsername(), - false + CommonUtil.getLoginUsername() )); } diff --git a/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/model/CreateArticleDto.java b/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/model/CreateArticleDto.java index 9a04d952..b46226b7 100644 --- a/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/model/CreateArticleDto.java +++ b/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/model/CreateArticleDto.java @@ -24,5 +24,4 @@ public class CreateArticleDto { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/model/CreateArticleHasUploadFilesParam.java b/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/model/CreateArticleHasUploadFilesParam.java index 57f82c55..1138bca8 100644 --- a/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/model/CreateArticleHasUploadFilesParam.java +++ b/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/model/CreateArticleHasUploadFilesParam.java @@ -18,5 +18,4 @@ public class CreateArticleHasUploadFilesParam { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/article/removeArticles/adapters/persistence/RemoveArticlesDao.java b/core/src/main/java/app/module/core/usecase/article/removeArticles/adapters/persistence/RemoveArticlesDao.java index 8920852d..347b0ee4 100644 --- a/core/src/main/java/app/module/core/usecase/article/removeArticles/adapters/persistence/RemoveArticlesDao.java +++ b/core/src/main/java/app/module/core/usecase/article/removeArticles/adapters/persistence/RemoveArticlesDao.java @@ -20,10 +20,9 @@ class RemoveArticlesDao implements RemoveArticlesPortOut { String loginUser = CommonUtil.getLoginUsername();; LocalDateTime now = LocalDateTime.now(); - // TODO : article_has_upload_file 테이블에 -> AuditEntity 가 없어 일단 물리삭제로 진행 -> 논리삭제로 변경해야함. mapper.deleteArticleHasFiles( - new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser, true)); + new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser)); mapper.deleteArticles( - new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser, true)); + new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser)); } } diff --git a/core/src/main/java/app/module/core/usecase/article/removeArticles/adapters/persistence/model/RemoveArticlesParam.java b/core/src/main/java/app/module/core/usecase/article/removeArticles/adapters/persistence/model/RemoveArticlesParam.java index 2d1dcfd3..5f0651db 100644 --- a/core/src/main/java/app/module/core/usecase/article/removeArticles/adapters/persistence/model/RemoveArticlesParam.java +++ b/core/src/main/java/app/module/core/usecase/article/removeArticles/adapters/persistence/model/RemoveArticlesParam.java @@ -16,5 +16,4 @@ public class RemoveArticlesParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/article/updateArticle/adapters/persistence/UpdateArticleDao.java b/core/src/main/java/app/module/core/usecase/article/updateArticle/adapters/persistence/UpdateArticleDao.java index df10fa19..29160be2 100644 --- a/core/src/main/java/app/module/core/usecase/article/updateArticle/adapters/persistence/UpdateArticleDao.java +++ b/core/src/main/java/app/module/core/usecase/article/updateArticle/adapters/persistence/UpdateArticleDao.java @@ -45,8 +45,7 @@ class UpdateArticleDao implements UpdateArticlePortOut { LocalDateTime.now(), CommonUtil.getLoginUsername(), LocalDateTime.now(), - CommonUtil.getLoginUsername(), - true + CommonUtil.getLoginUsername() )); } } diff --git a/core/src/main/java/app/module/core/usecase/article/updateArticle/adapters/persistence/model/CreateUploadFileParam.java b/core/src/main/java/app/module/core/usecase/article/updateArticle/adapters/persistence/model/CreateUploadFileParam.java index ba65fcd2..132ce054 100644 --- a/core/src/main/java/app/module/core/usecase/article/updateArticle/adapters/persistence/model/CreateUploadFileParam.java +++ b/core/src/main/java/app/module/core/usecase/article/updateArticle/adapters/persistence/model/CreateUploadFileParam.java @@ -14,5 +14,4 @@ public class CreateUploadFileParam { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveDao.java b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveDao.java index 4a6d3d22..cda29fe5 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveDao.java +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/PrivilegeRemoveDao.java @@ -17,7 +17,7 @@ public class PrivilegeRemoveDao implements PrivilegeRemovePortOut { public void connect(String id) { String userId = CommonUtil.getLoginUsername(); LocalDateTime now = LocalDateTime.now(); - PrivilegeRemoveParam param = new PrivilegeRemoveParam(id, now, userId, now, userId, true); + PrivilegeRemoveParam param = new PrivilegeRemoveParam(id, now, userId, now, userId); mapper.deleteRoleHasPrivilegesByPrivilegeId(param); mapper.deleteById(param); diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/model/PrivilegeRemoveParam.java b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/model/PrivilegeRemoveParam.java index e7b5e37c..f5fdbb01 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/model/PrivilegeRemoveParam.java +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/adapters/persistence/model/PrivilegeRemoveParam.java @@ -14,5 +14,4 @@ public class PrivilegeRemoveParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveDao.java b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveDao.java index c01e2f39..f5200d35 100644 --- a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveDao.java +++ b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/RoleRemoveDao.java @@ -17,7 +17,7 @@ public class RoleRemoveDao implements RoleRemovePortOut { public void connect(String role) { String userId = CommonUtil.getLoginUsername(); LocalDateTime now = LocalDateTime.now(); - RoleRemoveParam param = new RoleRemoveParam(role, now, userId, now, userId, true); + RoleRemoveParam param = new RoleRemoveParam(role, now, userId, now, userId); mapper.deleteRoleHasPrivilegesByRoleId(param); mapper.deleteAdminHasRoleByRoleId(param); diff --git a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/model/RoleRemoveParam.java b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/model/RoleRemoveParam.java index 389baee3..177567ce 100644 --- a/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/model/RoleRemoveParam.java +++ b/core/src/main/java/app/module/core/usecase/role/remove/adapters/persistence/model/RoleRemoveParam.java @@ -14,5 +14,4 @@ public class RoleRemoveParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } 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 a15ab900..9bee5a5e 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 @@ -43,13 +43,13 @@ public class RoleSaveDao implements RoleSavePortOut { private void updateRole(Role role, List privilegeIds, String userId, LocalDateTime now) { mapper.deleteAllRoleHasPrivileges(new RoleHasPrivilegeDeleteParam( - role.getId(), now, userId, now, userId, true + role.getId(), now, userId, now, userId )); mapper.updateRole(role); if (CollectionUtils.isNotEmpty(privilegeIds)) { mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam( - role.getId(), privilegeIds, now, userId, now, userId, false + role.getId(), privilegeIds, now, userId, now, userId )); } } @@ -59,7 +59,7 @@ public class RoleSaveDao implements RoleSavePortOut { if (CollectionUtils.isNotEmpty(privilegeIds)) { mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam( - role.getId(), privilegeIds, now, userId, now, userId, false + role.getId(), privilegeIds, now, userId, now, userId )); } } diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java index 4ab363e7..1245856a 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java @@ -14,5 +14,4 @@ public class RoleHasPrivilegeDeleteParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java index 51a5b63c..6c06bf0e 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java @@ -16,5 +16,4 @@ public class RoleHasPrivilegeSaveParam { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveDao.java b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveDao.java index 104e4fb9..aab07b5b 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/UICodeRemoveDao.java @@ -18,6 +18,6 @@ class UICodeRemoveDao implements UICodeRemovePortOut { String userId = CommonUtil.getLoginUsername(); LocalDateTime now = LocalDateTime.now(); - mapper.deleteById(new UICodeRemoveParam(id, now, userId, now, userId, true)); + mapper.deleteById(new UICodeRemoveParam(id, now, userId, now, userId)); } } diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/model/UICodeRemoveParam.java b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/model/UICodeRemoveParam.java index 0c2e2546..501942b7 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/model/UICodeRemoveParam.java +++ b/core/src/main/java/app/module/core/usecase/uicode/remove/adapters/persistence/model/UICodeRemoveParam.java @@ -14,5 +14,4 @@ public class UICodeRemoveParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/model/DeleteUICodeParam.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/model/DeleteUICodeParam.java index 3e5041e7..2a86172d 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/model/DeleteUICodeParam.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/model/DeleteUICodeParam.java @@ -14,5 +14,4 @@ public class DeleteUICodeParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisMapper.java b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisMapper.java index b6ccd824..e92f3e26 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisMapper.java @@ -11,8 +11,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface GetUrisMapper { List findAllByAppType(AppType appType); - List findAllRolesByUriId(String uriId); - List findAllRoleHasPrivilegeByRoleId(String roleId); -// List findRolesWithPrivilegesByUriIds(@Param("uriIds") List uriIds); List findRolesWithPrivilegesByUriIds(@Param("uriIds") List uriIds); } \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisRepo.java b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisRepo.java deleted file mode 100644 index 53aa82fb..00000000 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisRepo.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.core.usecase.uri.getUris.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.URI; -import app.module.core.config.application.enums.AppType; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetUrisRepo { - - List findAllByAppType(AppType appType); -} diff --git a/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/URIRemoveDao.java b/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/URIRemoveDao.java index b33563aa..55317329 100644 --- a/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/URIRemoveDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/URIRemoveDao.java @@ -17,7 +17,7 @@ class URIRemoveDao implements URIRemovePortOut { public void connect(String id) { String userId = CommonUtil.getLoginUsername(); LocalDateTime now = LocalDateTime.now(); - URIRemoveParam uriRemoveParam = new URIRemoveParam(id, now, userId, now, userId, true); + URIRemoveParam uriRemoveParam = new URIRemoveParam(id, now, userId, now, userId); mapper.deleteUriHasPrivilegesByUriId(uriRemoveParam); mapper.deleteById(uriRemoveParam); diff --git a/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/model/URIRemoveParam.java b/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/model/URIRemoveParam.java index 82497d43..7f2c57f0 100644 --- a/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/model/URIRemoveParam.java +++ b/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/model/URIRemoveParam.java @@ -14,5 +14,4 @@ public class URIRemoveParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } 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 22491294..d3685580 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 @@ -60,13 +60,13 @@ public class URISaveDao implements URISavePortOut { private void updateUri(URI uri, Set roleIds, String userId, LocalDateTime now) { mapper.deleteUriHasRoles(new UriHasRoleDeleteParam( - uri.getId(), now, userId, now, userId, true + uri.getId(), now, userId, now, userId )); mapper.updateUri(uri); if (CollectionUtils.isNotEmpty(roleIds)) { mapper.insertUriHasRoles(new UriHasRoleSaveParam( - uri.getId(), roleIds, now, userId, now, userId, false + uri.getId(), roleIds, now, userId, now, userId )); } } @@ -76,7 +76,7 @@ public class URISaveDao implements URISavePortOut { if (CollectionUtils.isNotEmpty(roleIds)) { mapper.insertUriHasRoles(new UriHasRoleSaveParam( - uri.getId(), roleIds, now, userId, now, userId, false + uri.getId(), roleIds, now, userId, now, userId )); } } diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleDeleteParam.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleDeleteParam.java index 6a7d663c..b2a67e0b 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleDeleteParam.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleDeleteParam.java @@ -14,5 +14,4 @@ public class UriHasRoleDeleteParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleSaveParam.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleSaveParam.java index 861b61d1..06f35e10 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleSaveParam.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleSaveParam.java @@ -17,5 +17,4 @@ public class UriHasRoleSaveParam { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } 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 index 3e9f5269..ffcbe2f0 100644 --- 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 @@ -43,13 +43,13 @@ class UpdateFrontUserDao implements UpdateFrontUserPortOut { if (CollectionUtils.isNotEmpty(cmd.getFileMappingId())) { // 파일 삭제 mapper.deleteFrontUserHasUploadFiles( - new UpdateFrontUserParam(userId, now, loginUser, now, loginUser, true)); + new UpdateFrontUserParam(userId, now, loginUser, now, loginUser)); // 저장 mapper.insertFrontUserHasUploadFiles( new UpdateFrontUserHasUploadFileParam( userId, cmd.getFileMappingId().stream().map(Long::parseLong).toList(), - now, loginUser, now, loginUser, false)); + now, loginUser, now, loginUser)); } } } 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 index 8acb5a23..8a3ff805 100644 --- 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 @@ -16,5 +16,4 @@ public class UpdateFrontUserHasUploadFileParam { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } 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 index 10f73fb4..89e9aa2b 100644 --- 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 @@ -14,5 +14,4 @@ public class UpdateFrontUserParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } 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 index d3318004..3ec25cb7 100644 --- 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 @@ -39,13 +39,13 @@ class UpdateUserDao implements UpdateUserPortOut { // 기존 역할 삭제 mapper.deleteFrontUserHasRoles( - new UpdateFrontUserByAdminParam(userId, now, loginUser, now, loginUser, true)); + 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, false)); + userId, cmd.getRoles().stream().toList(), now, loginUser, now, loginUser)); } } } 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 index 96031f73..2f82933a 100644 --- 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 @@ -14,5 +14,4 @@ public class UpdateFrontUserByAdminParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } 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 index 999f679a..8120bd13 100644 --- 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 @@ -16,5 +16,4 @@ public class UpdateFrontUserHasRoleParam { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeDao.java index 4ac81841..d4436429 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/RemoveUserPrivilegeDao.java @@ -1,6 +1,5 @@ package app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence; -import app.module.core.config.adapters.persistence.repository.FrontUserPrivilegeRepo; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence.model.RemoveUserPrivilegeParam; import app.module.core.usecase.userPrivilege.removeUserPrivilege.ports.RemoveUserPrivilegePortOut; @@ -21,6 +20,6 @@ class RemoveUserPrivilegeDao implements RemoveUserPrivilegePortOut { LocalDateTime now = LocalDateTime.now(); mapper.deleteUserPrivilege( - new RemoveUserPrivilegeParam(cmd.getId(), now, loginUser, now, loginUser, true)); + new RemoveUserPrivilegeParam(cmd.getId(), now, loginUser, now, loginUser)); } } diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/model/RemoveUserPrivilegeParam.java b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/model/RemoveUserPrivilegeParam.java index 583af190..05f2d9b2 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/model/RemoveUserPrivilegeParam.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/adapters/persistence/model/RemoveUserPrivilegeParam.java @@ -14,5 +14,4 @@ public class RemoveUserPrivilegeParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } 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 2a05cb37..ba295985 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 @@ -2,14 +2,11 @@ package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persist import app.module.core.config.adapters.persistence.entity.Privilege; import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.userPrivilege.getUserPrivilege.adapters.persistence.GetUserPrivilegeMapper; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege; -import app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence.model.DeletePrivilegeParam; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.SaveUserPrivilegePortOut; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilege; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilegeCmd; -import java.time.LocalDateTime; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/DeletePrivilegeParam.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/DeletePrivilegeParam.java deleted file mode 100644 index bbb7372a..00000000 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/model/DeletePrivilegeParam.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persistence.model; - -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -public class DeletePrivilegeParam { - private String id; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; - private Boolean isDeleted; -} diff --git a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleDao.java index 562f80f4..22bd25d9 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/RemoveUserRoleDao.java @@ -19,7 +19,7 @@ class RemoveUserRoleDao implements RemoveUserRolePortOut { String loginUser = CommonUtil.getLoginUsername(); LocalDateTime now = LocalDateTime.now(); RemoveUserRoleParam param = - new RemoveUserRoleParam(cmd.getId(), now, loginUser, now, loginUser, true); + new RemoveUserRoleParam(cmd.getId(), now, loginUser, now, loginUser); mapper.deleteFrontUserHasRole(param); mapper.deleteRoleHasPrivilege(param); diff --git a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/model/RemoveUserRoleParam.java b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/model/RemoveUserRoleParam.java index 433062a9..b80bccf9 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/model/RemoveUserRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/adapters/persistence/model/RemoveUserRoleParam.java @@ -14,5 +14,4 @@ public class RemoveUserRoleParam { private String updatedBy; private LocalDateTime deletedAt; private String deletedBy; - private Boolean isDeleted; } 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 c2705e2b..264a904d 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 @@ -41,7 +41,7 @@ class SaveUserRoleDao implements SaveUserRolePortOut { // 권한 삭제 mapper.deleteAllRoleHasPrivileges( - new RoleHasPrivilegeDeleteParam(cmd.getId(), now, loginUser, now, loginUser, true) + new RoleHasPrivilegeDeleteParam(cmd.getId(), now, loginUser, now, loginUser) ); if (existedRole.isPresent()) { @@ -53,7 +53,7 @@ class SaveUserRoleDao implements SaveUserRolePortOut { // 권한 insert if (CollectionUtils.isNotEmpty(cmd.getPrivilegeIds())) { mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam( - role.getId(), cmd.getPrivilegeIds(), now, loginUser, now, loginUser, false + role.getId(), cmd.getPrivilegeIds(), now, loginUser, now, loginUser )); } diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java index 1a7a7e9d..b795b7bb 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java @@ -12,5 +12,4 @@ public class RoleHasPrivilegeDeleteParam { private String deletedBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java index f1460fb4..7513529d 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java @@ -14,5 +14,4 @@ public class RoleHasPrivilegeSaveParam { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private Boolean isDeleted; } diff --git a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml index 95f146ce..1b636b21 100644 --- a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml +++ b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml @@ -58,7 +58,8 @@ /* deleteAdminRolesByAdminId : 관리자 역할 매핑 정보 수정 */ UPDATE admin_has_role - SET + SET is_deleted = true + WHERE admin_id = #{adminId} \ No newline at end of file diff --git a/core/src/main/resources/mappers/common/CommonFieldsMapper.xml b/core/src/main/resources/mappers/common/CommonFieldsMapper.xml index 4ba5adb9..095790e6 100644 --- a/core/src/main/resources/mappers/common/CommonFieldsMapper.xml +++ b/core/src/main/resources/mappers/common/CommonFieldsMapper.xml @@ -8,16 +8,14 @@ created_by, created_at, updated_by, - updated_at, - is_deleted + updated_at #{createdBy}, #{createdAt}, #{updatedBy}, - #{updatedAt}, - #{isDeleted} + #{updatedAt} @@ -38,7 +36,7 @@ updated_at = #{updatedAt}, deleted_by = #{deletedBy}, deleted_at = #{deletedAt}, - is_deleted = #{isDeleted} + is_deleted = true diff --git a/core/src/main/resources/mappers/initData/RemoveAllAdminURIMapper.xml b/core/src/main/resources/mappers/initData/RemoveAllAdminURIMapper.xml new file mode 100644 index 00000000..8f098218 --- /dev/null +++ b/core/src/main/resources/mappers/initData/RemoveAllAdminURIMapper.xml @@ -0,0 +1,18 @@ + + + + + DELETE FROM uri + WHERE app_type = #{appType} + + + + DELETE FROM uri_has_role + WHERE uri_id IN + + #{id} + + + \ No newline at end of file diff --git a/core/src/main/resources/mappers/initData/RemoveAllArticleMapper.xml b/core/src/main/resources/mappers/initData/RemoveAllArticleMapper.xml new file mode 100644 index 00000000..f9c20aff --- /dev/null +++ b/core/src/main/resources/mappers/initData/RemoveAllArticleMapper.xml @@ -0,0 +1,9 @@ + + + + + DELETE FROM article + + \ No newline at end of file diff --git a/core/src/main/resources/mappers/initData/RemoveAllFrontURIMapper.xml b/core/src/main/resources/mappers/initData/RemoveAllFrontURIMapper.xml new file mode 100644 index 00000000..7ac52bd5 --- /dev/null +++ b/core/src/main/resources/mappers/initData/RemoveAllFrontURIMapper.xml @@ -0,0 +1,19 @@ + + + + + + DELETE FROM uri + WHERE app_type = #{appType} + + + + DELETE FROM uri_has_role + WHERE uri_id IN + + #{id} + + + \ No newline at end of file