isDeleted 일괄 수정
This commit is contained in:
@@ -22,8 +22,7 @@ public class LoggedInUserRemoveDao implements LoggedInUserRemovePortOut {
|
|||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername(),
|
CommonUtil.getLoginUsername(),
|
||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername(),
|
CommonUtil.getLoginUsername()
|
||||||
false
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,5 +16,4 @@ public class LoggedInUserRemoveParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import lombok.Setter;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
public class AuditEntity {
|
public class AuditEntity {
|
||||||
|
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
|
|||||||
@@ -12,12 +12,19 @@ import lombok.Setter;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class Admin extends AuditEntity {
|
public class Admin extends AuditEntity {
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
private LocalDateTime passwordUpdatedAt;
|
private LocalDateTime passwordUpdatedAt;
|
||||||
|
|
||||||
private Boolean accountDisabled;
|
private Boolean accountDisabled;
|
||||||
|
|
||||||
private Integer loginFailCnt;
|
private Integer loginFailCnt;
|
||||||
|
|
||||||
private Boolean accountLocked;
|
private Boolean accountLocked;
|
||||||
|
|
||||||
public Admin(String id) {
|
public Admin(String id) {
|
||||||
|
|||||||
@@ -12,14 +12,23 @@ import lombok.Setter;
|
|||||||
@Setter
|
@Setter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
public class Article extends AuditEntity {
|
public class Article extends AuditEntity {
|
||||||
|
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
private String content;
|
private String content;
|
||||||
|
|
||||||
private Boolean visible;
|
private Boolean visible;
|
||||||
|
|
||||||
private LocalDateTime startDate;
|
private LocalDateTime startDate;
|
||||||
|
|
||||||
private LocalDateTime endDate;
|
private LocalDateTime endDate;
|
||||||
|
|
||||||
private Integer orderNo;
|
private Integer orderNo;
|
||||||
|
|
||||||
private List<UploadFile> uploadFiles = Collections.emptyList();
|
private List<UploadFile> uploadFiles = Collections.emptyList();
|
||||||
|
|
||||||
private List<ArticleComment> articleComments = Collections.emptyList();
|
private List<ArticleComment> articleComments = Collections.emptyList();
|
||||||
|
|
||||||
public Article(Long id) {
|
public Article(Long id) {
|
||||||
|
|||||||
@@ -11,7 +11,9 @@ import lombok.Setter;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class ArticleHasUploadFile extends AuditEntity {
|
public class ArticleHasUploadFile extends AuditEntity {
|
||||||
|
|
||||||
private Long articleId;
|
private Long articleId;
|
||||||
|
|
||||||
private Long uploadFilesId;
|
private Long uploadFilesId;
|
||||||
|
|
||||||
public ArticleHasUploadFile(Long articleId) {
|
public ArticleHasUploadFile(Long articleId) {
|
||||||
|
|||||||
@@ -15,15 +15,25 @@ import lombok.Setter;
|
|||||||
public class FrontUser extends AuditEntity {
|
public class FrontUser extends AuditEntity {
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
private String nickname;
|
private String nickname;
|
||||||
|
|
||||||
private SignUpType signUpType;
|
private SignUpType signUpType;
|
||||||
|
|
||||||
private LocalDateTime passwordUpdatedAt;
|
private LocalDateTime passwordUpdatedAt;
|
||||||
|
|
||||||
private Boolean accountDisabled;
|
private Boolean accountDisabled;
|
||||||
|
|
||||||
private Integer loginFailCnt;
|
private Integer loginFailCnt;
|
||||||
|
|
||||||
private Boolean accountLocked;
|
private Boolean accountLocked;
|
||||||
|
|
||||||
// private String roleId;
|
// private String roleId;
|
||||||
|
|
||||||
private String uploadFileId;
|
private String uploadFileId;
|
||||||
|
|
||||||
public FrontUser(String id) {
|
public FrontUser(String id) {
|
||||||
|
|||||||
@@ -9,7 +9,10 @@ import lombok.Setter;
|
|||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class FrontUserHasRole extends AuditEntity {
|
public class FrontUserHasRole extends AuditEntity {
|
||||||
|
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
private String frontUSerId;
|
private String frontUSerId;
|
||||||
|
|
||||||
private String roleId;
|
private String roleId;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,9 @@ import lombok.Setter;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class FrontUserHasUploadFile extends AuditEntity {
|
public class FrontUserHasUploadFile extends AuditEntity {
|
||||||
|
|
||||||
private String frontUserId;
|
private String frontUserId;
|
||||||
|
|
||||||
private Long uploadFilesId;
|
private Long uploadFilesId;
|
||||||
|
|
||||||
public FrontUserHasUploadFile(String frontUserId) {
|
public FrontUserHasUploadFile(String frontUserId) {
|
||||||
|
|||||||
@@ -18,8 +18,12 @@ import lombok.Setter;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class LoggedInUser extends AuditEntity {
|
public class LoggedInUser extends AuditEntity {
|
||||||
|
|
||||||
private AppType appType;
|
private AppType appType;
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
private String clientIP;
|
private String clientIP;
|
||||||
|
|
||||||
private LocalDateTime lastLoggedInAt;
|
private LocalDateTime lastLoggedInAt;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,10 @@ import lombok.Setter;
|
|||||||
public class PersistentLogins extends AuditEntity {
|
public class PersistentLogins extends AuditEntity {
|
||||||
|
|
||||||
private String series;
|
private String series;
|
||||||
|
|
||||||
private String username;
|
private String username;
|
||||||
|
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
private Date lastUsed;
|
private Date lastUsed;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,9 +12,13 @@ import lombok.Setter;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class Privilege extends AuditEntity {
|
public class Privilege extends AuditEntity {
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
private AppType appType;
|
private AppType appType;
|
||||||
|
|
||||||
private Integer orderNo;
|
private Integer orderNo;
|
||||||
|
|
||||||
public Privilege(String id) {
|
public Privilege(String id) {
|
||||||
|
|||||||
@@ -13,9 +13,13 @@ import lombok.Setter;
|
|||||||
public class Role extends AuditEntity {
|
public class Role extends AuditEntity {
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
private AppType appType;
|
private AppType appType;
|
||||||
|
|
||||||
private Integer orderNo;
|
private Integer orderNo;
|
||||||
|
|
||||||
private Set<RoleHasPrivilege> hasPrivileges;
|
private Set<RoleHasPrivilege> hasPrivileges;
|
||||||
|
|
||||||
public Role(String id) {
|
public Role(String id) {
|
||||||
|
|||||||
@@ -11,10 +11,7 @@ import lombok.Setter;
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class RoleHasPrivilege extends AuditEntity {
|
public class RoleHasPrivilege extends AuditEntity {
|
||||||
|
|
||||||
private Integer id;
|
private Integer id;
|
||||||
|
|
||||||
private String roleId;
|
private String roleId;
|
||||||
|
|
||||||
private String privilegeId;
|
private String privilegeId;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData;
|
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.CreateArticlePortIn;
|
||||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
|
|||||||
public class InitArticleData implements ApplicationRunner {
|
public class InitArticleData implements ApplicationRunner {
|
||||||
|
|
||||||
private final CreateArticlePortIn createArticlePortIn;
|
private final CreateArticlePortIn createArticlePortIn;
|
||||||
private final RemoveAllArticleRepo removeAllArticleRepo;
|
private final RemoveAllArticleMapper removeAllArticleMapper;
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -27,8 +27,8 @@ public class InitArticleData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* // 전체 데이터 삭제
|
// 전체 데이터 삭제
|
||||||
removeAllArticleRepo.deleteAll();
|
removeAllArticleMapper.deleteAll();
|
||||||
|
|
||||||
IntStream.range(0, 25)
|
IntStream.range(0, 25)
|
||||||
.forEach(
|
.forEach(
|
||||||
@@ -40,6 +40,6 @@ public class InitArticleData implements ApplicationRunner {
|
|||||||
true,
|
true,
|
||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
LocalDateTime.now().plusMonths(2),
|
LocalDateTime.now().plusMonths(2),
|
||||||
null)));*/
|
null)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.adapters.persistence.entity.Privilege;
|
||||||
import app.module.core.config.application.enums.AppType;
|
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 app.module.core.usecase.privilege.save.adapters.persistence.PrivilegeSaveRepo;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@@ -15,7 +16,7 @@ import org.springframework.stereotype.Component;
|
|||||||
@Order(1)
|
@Order(1)
|
||||||
public class InitPrivilegeData implements ApplicationRunner {
|
public class InitPrivilegeData implements ApplicationRunner {
|
||||||
|
|
||||||
private final PrivilegeSaveRepo privilegeRepo;
|
private final PrivilegeSaveMapper privilegeSaveMapper;
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -26,7 +27,7 @@ public class InitPrivilegeData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*privilegeRepo.save(new Privilege("ADMIN_API", "ADMIN API 이용 권한", AppType.ADMIN, 0));
|
privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_API", "ADMIN API 이용 권한", AppType.ADMIN, 0));
|
||||||
privilegeRepo.save(new Privilege("ADMIN_ACCESS", "ADMIN 사이트 접근 권한", AppType.ADMIN, 1));*/
|
privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_ACCESS", "ADMIN 사이트 접근 권한", AppType.ADMIN, 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.PrivilegeRepo;
|
||||||
import app.module.core.config.adapters.persistence.repository.RoleRepo;
|
import app.module.core.config.adapters.persistence.repository.RoleRepo;
|
||||||
import app.module.core.config.application.enums.AppType;
|
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 java.util.Set;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@@ -19,8 +26,8 @@ import org.springframework.stereotype.Component;
|
|||||||
@Order(2)
|
@Order(2)
|
||||||
public class InitRoleData implements ApplicationRunner {
|
public class InitRoleData implements ApplicationRunner {
|
||||||
|
|
||||||
private final RoleRepo roleRepo;
|
private final RoleSaveMapper roleSaveMapper;
|
||||||
private final PrivilegeRepo privilegeViewRepo;
|
private final PrivilegeViewMapper privilegeViewRepo;
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -32,39 +39,42 @@ public class InitRoleData implements ApplicationRunner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 권한 `privilege` 정보 가져오기
|
// 권한 `privilege` 정보 가져오기
|
||||||
/*Privilege apiPrivilege = privilegeViewRepo.findById("ADMIN_API").orElseThrow();
|
PrivilegeView apiPrivilege = privilegeViewRepo.findById("ADMIN_API").orElseThrow();
|
||||||
Privilege privilege = privilegeViewRepo.findById("ADMIN_ACCESS").orElseThrow();*/
|
PrivilegeView privilege = privilegeViewRepo.findById("ADMIN_ACCESS").orElseThrow();
|
||||||
|
|
||||||
int orderNo = 0;
|
int orderNo = 0;
|
||||||
|
|
||||||
/*roleRepo.save(
|
roleSaveMapper.insertRole(new Role("ROLE_SUPER", "SUPER 관리자", AppType.ADMIN, orderNo++));
|
||||||
new Role(
|
roleSaveMapper.insertRoleHasPrivileges(
|
||||||
|
new RoleHasPrivilegeSaveParam(
|
||||||
"ROLE_SUPER",
|
"ROLE_SUPER",
|
||||||
"SUPER 관리자",
|
List.of(apiPrivilege.getId(), privilege.getId()),
|
||||||
AppType.ADMIN,
|
LocalDateTime.now(),
|
||||||
orderNo++,
|
"INIT_DATA",
|
||||||
Set.of(
|
LocalDateTime.now(),
|
||||||
new RoleHasPrivilege(null, new Role("ROLE_SUPER"), apiPrivilege),
|
"INIT_DATA"
|
||||||
new RoleHasPrivilege(null, new Role("ROLE_SUPER"), privilege))));
|
));
|
||||||
|
|
||||||
roleRepo.save(
|
roleSaveMapper.insertRole(new Role("ROLE_MANAGER", "매니저", AppType.ADMIN, orderNo++));
|
||||||
new Role(
|
roleSaveMapper.insertRoleHasPrivileges(
|
||||||
|
new RoleHasPrivilegeSaveParam(
|
||||||
"ROLE_MANAGER",
|
"ROLE_MANAGER",
|
||||||
"매니저",
|
List.of(apiPrivilege.getId(), privilege.getId()),
|
||||||
AppType.ADMIN,
|
LocalDateTime.now(),
|
||||||
orderNo++,
|
"INIT_DATA",
|
||||||
Set.of(
|
LocalDateTime.now(),
|
||||||
new RoleHasPrivilege(null, new Role("ROLE_MANAGER"), apiPrivilege),
|
"INIT_DATA"
|
||||||
new RoleHasPrivilege(null, new Role("ROLE_MANAGER"), privilege))));
|
));
|
||||||
|
|
||||||
roleRepo.save(
|
roleSaveMapper.insertRole(new Role("ROLE_STAFF", "스텝", AppType.ADMIN, orderNo++));
|
||||||
new Role(
|
roleSaveMapper.insertRoleHasPrivileges(
|
||||||
|
new RoleHasPrivilegeSaveParam(
|
||||||
"ROLE_STAFF",
|
"ROLE_STAFF",
|
||||||
"스텝",
|
List.of(apiPrivilege.getId(), privilege.getId()),
|
||||||
AppType.ADMIN,
|
LocalDateTime.now(),
|
||||||
orderNo++,
|
"INIT_DATA",
|
||||||
Set.of(
|
LocalDateTime.now(),
|
||||||
new RoleHasPrivilege(null, new Role("ROLE_STAFF"), apiPrivilege),
|
"INIT_DATA"
|
||||||
new RoleHasPrivilege(null, new Role("ROLE_STAFF"), privilege))));*/
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData;
|
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.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.URISavePortIn;
|
||||||
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
|
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@@ -21,8 +25,9 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
@Order(3)
|
@Order(3)
|
||||||
public class InitUriAdminData implements ApplicationRunner {
|
public class InitUriAdminData implements ApplicationRunner {
|
||||||
|
|
||||||
|
private final GetUrisPortIn getUrisPortIn;
|
||||||
private final URISavePortIn uriSavePortIn;
|
private final URISavePortIn uriSavePortIn;
|
||||||
private final RemoveAllAdminURIRepo removeAllAdminURIRepo;
|
private final RemoveAllAdminURIMapper removeAllAdminURIMapper;
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -34,7 +39,10 @@ public class InitUriAdminData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
removeAllAdminURIRepo.deleteAllByAppType(AppType.ADMIN);
|
List<URIElement> uris = getUrisPortIn.connect(AppType.ADMIN);
|
||||||
|
removeAllAdminURIMapper.deleteAllByAdminUriIds(
|
||||||
|
uris.stream().map(URIElement::getId).collect(Collectors.toList()));
|
||||||
|
removeAllAdminURIMapper.deleteAllByAppType(AppType.ADMIN);
|
||||||
|
|
||||||
final String ADMIN = "uri.admin";
|
final String ADMIN = "uri.admin";
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,15 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData;
|
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.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.URISavePortIn;
|
||||||
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
|
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@@ -14,6 +17,7 @@ import org.springframework.boot.ApplicationArguments;
|
|||||||
import org.springframework.boot.ApplicationRunner;
|
import org.springframework.boot.ApplicationRunner;
|
||||||
import org.springframework.core.annotation.Order;
|
import org.springframework.core.annotation.Order;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -21,8 +25,9 @@ import org.springframework.stereotype.Component;
|
|||||||
@Order(3)
|
@Order(3)
|
||||||
public class InitUriFrontData implements ApplicationRunner {
|
public class InitUriFrontData implements ApplicationRunner {
|
||||||
|
|
||||||
|
private final GetUrisPortIn getUrisPortIn;
|
||||||
private final URISavePortIn uriSavePortIn;
|
private final URISavePortIn uriSavePortIn;
|
||||||
private final RemoveAllFrontURIRepo removeAllFrontURIRepo;
|
private final RemoveAllFrontURIMapper removeAllFrontURIMapper;
|
||||||
|
|
||||||
@Value("${app.initData.core}")
|
@Value("${app.initData.core}")
|
||||||
private boolean isCoreDataRequired;
|
private boolean isCoreDataRequired;
|
||||||
@@ -34,7 +39,10 @@ public class InitUriFrontData implements ApplicationRunner {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
removeAllFrontURIRepo.deleteAllByAppType(AppType.FRONT);
|
List<URIElement> 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";
|
final String FRONT_ROOT_ID = "uri.front";
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData.helper;
|
package app.module.core.config.adapters.persistence.initData.helper;
|
||||||
|
|
||||||
import app.module.core.config.application.enums.AppType;
|
import app.module.core.config.application.enums.AppType;
|
||||||
|
import java.util.List;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface RemoveAllAdminURIRepo {
|
public interface RemoveAllAdminURIMapper {
|
||||||
|
|
||||||
void deleteAllByAppType(AppType appType);
|
void deleteAllByAppType(AppType appType);
|
||||||
|
void deleteAllByAdminUriIds(List<String> uriIds);
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData.helper;
|
package app.module.core.config.adapters.persistence.initData.helper;
|
||||||
|
|
||||||
import app.module.core.config.adapters.persistence.entity.Article;
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface RemoveAllArticleRepo {
|
public interface RemoveAllArticleMapper {
|
||||||
|
void deleteAll();
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
package app.module.core.config.adapters.persistence.initData.helper;
|
package app.module.core.config.adapters.persistence.initData.helper;
|
||||||
|
|
||||||
import app.module.core.config.application.enums.AppType;
|
import app.module.core.config.application.enums.AppType;
|
||||||
|
import java.util.List;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface RemoveAllFrontURIRepo {
|
public interface RemoveAllFrontURIMapper {
|
||||||
|
|
||||||
void deleteAllByAppType(AppType appType);
|
void deleteAllByAppType(AppType appType);
|
||||||
|
void deleteAllByFrontUriIds(List<String> uriIds);
|
||||||
}
|
}
|
||||||
@@ -46,7 +46,6 @@ public class AuditFieldInterceptor implements Interceptor {
|
|||||||
auditEntity.setCreatedAt(now);
|
auditEntity.setCreatedAt(now);
|
||||||
auditEntity.setUpdatedBy(userId);
|
auditEntity.setUpdatedBy(userId);
|
||||||
auditEntity.setUpdatedAt(now);
|
auditEntity.setUpdatedAt(now);
|
||||||
auditEntity.setIsDeleted(false);
|
|
||||||
} else if (SqlCommandType.UPDATE.equals(sqlCommandType)) {
|
} else if (SqlCommandType.UPDATE.equals(sqlCommandType)) {
|
||||||
auditEntity.setUpdatedBy(userId);
|
auditEntity.setUpdatedBy(userId);
|
||||||
auditEntity.setUpdatedAt(now);
|
auditEntity.setUpdatedAt(now);
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ class RemoveAdminDao implements RemoveAdminPortOut {
|
|||||||
String loginUser = CommonUtil.getLoginUsername();
|
String loginUser = CommonUtil.getLoginUsername();
|
||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
RemoveAdminParam param =
|
RemoveAdminParam param =
|
||||||
new RemoveAdminParam(checkedIds, now, loginUser, now, loginUser, true);
|
new RemoveAdminParam(checkedIds, now, loginUser, now, loginUser);
|
||||||
|
|
||||||
// 매핑된 역할 먼저 삭제
|
// 매핑된 역할 먼저 삭제
|
||||||
mapper.deleteAdminHasRoleByAdminId(param);
|
mapper.deleteAdminHasRoleByAdminId(param);
|
||||||
|
|||||||
@@ -15,5 +15,4 @@ public class RemoveAdminParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,12 +49,12 @@ class SaveAdminDao implements SaveAdminPortOut {
|
|||||||
private void updateAdmin(Admin admin, SaveAdminCmd cmd, String userId, LocalDateTime now) {
|
private void updateAdmin(Admin admin, SaveAdminCmd cmd, String userId, LocalDateTime now) {
|
||||||
mapper.updateAdmin(admin);
|
mapper.updateAdmin(admin);
|
||||||
mapper.deleteAdminRolesByAdminId(new DeleteAdminHasRoleParam(
|
mapper.deleteAdminRolesByAdminId(new DeleteAdminHasRoleParam(
|
||||||
cmd.getId(), now, userId, now, userId, true
|
cmd.getId(), now, userId, now, userId
|
||||||
));
|
));
|
||||||
|
|
||||||
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
||||||
mapper.insertAdminHasRoles(new SaveAdminHasRoleParam(
|
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())) {
|
if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) {
|
||||||
mapper.insertAdminHasRoles(new SaveAdminHasRoleParam(
|
mapper.insertAdminHasRoles(new SaveAdminHasRoleParam(
|
||||||
cmd.getId(), cmd.getRoleIds(), now, userId, now, userId, false
|
cmd.getId(), cmd.getRoleIds(), now, userId, now, userId
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class DeleteAdminHasRoleParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,5 +16,4 @@ public class SaveAdminHasRoleParam {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,6 @@ class RemoveArticleCommentDao implements RemoveArticleCommentPortOut {
|
|||||||
|
|
||||||
mapper.deleteById(
|
mapper.deleteById(
|
||||||
new RemoveArticleCommentParam(
|
new RemoveArticleCommentParam(
|
||||||
command.getRemoveId(), now, loginUser, now, loginUser, true));
|
command.getRemoveId(), now, loginUser, now, loginUser));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,5 +12,4 @@ public class RemoveArticleCommentParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,8 +41,7 @@ class CreateArticleDao implements CreateArticlePortOut {
|
|||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername(),
|
CommonUtil.getLoginUsername(),
|
||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername(),
|
CommonUtil.getLoginUsername());
|
||||||
false);
|
|
||||||
|
|
||||||
mapper.createArticle(dto);
|
mapper.createArticle(dto);
|
||||||
|
|
||||||
@@ -55,8 +54,7 @@ class CreateArticleDao implements CreateArticlePortOut {
|
|||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername(),
|
CommonUtil.getLoginUsername(),
|
||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername(),
|
CommonUtil.getLoginUsername()
|
||||||
false
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,5 +24,4 @@ public class CreateArticleDto {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,5 +18,4 @@ public class CreateArticleHasUploadFilesParam {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,10 +20,9 @@ class RemoveArticlesDao implements RemoveArticlesPortOut {
|
|||||||
String loginUser = CommonUtil.getLoginUsername();;
|
String loginUser = CommonUtil.getLoginUsername();;
|
||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
|
||||||
// TODO : article_has_upload_file 테이블에 -> AuditEntity 가 없어 일단 물리삭제로 진행 -> 논리삭제로 변경해야함.
|
|
||||||
mapper.deleteArticleHasFiles(
|
mapper.deleteArticleHasFiles(
|
||||||
new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser, true));
|
new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser));
|
||||||
mapper.deleteArticles(
|
mapper.deleteArticles(
|
||||||
new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser, true));
|
new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,5 +16,4 @@ public class RemoveArticlesParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,8 +45,7 @@ class UpdateArticleDao implements UpdateArticlePortOut {
|
|||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername(),
|
CommonUtil.getLoginUsername(),
|
||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername(),
|
CommonUtil.getLoginUsername()
|
||||||
true
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class CreateUploadFileParam {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ public class PrivilegeRemoveDao implements PrivilegeRemovePortOut {
|
|||||||
public void connect(String id) {
|
public void connect(String id) {
|
||||||
String userId = CommonUtil.getLoginUsername();
|
String userId = CommonUtil.getLoginUsername();
|
||||||
LocalDateTime now = LocalDateTime.now();
|
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.deleteRoleHasPrivilegesByPrivilegeId(param);
|
||||||
mapper.deleteById(param);
|
mapper.deleteById(param);
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class PrivilegeRemoveParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ public class RoleRemoveDao implements RoleRemovePortOut {
|
|||||||
public void connect(String role) {
|
public void connect(String role) {
|
||||||
String userId = CommonUtil.getLoginUsername();
|
String userId = CommonUtil.getLoginUsername();
|
||||||
LocalDateTime now = LocalDateTime.now();
|
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.deleteRoleHasPrivilegesByRoleId(param);
|
||||||
mapper.deleteAdminHasRoleByRoleId(param);
|
mapper.deleteAdminHasRoleByRoleId(param);
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class RoleRemoveParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,13 +43,13 @@ public class RoleSaveDao implements RoleSavePortOut {
|
|||||||
|
|
||||||
private void updateRole(Role role, List<String> privilegeIds, String userId, LocalDateTime now) {
|
private void updateRole(Role role, List<String> privilegeIds, String userId, LocalDateTime now) {
|
||||||
mapper.deleteAllRoleHasPrivileges(new RoleHasPrivilegeDeleteParam(
|
mapper.deleteAllRoleHasPrivileges(new RoleHasPrivilegeDeleteParam(
|
||||||
role.getId(), now, userId, now, userId, true
|
role.getId(), now, userId, now, userId
|
||||||
));
|
));
|
||||||
mapper.updateRole(role);
|
mapper.updateRole(role);
|
||||||
|
|
||||||
if (CollectionUtils.isNotEmpty(privilegeIds)) {
|
if (CollectionUtils.isNotEmpty(privilegeIds)) {
|
||||||
mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam(
|
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)) {
|
if (CollectionUtils.isNotEmpty(privilegeIds)) {
|
||||||
mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam(
|
mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam(
|
||||||
role.getId(), privilegeIds, now, userId, now, userId, false
|
role.getId(), privilegeIds, now, userId, now, userId
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class RoleHasPrivilegeDeleteParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,5 +16,4 @@ public class RoleHasPrivilegeSaveParam {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,6 @@ class UICodeRemoveDao implements UICodeRemovePortOut {
|
|||||||
String userId = CommonUtil.getLoginUsername();
|
String userId = CommonUtil.getLoginUsername();
|
||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
|
||||||
mapper.deleteById(new UICodeRemoveParam(id, now, userId, now, userId, true));
|
mapper.deleteById(new UICodeRemoveParam(id, now, userId, now, userId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class UICodeRemoveParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class DeleteUICodeParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,8 +11,5 @@ import org.apache.ibatis.annotations.Param;
|
|||||||
@Mapper
|
@Mapper
|
||||||
public interface GetUrisMapper {
|
public interface GetUrisMapper {
|
||||||
List<GetUrisDto> findAllByAppType(AppType appType);
|
List<GetUrisDto> findAllByAppType(AppType appType);
|
||||||
List<GetRolesDto> findAllRolesByUriId(String uriId);
|
|
||||||
List<GetRoleHasPrivilegesDto> findAllRoleHasPrivilegeByRoleId(String roleId);
|
|
||||||
// List<GetRolesDto> findRolesWithPrivilegesByUriIds(@Param("uriIds") List<String> uriIds);
|
|
||||||
List<GetRolesDto> findRolesWithPrivilegesByUriIds(@Param("uriIds") List<String> uriIds);
|
List<GetRolesDto> findRolesWithPrivilegesByUriIds(@Param("uriIds") List<String> uriIds);
|
||||||
}
|
}
|
||||||
@@ -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<URI> findAllByAppType(AppType appType);
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,7 @@ class URIRemoveDao implements URIRemovePortOut {
|
|||||||
public void connect(String id) {
|
public void connect(String id) {
|
||||||
String userId = CommonUtil.getLoginUsername();
|
String userId = CommonUtil.getLoginUsername();
|
||||||
LocalDateTime now = LocalDateTime.now();
|
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.deleteUriHasPrivilegesByUriId(uriRemoveParam);
|
||||||
mapper.deleteById(uriRemoveParam);
|
mapper.deleteById(uriRemoveParam);
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class URIRemoveParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,13 +60,13 @@ public class URISaveDao implements URISavePortOut {
|
|||||||
|
|
||||||
private void updateUri(URI uri, Set<String> roleIds, String userId, LocalDateTime now) {
|
private void updateUri(URI uri, Set<String> roleIds, String userId, LocalDateTime now) {
|
||||||
mapper.deleteUriHasRoles(new UriHasRoleDeleteParam(
|
mapper.deleteUriHasRoles(new UriHasRoleDeleteParam(
|
||||||
uri.getId(), now, userId, now, userId, true
|
uri.getId(), now, userId, now, userId
|
||||||
));
|
));
|
||||||
mapper.updateUri(uri);
|
mapper.updateUri(uri);
|
||||||
|
|
||||||
if (CollectionUtils.isNotEmpty(roleIds)) {
|
if (CollectionUtils.isNotEmpty(roleIds)) {
|
||||||
mapper.insertUriHasRoles(new UriHasRoleSaveParam(
|
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)) {
|
if (CollectionUtils.isNotEmpty(roleIds)) {
|
||||||
mapper.insertUriHasRoles(new UriHasRoleSaveParam(
|
mapper.insertUriHasRoles(new UriHasRoleSaveParam(
|
||||||
uri.getId(), roleIds, now, userId, now, userId, false
|
uri.getId(), roleIds, now, userId, now, userId
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class UriHasRoleDeleteParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,5 +17,4 @@ public class UriHasRoleSaveParam {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,13 +43,13 @@ class UpdateFrontUserDao implements UpdateFrontUserPortOut {
|
|||||||
if (CollectionUtils.isNotEmpty(cmd.getFileMappingId())) {
|
if (CollectionUtils.isNotEmpty(cmd.getFileMappingId())) {
|
||||||
// 파일 삭제
|
// 파일 삭제
|
||||||
mapper.deleteFrontUserHasUploadFiles(
|
mapper.deleteFrontUserHasUploadFiles(
|
||||||
new UpdateFrontUserParam(userId, now, loginUser, now, loginUser, true));
|
new UpdateFrontUserParam(userId, now, loginUser, now, loginUser));
|
||||||
// 저장
|
// 저장
|
||||||
mapper.insertFrontUserHasUploadFiles(
|
mapper.insertFrontUserHasUploadFiles(
|
||||||
new UpdateFrontUserHasUploadFileParam(
|
new UpdateFrontUserHasUploadFileParam(
|
||||||
userId,
|
userId,
|
||||||
cmd.getFileMappingId().stream().map(Long::parseLong).toList(),
|
cmd.getFileMappingId().stream().map(Long::parseLong).toList(),
|
||||||
now, loginUser, now, loginUser, false));
|
now, loginUser, now, loginUser));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,5 +16,4 @@ public class UpdateFrontUserHasUploadFileParam {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class UpdateFrontUserParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,13 +39,13 @@ class UpdateUserDao implements UpdateUserPortOut {
|
|||||||
|
|
||||||
// 기존 역할 삭제
|
// 기존 역할 삭제
|
||||||
mapper.deleteFrontUserHasRoles(
|
mapper.deleteFrontUserHasRoles(
|
||||||
new UpdateFrontUserByAdminParam(userId, now, loginUser, now, loginUser, true));
|
new UpdateFrontUserByAdminParam(userId, now, loginUser, now, loginUser));
|
||||||
|
|
||||||
// 새로운 역할 등록
|
// 새로운 역할 등록
|
||||||
if (CollectionUtils.isNotEmpty(cmd.getRoles())) {
|
if (CollectionUtils.isNotEmpty(cmd.getRoles())) {
|
||||||
mapper.insertFrontUserHasRoles(
|
mapper.insertFrontUserHasRoles(
|
||||||
new UpdateFrontUserHasRoleParam(
|
new UpdateFrontUserHasRoleParam(
|
||||||
userId, cmd.getRoles().stream().toList(), now, loginUser, now, loginUser, false));
|
userId, cmd.getRoles().stream().toList(), now, loginUser, now, loginUser));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class UpdateFrontUserByAdminParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,5 +16,4 @@ public class UpdateFrontUserHasRoleParam {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence;
|
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.config.application.util.CommonUtil;
|
||||||
import app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence.model.RemoveUserPrivilegeParam;
|
import app.module.core.usecase.userPrivilege.removeUserPrivilege.adapters.persistence.model.RemoveUserPrivilegeParam;
|
||||||
import app.module.core.usecase.userPrivilege.removeUserPrivilege.ports.RemoveUserPrivilegePortOut;
|
import app.module.core.usecase.userPrivilege.removeUserPrivilege.ports.RemoveUserPrivilegePortOut;
|
||||||
@@ -21,6 +20,6 @@ class RemoveUserPrivilegeDao implements RemoveUserPrivilegePortOut {
|
|||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
|
||||||
mapper.deleteUserPrivilege(
|
mapper.deleteUserPrivilege(
|
||||||
new RemoveUserPrivilegeParam(cmd.getId(), now, loginUser, now, loginUser, true));
|
new RemoveUserPrivilegeParam(cmd.getId(), now, loginUser, now, loginUser));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class RemoveUserPrivilegeParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.adapters.persistence.entity.Privilege;
|
||||||
import app.module.core.config.application.enums.AppType;
|
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.adapters.persistence.GetUserPrivilegeMapper;
|
||||||
import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege;
|
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.SaveUserPrivilegePortOut;
|
||||||
import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilege;
|
import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilege;
|
||||||
import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilegeCmd;
|
import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilegeCmd;
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -19,7 +19,7 @@ class RemoveUserRoleDao implements RemoveUserRolePortOut {
|
|||||||
String loginUser = CommonUtil.getLoginUsername();
|
String loginUser = CommonUtil.getLoginUsername();
|
||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
RemoveUserRoleParam param =
|
RemoveUserRoleParam param =
|
||||||
new RemoveUserRoleParam(cmd.getId(), now, loginUser, now, loginUser, true);
|
new RemoveUserRoleParam(cmd.getId(), now, loginUser, now, loginUser);
|
||||||
|
|
||||||
mapper.deleteFrontUserHasRole(param);
|
mapper.deleteFrontUserHasRole(param);
|
||||||
mapper.deleteRoleHasPrivilege(param);
|
mapper.deleteRoleHasPrivilege(param);
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class RemoveUserRoleParam {
|
|||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private LocalDateTime deletedAt;
|
private LocalDateTime deletedAt;
|
||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class SaveUserRoleDao implements SaveUserRolePortOut {
|
|||||||
|
|
||||||
// 권한 삭제
|
// 권한 삭제
|
||||||
mapper.deleteAllRoleHasPrivileges(
|
mapper.deleteAllRoleHasPrivileges(
|
||||||
new RoleHasPrivilegeDeleteParam(cmd.getId(), now, loginUser, now, loginUser, true)
|
new RoleHasPrivilegeDeleteParam(cmd.getId(), now, loginUser, now, loginUser)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (existedRole.isPresent()) {
|
if (existedRole.isPresent()) {
|
||||||
@@ -53,7 +53,7 @@ class SaveUserRoleDao implements SaveUserRolePortOut {
|
|||||||
// 권한 insert
|
// 권한 insert
|
||||||
if (CollectionUtils.isNotEmpty(cmd.getPrivilegeIds())) {
|
if (CollectionUtils.isNotEmpty(cmd.getPrivilegeIds())) {
|
||||||
mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam(
|
mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam(
|
||||||
role.getId(), cmd.getPrivilegeIds(), now, loginUser, now, loginUser, false
|
role.getId(), cmd.getPrivilegeIds(), now, loginUser, now, loginUser
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,5 +12,4 @@ public class RoleHasPrivilegeDeleteParam {
|
|||||||
private String deletedBy;
|
private String deletedBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ public class RoleHasPrivilegeSaveParam {
|
|||||||
private String createdBy;
|
private String createdBy;
|
||||||
private LocalDateTime updatedAt;
|
private LocalDateTime updatedAt;
|
||||||
private String updatedBy;
|
private String updatedBy;
|
||||||
private Boolean isDeleted;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,8 @@
|
|||||||
<update id="deleteAdminRolesByAdminId">
|
<update id="deleteAdminRolesByAdminId">
|
||||||
/* deleteAdminRolesByAdminId : 관리자 역할 매핑 정보 수정 */
|
/* deleteAdminRolesByAdminId : 관리자 역할 매핑 정보 수정 */
|
||||||
UPDATE admin_has_role
|
UPDATE admin_has_role
|
||||||
SET <include refid="common.fields.DeleteBaseSet"/>
|
SET is_deleted = true
|
||||||
|
<include refid="common.fields.DeleteBaseSet"/>
|
||||||
WHERE admin_id = #{adminId}
|
WHERE admin_id = #{adminId}
|
||||||
</update>
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -8,16 +8,14 @@
|
|||||||
created_by,
|
created_by,
|
||||||
created_at,
|
created_at,
|
||||||
updated_by,
|
updated_by,
|
||||||
updated_at,
|
updated_at
|
||||||
is_deleted
|
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<sql id="CreateUpdateBaseValues">
|
<sql id="CreateUpdateBaseValues">
|
||||||
#{createdBy},
|
#{createdBy},
|
||||||
#{createdAt},
|
#{createdAt},
|
||||||
#{updatedBy},
|
#{updatedBy},
|
||||||
#{updatedAt},
|
#{updatedAt}
|
||||||
#{isDeleted}
|
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<sql id="CreateUpdateListBaseValues">
|
<sql id="CreateUpdateListBaseValues">
|
||||||
@@ -38,7 +36,7 @@
|
|||||||
updated_at = #{updatedAt},
|
updated_at = #{updatedAt},
|
||||||
deleted_by = #{deletedBy},
|
deleted_by = #{deletedBy},
|
||||||
deleted_at = #{deletedAt},
|
deleted_at = #{deletedAt},
|
||||||
is_deleted = #{isDeleted}
|
is_deleted = true
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
|
<mapper
|
||||||
|
namespace="app.module.core.config.adapters.persistence.initData.helper.RemoveAllAdminURIMapper">
|
||||||
|
<delete id="deleteAllByAppType">
|
||||||
|
DELETE FROM uri
|
||||||
|
WHERE app_type = #{appType}
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllByAdminUriIds">
|
||||||
|
DELETE FROM uri_has_role
|
||||||
|
WHERE uri_id IN
|
||||||
|
<foreach collection="uriIds" item="id" open="(" separator="," close=")">
|
||||||
|
#{id}
|
||||||
|
</foreach>
|
||||||
|
</delete>
|
||||||
|
</mapper>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
|
<mapper
|
||||||
|
namespace="app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleMapper">
|
||||||
|
<delete id="deleteAll">
|
||||||
|
DELETE FROM article
|
||||||
|
</delete>
|
||||||
|
</mapper>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
|
<mapper
|
||||||
|
namespace="app.module.core.config.adapters.persistence.initData.helper.RemoveAllFrontURIMapper">
|
||||||
|
|
||||||
|
<delete id="deleteAllByAppType">
|
||||||
|
DELETE FROM uri
|
||||||
|
WHERE app_type = #{appType}
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAllByFrontUriIds">
|
||||||
|
DELETE FROM uri_has_role
|
||||||
|
WHERE uri_id IN
|
||||||
|
<foreach collection="uriIds" item="id" open="(" separator="," close=")">
|
||||||
|
#{id}
|
||||||
|
</foreach>
|
||||||
|
</delete>
|
||||||
|
</mapper>
|
||||||
Reference in New Issue
Block a user