isDeleted 일괄 수정

This commit is contained in:
kangsunlee
2025-05-28 11:11:35 +09:00
parent 4c74418106
commit 75ec134792
74 changed files with 206 additions and 158 deletions

View File

@@ -22,8 +22,7 @@ public class LoggedInUserRemoveDao implements LoggedInUserRemovePortOut {
LocalDateTime.now(),
CommonUtil.getLoginUsername(),
LocalDateTime.now(),
CommonUtil.getLoginUsername(),
false
CommonUtil.getLoginUsername()
));
}
}

View File

@@ -16,5 +16,4 @@ public class LoggedInUserRemoveParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -11,7 +11,6 @@ import lombok.Setter;
@Getter
@Setter
public class AuditEntity {
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;

View File

@@ -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) {

View File

@@ -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<UploadFile> uploadFiles = Collections.emptyList();
private List<ArticleComment> articleComments = Collections.emptyList();
public Article(Long id) {

View File

@@ -11,7 +11,9 @@ import lombok.Setter;
@NoArgsConstructor
@AllArgsConstructor
public class ArticleHasUploadFile extends AuditEntity {
private Long articleId;
private Long uploadFilesId;
public ArticleHasUploadFile(Long articleId) {

View File

@@ -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) {

View File

@@ -9,7 +9,10 @@ import lombok.Setter;
@Setter
@AllArgsConstructor
public class FrontUserHasRole extends AuditEntity {
private Long id;
private String frontUSerId;
private String roleId;
}

View File

@@ -11,7 +11,9 @@ import lombok.Setter;
@NoArgsConstructor
@AllArgsConstructor
public class FrontUserHasUploadFile extends AuditEntity {
private String frontUserId;
private Long uploadFilesId;
public FrontUserHasUploadFile(String frontUserId) {

View File

@@ -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;
}

View File

@@ -13,7 +13,10 @@ import lombok.Setter;
public class PersistentLogins extends AuditEntity {
private String series;
private String username;
private String token;
private Date lastUsed;
}

View File

@@ -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) {

View File

@@ -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<RoleHasPrivilege> hasPrivileges;
public Role(String id) {

View File

@@ -11,10 +11,7 @@ import lombok.Setter;
@NoArgsConstructor
@AllArgsConstructor
public class RoleHasPrivilege extends AuditEntity {
private Integer id;
private String roleId;
private String privilegeId;
}

View File

@@ -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)));
}
}

View File

@@ -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));
}
}

View File

@@ -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"
));
}
}

View File

@@ -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<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";

View File

@@ -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<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";

View File

@@ -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<String> uriIds);
}

View File

@@ -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();
}

View File

@@ -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<String> uriIds);
}

View File

@@ -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);

View File

@@ -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);

View File

@@ -15,5 +15,4 @@ public class RemoveAdminParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -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
));
}
}

View File

@@ -14,5 +14,4 @@ public class DeleteAdminHasRoleParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -16,5 +16,4 @@ public class SaveAdminHasRoleParam {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -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));
}
}

View File

@@ -12,5 +12,4 @@ public class RemoveArticleCommentParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -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()
));
}

View File

@@ -24,5 +24,4 @@ public class CreateArticleDto {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -18,5 +18,4 @@ public class CreateArticleHasUploadFilesParam {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -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));
}
}

View File

@@ -16,5 +16,4 @@ public class RemoveArticlesParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -45,8 +45,7 @@ class UpdateArticleDao implements UpdateArticlePortOut {
LocalDateTime.now(),
CommonUtil.getLoginUsername(),
LocalDateTime.now(),
CommonUtil.getLoginUsername(),
true
CommonUtil.getLoginUsername()
));
}
}

View File

@@ -14,5 +14,4 @@ public class CreateUploadFileParam {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -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);

View File

@@ -14,5 +14,4 @@ public class PrivilegeRemoveParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -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);

View File

@@ -14,5 +14,4 @@ public class RoleRemoveParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -43,13 +43,13 @@ public class RoleSaveDao implements RoleSavePortOut {
private void updateRole(Role role, List<String> 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
));
}
}

View File

@@ -14,5 +14,4 @@ public class RoleHasPrivilegeDeleteParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -16,5 +16,4 @@ public class RoleHasPrivilegeSaveParam {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -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));
}
}

View File

@@ -14,5 +14,4 @@ public class UICodeRemoveParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -14,5 +14,4 @@ public class DeleteUICodeParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -11,8 +11,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface GetUrisMapper {
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);
}

View File

@@ -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);
}

View File

@@ -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);

View File

@@ -14,5 +14,4 @@ public class URIRemoveParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -60,13 +60,13 @@ public class URISaveDao implements URISavePortOut {
private void updateUri(URI uri, Set<String> 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
));
}
}

View File

@@ -14,5 +14,4 @@ public class UriHasRoleDeleteParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -17,5 +17,4 @@ public class UriHasRoleSaveParam {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -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));
}
}
}

View File

@@ -16,5 +16,4 @@ public class UpdateFrontUserHasUploadFileParam {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -14,5 +14,4 @@ public class UpdateFrontUserParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -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));
}
}
}

View File

@@ -14,5 +14,4 @@ public class UpdateFrontUserByAdminParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -16,5 +16,4 @@ public class UpdateFrontUserHasRoleParam {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -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));
}
}

View File

@@ -14,5 +14,4 @@ public class RemoveUserPrivilegeParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -14,5 +14,4 @@ public class RemoveUserRoleParam {
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
private Boolean isDeleted;
}

View File

@@ -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
));
}

View File

@@ -12,5 +12,4 @@ public class RoleHasPrivilegeDeleteParam {
private String deletedBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -14,5 +14,4 @@ public class RoleHasPrivilegeSaveParam {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Boolean isDeleted;
}

View File

@@ -58,7 +58,8 @@
<update id="deleteAdminRolesByAdminId">
/* deleteAdminRolesByAdminId : 관리자 역할 매핑 정보 수정 */
UPDATE admin_has_role
SET <include refid="common.fields.DeleteBaseSet"/>
SET is_deleted = true
<include refid="common.fields.DeleteBaseSet"/>
WHERE admin_id = #{adminId}
</update>
</mapper>

View File

@@ -8,16 +8,14 @@
created_by,
created_at,
updated_by,
updated_at,
is_deleted
updated_at
</sql>
<sql id="CreateUpdateBaseValues">
#{createdBy},
#{createdAt},
#{updatedBy},
#{updatedAt},
#{isDeleted}
#{updatedAt}
</sql>
<sql id="CreateUpdateListBaseValues">
@@ -38,7 +36,7 @@
updated_at = #{updatedAt},
deleted_by = #{deletedBy},
deleted_at = #{deletedAt},
is_deleted = #{isDeleted}
is_deleted = true
</sql>
</mapper>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>