[2025.05.30] admin 로그인, initData 작업 중 (1)

This commit is contained in:
kangsunlee
2025-05-30 18:18:10 +09:00
parent 38342fee48
commit 64ba09e086
37 changed files with 822 additions and 599 deletions

View File

@@ -4,6 +4,9 @@ import app.module.core.config.adapters.web.security.domain.CorePrivilege;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortIn;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Collection;
@@ -24,6 +27,7 @@ import org.springframework.stereotype.Service;
public class AdminDetailsService implements UserDetailsService {
private final AdminViewPortIn adminViewPortIn;
private final GetAdminPortIn getAdminPortIn;
@Value("${app.admin.password.validity.period.days}")
private long passwordValidPeriodDays;
@@ -31,23 +35,29 @@ public class AdminDetailsService implements UserDetailsService {
@Override
@Transactional
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
AdminView adminUser =
adminViewPortIn
.connect(username)
GetAdmin getAdmin =
getAdminPortIn
.operate(new GetAdminCmd(username))
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
boolean accountLocked = Optional.ofNullable(adminUser.getAccountLocked()).orElse(false);
boolean accountDisabled = Optional.ofNullable(adminUser.getAccountDisabled()).orElse(false);
// AdminView adminUser =
// adminViewPortIn
// .connect(username)
// .orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
boolean accountLocked = Optional.ofNullable(getAdmin.getAccountLocked()).orElse(false);
boolean accountDisabled = Optional.ofNullable(getAdmin.getAccountDisabled()).orElse(false);
return new AdminUser(
adminUser.getId(),
adminUser.getPassword(),
getAdmin.getId(),
getAdmin.getPassword(),
!accountDisabled,
true,
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),
isCredentialsNonExpired(getAdmin.getPasswordUpdatedAt()),
!accountLocked,
getAuthorities(adminUser.getRoles()),
passwordValidPeriodDays - getDaysPassedFrom(adminUser.getPasswordUpdatedAt()));
getAuthorities(getAdmin.getRoles()),
passwordValidPeriodDays - getDaysPassedFrom(getAdmin.getPasswordUpdatedAt()));
}
/**

View File

@@ -4,6 +4,8 @@ import app.module.core.config.application.util.CommonUtil;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@Getter
@Setter
@@ -17,20 +19,27 @@ public class AuditCommand {
public void create() {
this.createdAt = LocalDateTime.now();
this.createdBy = CommonUtil.getLoginUsername();
this.createdBy = getCurrentUsername();
this.updatedAt = LocalDateTime.now();
this.updatedBy = CommonUtil.getLoginUsername();
this.updatedBy = getCurrentUsername();
}
public void update() {
this.updatedAt = LocalDateTime.now();
this.updatedBy = CommonUtil.getLoginUsername();
this.updatedBy = getCurrentUsername();
}
public void delete() {
this.updatedAt = LocalDateTime.now();
this.updatedBy = CommonUtil.getLoginUsername();
this.updatedBy = getCurrentUsername();
this.deletedAt = LocalDateTime.now();
this.deletedBy = CommonUtil.getLoginUsername();
this.deletedBy = getCurrentUsername();
}
private String getCurrentUsername() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
return authentication != null && authentication.isAuthenticated()
? CommonUtil.getLoginUsername() : "INIT_DATA";
}
}

View File

@@ -27,7 +27,11 @@ public class InitArticleData implements ApplicationRunner {
return;
}
// 전체 데이터 삭제
// article_has_upload_file 테이블 우선 삭제
removeAllArticleMapper.deleteAllFiles();
// article_comment 테이블 우선 삭ㅈ데
removeAllArticleMapper.deleteAllComments();
// article 전체 데이터 삭제
removeAllArticleMapper.deleteAll();
IntStream.range(0, 25)

View File

@@ -29,16 +29,16 @@ public class InitFrontUserData implements ApplicationRunner {
return;
}
createUserPortIn.operate(
new CreateUserCmd(
"generalUser",
"generalUser1@#$",
"general-user@recycle.com",
"recycle-사용자",
SignUpType.NORMAL,
false,
0,
false,
Set.of("ROLE_GENERAL")));
// createUserPortIn.operate(
// new CreateUserCmd(
// "generalUser",
// "generalUser1@#$",
// "general-user@recycle.com",
// "recycle-사용자",
// SignUpType.NORMAL,
// false,
// 0,
// false,
// Set.of("ROLE_GENERAL")));
}
}

View File

@@ -27,7 +27,7 @@ public class InitPrivilegeData implements ApplicationRunner {
return;
}
privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_API", "ADMIN API 이용 권한", AppType.ADMIN, 0));
privilegeSaveMapper.insertPrivilege(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

@@ -38,43 +38,43 @@ public class InitRoleData implements ApplicationRunner {
return;
}
// 권한 `privilege` 정보 가져오기
PrivilegeView apiPrivilege = privilegeViewRepo.findById("ADMIN_API").orElseThrow();
PrivilegeView privilege = privilegeViewRepo.findById("ADMIN_ACCESS").orElseThrow();
int orderNo = 0;
roleSaveMapper.insertRole(new Role("ROLE_SUPER", "SUPER 관리자", AppType.ADMIN, orderNo++));
roleSaveMapper.insertRoleHasPrivileges(
new RoleHasPrivilegeSaveParam(
"ROLE_SUPER",
List.of(apiPrivilege.getId(), privilege.getId()),
LocalDateTime.now(),
"INIT_DATA",
LocalDateTime.now(),
"INIT_DATA"
));
roleSaveMapper.insertRole(new Role("ROLE_MANAGER", "매니저", AppType.ADMIN, orderNo++));
roleSaveMapper.insertRoleHasPrivileges(
new RoleHasPrivilegeSaveParam(
"ROLE_MANAGER",
List.of(apiPrivilege.getId(), privilege.getId()),
LocalDateTime.now(),
"INIT_DATA",
LocalDateTime.now(),
"INIT_DATA"
));
roleSaveMapper.insertRole(new Role("ROLE_STAFF", "스텝", AppType.ADMIN, orderNo++));
roleSaveMapper.insertRoleHasPrivileges(
new RoleHasPrivilegeSaveParam(
"ROLE_STAFF",
List.of(apiPrivilege.getId(), privilege.getId()),
LocalDateTime.now(),
"INIT_DATA",
LocalDateTime.now(),
"INIT_DATA"
));
// // 권한 `privilege` 정보 가져오기
// PrivilegeView apiPrivilege = privilegeViewRepo.findById("ADMIN_API").orElseThrow();
// PrivilegeView privilege = privilegeViewRepo.findById("ADMIN_ACCESS").orElseThrow();
//
// int orderNo = 0;
//
// roleSaveMapper.insertRole(new Role("ROLE_SUPER", "SUPER 관리자", AppType.ADMIN, orderNo++));
// roleSaveMapper.insertRoleHasPrivileges(
// new RoleHasPrivilegeSaveParam(
// "ROLE_SUPER",
// List.of(apiPrivilege.getId(), privilege.getId()),
// LocalDateTime.now(),
// "INIT_DATA",
// LocalDateTime.now(),
// "INIT_DATA"
// ));
//
// roleSaveMapper.insertRole(new Role("ROLE_MANAGER", "매니저", AppType.ADMIN, orderNo++));
// roleSaveMapper.insertRoleHasPrivileges(
// new RoleHasPrivilegeSaveParam(
// "ROLE_MANAGER",
// List.of(apiPrivilege.getId(), privilege.getId()),
// LocalDateTime.now(),
// "INIT_DATA",
// LocalDateTime.now(),
// "INIT_DATA"
// ));
//
// roleSaveMapper.insertRole(new Role("ROLE_STAFF", "스텝", AppType.ADMIN, orderNo++));
// roleSaveMapper.insertRoleHasPrivileges(
// new RoleHasPrivilegeSaveParam(
// "ROLE_STAFF",
// List.of(apiPrivilege.getId(), privilege.getId()),
// LocalDateTime.now(),
// "INIT_DATA",
// LocalDateTime.now(),
// "INIT_DATA"
// ));
}
}

View File

@@ -25,42 +25,42 @@ public class InitUICodeData implements ApplicationRunner {
return;
}
final String UICODE = "code";
final String UICODE_PAGEABLE = "code.pageable";
final String UICODE_PAGEABLE_ROWS = "code.pageable.rows";
// root 노드 - code
uiCodeSavePortIn.connect(
new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null, true), false);
// code - board
uiCodeSavePortIn.connect(
new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null, true), false);
// code - board - rows
uiCodeSavePortIn.connect(
new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null,
true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 1, "10", "10", null, true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 2, "20", "20", null, true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 3, "50", "50", null, true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 4, "100", "100", null, true),
false);
// final String UICODE = "code";
// final String UICODE_PAGEABLE = "code.pageable";
// final String UICODE_PAGEABLE_ROWS = "code.pageable.rows";
//
// // root 노드 - code
// uiCodeSavePortIn.connect(
// new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null, true), false);
//
// // code - board
// uiCodeSavePortIn.connect(
// new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null, true), false);
//
// // code - board - rows
// uiCodeSavePortIn.connect(
// new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null,
// true),
// false);
//
// uiCodeSavePortIn.connect(
// new UICodeSaveCommand(
// UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 1, "10", "10", null, true),
// false);
//
// uiCodeSavePortIn.connect(
// new UICodeSaveCommand(
// UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 2, "20", "20", null, true),
// false);
//
// uiCodeSavePortIn.connect(
// new UICodeSaveCommand(
// UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 3, "50", "50", null, true),
// false);
//
// uiCodeSavePortIn.connect(
// new UICodeSaveCommand(
// UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 4, "100", "100", null, true),
// false);
}
}

View File

@@ -39,326 +39,326 @@ public class InitUriAdminData implements ApplicationRunner {
return;
}
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_BOARD = "uri.admin.board";
final String ADMIN_ARTICLE = "uri.admin.board.article";
final String ADMIN_ARTICLE_CREATE = "uri.admin.board.article.create";
final String ADMIN_ARTICLE_UPDATE = "uri.admin.board.article.update.{{pathVar}}";
final String ADMIN_ARTICLE_DELETE = "uri.admin.board.article.delete";
final String ADMIN_ARTICLE_EXCEL = "uri.admin.board.article.excel";
final String ADMIN_SETTINGS = "uri.admin.settings";
final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group";
final String ADMIN_SETTINGS_ADMIN = "uri.admin.settings.admins";
final String ADMIN_SETTINGS_ADMIN_CREATE = "uri.admin.settings.admins.create";
final String ADMIN_SETTINGS_ADMIN_UPDATE = "uri.admin.settings.admins.update.{{pathVar}}";
final String ADMIN_SETTINGS_ADMIN_DELETE = "uri.admin.settings.admins.delete";
final String ADMIN_SETTINGS_ADMIN_EXCEL = "uri.admin.settings.admins.excel";
final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles";
final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege";
final String ADMIN_SETTINGS_USER_GROUP = "uri.admin.settings.user.group";
final String ADMIN_SETTINGS_USER = "uri.admin.settings.user";
final String ADMIN_SETTINGS_USER_UPDATE = "uri.admin.settings.user.update";
final String ADMIN_SETTINGS_USER_ROLE = "uri.admin.settings.user.role";
final String ADMIN_SETTINGS_USER_PRIVILEGE = "uri.admin.settings.user.privilege";
final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin";
final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front";
final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode";
final String ADMIN_ANALYSIS = "uri.admin.analysis";
final String ADMIN_ANALYSIS_OPERATION_LOG = "uri.admin.analysis.operationLog";
final String ADMIN_ANALYSIS_OPERATION_LOG_UPDATE =
"uri.admin.analysis.operationLog.{{pathVar}}";
final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel";
final String ADMIN_ADD_ONS = "uri.admin.addons";
final String ADMIN_ADD_ONS_SEND_EMAIL = "uri.admin.addons.email";
final String ADMIN_ADD_ONS_SEND_EMAIL_CREATE = "uri.admin.addons.email.create";
// 최상위 URI 정보
appendURI(
AppType.ADMIN,
null,
ADMIN,
"메인",
"/",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
// `1` depth URI 정의 - 시작
appendURI(
AppType.ADMIN,
ADMIN,
ADMIN_SETTINGS,
"Settings",
"/true",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(AppType.ADMIN, ADMIN, ADMIN_ANALYSIS, "분석", "/analysis", true,
Set.of("ROLE_SUPER"));
appendURI(AppType.ADMIN, ADMIN, ADMIN_BOARD, "게시판", "/board", true, Set.of("ROLE_SUPER"));
appendURI(
AppType.ADMIN,
ADMIN,
ADMIN_ADD_ONS,
"Add-ons (부가기능)",
"/add-ons",
true,
Set.of("ROLE_SUPER"));
// `1` depth URI 정의 - 끝
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS,
ADMIN_SETTINGS_ADMIN_GROUP,
"관리자 & 역할",
"/settings/adminGroup",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN_GROUP,
ADMIN_SETTINGS_ADMIN,
"관리자 목록",
"/settings/admins",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN,
ADMIN_SETTINGS_ADMIN_CREATE,
"관리자 등록",
"/settings/admins/create",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN,
ADMIN_SETTINGS_ADMIN_UPDATE,
"관리자 수정",
"/settings/admins/update/{{pathVar}}",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN,
ADMIN_SETTINGS_ADMIN_DELETE,
"관리자 삭제",
"/settings/admins/delete",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN,
ADMIN_SETTINGS_ADMIN_EXCEL,
"관리자 엑셀 다운로드",
"/settings/admins/excel",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN_GROUP,
ADMIN_SETTINGS_ADMIN_ROLE,
"관리자 역할",
"/settings/adminRoles",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_ADMIN_GROUP,
ADMIN_SETTINGS_ADMIN_PRIVILEGE,
"관리자 권한",
"/settings/adminPrivilege",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
// 사용자 & 역할 - 시작
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS,
ADMIN_SETTINGS_USER_GROUP,
"사용자 & 역할",
"/settings/userGroup",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_USER_GROUP,
ADMIN_SETTINGS_USER,
"사용자 목록",
"/settings/users",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_USER,
ADMIN_SETTINGS_USER_UPDATE,
"사용자 수정",
"/settings/users/{{pathVar}}",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_USER_GROUP,
ADMIN_SETTINGS_USER_ROLE,
"사용자 역할",
"/settings/userRoles",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS_USER_GROUP,
ADMIN_SETTINGS_USER_PRIVILEGE,
"사용자 권한",
"/settings/userPrivilege",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
// 사용자 & 역할 - 끝
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS,
ADMIN_SETTINGS_URI_ADMIN,
"URI 관리 (관리자)",
"/settings/uri/ADMIN",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS,
ADMIN_SETTINGS_URI_FRONT,
"URI 관리 (FRONT)",
"/settings/uri/FRONT",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
appendURI(
AppType.ADMIN,
ADMIN_SETTINGS,
ADMIN_SETTINGS_CODE,
"UI 코드 (공통코드)",
"/settings/uicode",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER"));
// 예제 게시판 - 시작
//
appendURI(
AppType.ADMIN,
ADMIN_BOARD,
ADMIN_ARTICLE,
"예제 게시판",
"/board/articles",
true,
Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
appendURI(
AppType.ADMIN,
ADMIN_ARTICLE,
ADMIN_ARTICLE_CREATE,
"예제 게시판 등록",
"/board/articles/create",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
appendURI(
AppType.ADMIN,
ADMIN_ARTICLE,
ADMIN_ARTICLE_UPDATE,
"예제 게시판 수정",
"/board/articles/{{pathVar}}",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
appendURI(
AppType.ADMIN,
ADMIN_ARTICLE,
ADMIN_ARTICLE_DELETE,
"예제 게시판 삭제",
"/board/articles/delete",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
appendURI(
AppType.ADMIN,
ADMIN_ARTICLE,
ADMIN_ARTICLE_EXCEL,
"예제 게시판 엑셀 다운로드",
"/board/articles/excel",
false,
Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
// 예제 게시판 - 끝
appendURI(
AppType.ADMIN,
ADMIN_ANALYSIS,
ADMIN_ANALYSIS_OPERATION_LOG,
"Operation Log (수행로그)",
"/analysis/operationlog",
true,
Set.of("ROLE_SUPER"));
appendURI(
AppType.ADMIN,
ADMIN_ANALYSIS,
ADMIN_ANALYSIS_OPERATION_LOG_UPDATE,
"수행로그 상세",
"/analysis/operationlog/{{pathVar}}",
false,
Set.of("ROLE_SUPER"));
appendURI(
AppType.ADMIN,
ADMIN_ANALYSIS_OPERATION_LOG,
ADMIN_ANALYSIS_OPERATION_LOG_EXCEL,
"수행로그 Excel",
"/analysis/operationlog/excel",
false,
Set.of("ROLE_SUPER"));
appendURI(
AppType.ADMIN,
ADMIN_ADD_ONS,
ADMIN_ADD_ONS_SEND_EMAIL,
"Email 발송",
"/addons/email/form",
true,
Set.of("ROLE_SUPER"));
appendURI(
AppType.ADMIN,
ADMIN_ADD_ONS_SEND_EMAIL,
ADMIN_ADD_ONS_SEND_EMAIL_CREATE,
"Email 입력폼",
"/addons/email/form",
false,
Set.of("ROLE_SUPER"));
// 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_BOARD = "uri.admin.board";
//
// final String ADMIN_ARTICLE = "uri.admin.board.article";
// final String ADMIN_ARTICLE_CREATE = "uri.admin.board.article.create";
// final String ADMIN_ARTICLE_UPDATE = "uri.admin.board.article.update.{{pathVar}}";
// final String ADMIN_ARTICLE_DELETE = "uri.admin.board.article.delete";
// final String ADMIN_ARTICLE_EXCEL = "uri.admin.board.article.excel";
//
// final String ADMIN_SETTINGS = "uri.admin.settings";
//
// final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group";
// final String ADMIN_SETTINGS_ADMIN = "uri.admin.settings.admins";
// final String ADMIN_SETTINGS_ADMIN_CREATE = "uri.admin.settings.admins.create";
// final String ADMIN_SETTINGS_ADMIN_UPDATE = "uri.admin.settings.admins.update.{{pathVar}}";
// final String ADMIN_SETTINGS_ADMIN_DELETE = "uri.admin.settings.admins.delete";
// final String ADMIN_SETTINGS_ADMIN_EXCEL = "uri.admin.settings.admins.excel";
// final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles";
// final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege";
//
// final String ADMIN_SETTINGS_USER_GROUP = "uri.admin.settings.user.group";
// final String ADMIN_SETTINGS_USER = "uri.admin.settings.user";
// final String ADMIN_SETTINGS_USER_UPDATE = "uri.admin.settings.user.update";
// final String ADMIN_SETTINGS_USER_ROLE = "uri.admin.settings.user.role";
// final String ADMIN_SETTINGS_USER_PRIVILEGE = "uri.admin.settings.user.privilege";
//
// final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin";
// final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front";
// final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode";
//
// final String ADMIN_ANALYSIS = "uri.admin.analysis";
// final String ADMIN_ANALYSIS_OPERATION_LOG = "uri.admin.analysis.operationLog";
// final String ADMIN_ANALYSIS_OPERATION_LOG_UPDATE =
// "uri.admin.analysis.operationLog.{{pathVar}}";
// final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel";
//
// final String ADMIN_ADD_ONS = "uri.admin.addons";
// final String ADMIN_ADD_ONS_SEND_EMAIL = "uri.admin.addons.email";
// final String ADMIN_ADD_ONS_SEND_EMAIL_CREATE = "uri.admin.addons.email.create";
//
// // 최상위 URI 정보
// appendURI(
// AppType.ADMIN,
// null,
// ADMIN,
// "메인",
// "/",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
//
// // `1` depth URI 정의 - 시작
//
// appendURI(
// AppType.ADMIN,
// ADMIN,
// ADMIN_SETTINGS,
// "Settings",
// "/true",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(AppType.ADMIN, ADMIN, ADMIN_ANALYSIS, "분석", "/analysis", true,
// Set.of("ROLE_SUPER"));
//
// appendURI(AppType.ADMIN, ADMIN, ADMIN_BOARD, "게시판", "/board", true, Set.of("ROLE_SUPER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN,
// ADMIN_ADD_ONS,
// "Add-ons (부가기능)",
// "/add-ons",
// true,
// Set.of("ROLE_SUPER"));
// // `1` depth URI 정의 - 끝
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS,
// ADMIN_SETTINGS_ADMIN_GROUP,
// "관리자 & 역할",
// "/settings/adminGroup",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_ADMIN_GROUP,
// ADMIN_SETTINGS_ADMIN,
// "관리자 목록",
// "/settings/admins",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_ADMIN,
// ADMIN_SETTINGS_ADMIN_CREATE,
// "관리자 등록",
// "/settings/admins/create",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_ADMIN,
// ADMIN_SETTINGS_ADMIN_UPDATE,
// "관리자 수정",
// "/settings/admins/update/{{pathVar}}",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_ADMIN,
// ADMIN_SETTINGS_ADMIN_DELETE,
// "관리자 삭제",
// "/settings/admins/delete",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_ADMIN,
// ADMIN_SETTINGS_ADMIN_EXCEL,
// "관리자 엑셀 다운로드",
// "/settings/admins/excel",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_ADMIN_GROUP,
// ADMIN_SETTINGS_ADMIN_ROLE,
// "관리자 역할",
// "/settings/adminRoles",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_ADMIN_GROUP,
// ADMIN_SETTINGS_ADMIN_PRIVILEGE,
// "관리자 권한",
// "/settings/adminPrivilege",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// // 사용자 & 역할 - 시작
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS,
// ADMIN_SETTINGS_USER_GROUP,
// "사용자 & 역할",
// "/settings/userGroup",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_USER_GROUP,
// ADMIN_SETTINGS_USER,
// "사용자 목록",
// "/settings/users",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_USER,
// ADMIN_SETTINGS_USER_UPDATE,
// "사용자 수정",
// "/settings/users/{{pathVar}}",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_USER_GROUP,
// ADMIN_SETTINGS_USER_ROLE,
// "사용자 역할",
// "/settings/userRoles",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS_USER_GROUP,
// ADMIN_SETTINGS_USER_PRIVILEGE,
// "사용자 권한",
// "/settings/userPrivilege",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
// // 사용자 & 역할 - 끝
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS,
// ADMIN_SETTINGS_URI_ADMIN,
// "URI 관리 (관리자)",
// "/settings/uri/ADMIN",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS,
// ADMIN_SETTINGS_URI_FRONT,
// "URI 관리 (FRONT)",
// "/settings/uri/FRONT",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_SETTINGS,
// ADMIN_SETTINGS_CODE,
// "UI 코드 (공통코드)",
// "/settings/uicode",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER"));
//
// // 예제 게시판 - 시작
// //
// appendURI(
// AppType.ADMIN,
// ADMIN_BOARD,
// ADMIN_ARTICLE,
// "예제 게시판",
// "/board/articles",
// true,
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ARTICLE,
// ADMIN_ARTICLE_CREATE,
// "예제 게시판 등록",
// "/board/articles/create",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ARTICLE,
// ADMIN_ARTICLE_UPDATE,
// "예제 게시판 수정",
// "/board/articles/{{pathVar}}",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ARTICLE,
// ADMIN_ARTICLE_DELETE,
// "예제 게시판 삭제",
// "/board/articles/delete",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ARTICLE,
// ADMIN_ARTICLE_EXCEL,
// "예제 게시판 엑셀 다운로드",
// "/board/articles/excel",
// false,
// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF"));
// // 예제 게시판 - 끝
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ANALYSIS,
// ADMIN_ANALYSIS_OPERATION_LOG,
// "Operation Log (수행로그)",
// "/analysis/operationlog",
// true,
// Set.of("ROLE_SUPER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ANALYSIS,
// ADMIN_ANALYSIS_OPERATION_LOG_UPDATE,
// "수행로그 상세",
// "/analysis/operationlog/{{pathVar}}",
// false,
// Set.of("ROLE_SUPER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ANALYSIS_OPERATION_LOG,
// ADMIN_ANALYSIS_OPERATION_LOG_EXCEL,
// "수행로그 Excel",
// "/analysis/operationlog/excel",
// false,
// Set.of("ROLE_SUPER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ADD_ONS,
// ADMIN_ADD_ONS_SEND_EMAIL,
// "Email 발송",
// "/addons/email/form",
// true,
// Set.of("ROLE_SUPER"));
//
// appendURI(
// AppType.ADMIN,
// ADMIN_ADD_ONS_SEND_EMAIL,
// ADMIN_ADD_ONS_SEND_EMAIL_CREATE,
// "Email 입력폼",
// "/addons/email/form",
// false,
// Set.of("ROLE_SUPER"));
}
private void appendURI(

View File

@@ -39,154 +39,154 @@ public class InitUriFrontData implements ApplicationRunner {
return;
}
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";
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID,
null,
AppType.FRONT,
"/",
true,
"프론트",
null,
"프론트 홈",
"프론트 메인",
"front",
null,
null),
null,
false);
// 로그인
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".login",
FRONT_ROOT_ID,
AppType.FRONT,
"/login",
false,
"로그인",
null,
"로그인",
"로그인 페이지",
"front",
null,
null),
null,
false);
// 회원가입
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".user.register",
FRONT_ROOT_ID,
AppType.FRONT,
"/user/register",
false,
"회원가입",
null,
"회원가입",
"회원가입 페이지",
"회원가입",
null,
null),
null,
false);
// 정보수정
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".user.info",
FRONT_ROOT_ID,
AppType.FRONT,
"/user/info",
false,
"정보수정",
null,
"정보수정",
"정보수정 페이지",
"정보수정",
null,
Set.of("ROLE_GENERAL")),
null,
false);
// 예제게시판
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".board.articles",
FRONT_ROOT_ID,
AppType.FRONT,
"/board/articles",
true,
"예제게시판",
null,
"예제게시판",
"예제게시판 페이지",
"예제게시판",
null,
Set.of("ROLE_GENERAL")),
null,
false);
// 예제 게시판 등록
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".board.article.create",
FRONT_ROOT_ID,
AppType.FRONT,
"/board/articles/create",
false,
"예제 게시판 등록",
null,
"예제 게시판 등록",
"예제 게시판 등록 페이지",
"예제 게시판 등록",
null,
Set.of("ROLE_GENERAL")),
null,
false);
// 예제 게시판 상세
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".board.article.{{pathVar}}",
FRONT_ROOT_ID,
AppType.FRONT,
"/board/articles/{{pathVar}}",
false,
"예제 게시판 상세",
null,
"예제 게시판 상세",
"예제 게시판 상세 페이지",
"예제 게시판 상세",
null,
Set.of("ROLE_GENERAL")),
null,
false);
// 예제 게시판 수정
uriSavePortIn.connect(
new URISaveCommand(
FRONT_ROOT_ID + ".board.article.update.{{pathVar}}",
FRONT_ROOT_ID,
AppType.FRONT,
"/board/articles/update/{{pathVar}}",
false,
"예제 게시판 수정",
null,
"예제 게시판 수정",
"예제 게시판 수정 페이지",
"예제 게시판 수정",
null,
Set.of("ROLE_GENERAL")),
null,
false);
// 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";
//
// uriSavePortIn.connect(
// new URISaveCommand(
// FRONT_ROOT_ID,
// null,
// AppType.FRONT,
// "/",
// true,
// "프론트",
// null,
// "프론트 홈",
// "프론트 메인",
// "front",
// null,
// null),
// null,
// false);
//
// // 로그인
// uriSavePortIn.connect(
// new URISaveCommand(
// FRONT_ROOT_ID + ".login",
// FRONT_ROOT_ID,
// AppType.FRONT,
// "/login",
// false,
// "로그인",
// null,
// "로그인",
// "로그인 페이지",
// "front",
// null,
// null),
// null,
// false);
//
// // 회원가입
// uriSavePortIn.connect(
// new URISaveCommand(
// FRONT_ROOT_ID + ".user.register",
// FRONT_ROOT_ID,
// AppType.FRONT,
// "/user/register",
// false,
// "회원가입",
// null,
// "회원가입",
// "회원가입 페이지",
// "회원가입",
// null,
// null),
// null,
// false);
//
// // 정보수정
// uriSavePortIn.connect(
// new URISaveCommand(
// FRONT_ROOT_ID + ".user.info",
// FRONT_ROOT_ID,
// AppType.FRONT,
// "/user/info",
// false,
// "정보수정",
// null,
// "정보수정",
// "정보수정 페이지",
// "정보수정",
// null,
// Set.of("ROLE_GENERAL")),
// null,
// false);
//
// // 예제게시판
// uriSavePortIn.connect(
// new URISaveCommand(
// FRONT_ROOT_ID + ".board.articles",
// FRONT_ROOT_ID,
// AppType.FRONT,
// "/board/articles",
// true,
// "예제게시판",
// null,
// "예제게시판",
// "예제게시판 페이지",
// "예제게시판",
// null,
// Set.of("ROLE_GENERAL")),
// null,
// false);
//
// // 예제 게시판 등록
// uriSavePortIn.connect(
// new URISaveCommand(
// FRONT_ROOT_ID + ".board.article.create",
// FRONT_ROOT_ID,
// AppType.FRONT,
// "/board/articles/create",
// false,
// "예제 게시판 등록",
// null,
// "예제 게시판 등록",
// "예제 게시판 등록 페이지",
// "예제 게시판 등록",
// null,
// Set.of("ROLE_GENERAL")),
// null,
// false);
//
// // 예제 게시판 상세
// uriSavePortIn.connect(
// new URISaveCommand(
// FRONT_ROOT_ID + ".board.article.{{pathVar}}",
// FRONT_ROOT_ID,
// AppType.FRONT,
// "/board/articles/{{pathVar}}",
// false,
// "예제 게시판 상세",
// null,
// "예제 게시판 상세",
// "예제 게시판 상세 페이지",
// "예제 게시판 상세",
// null,
// Set.of("ROLE_GENERAL")),
// null,
// false);
//
// // 예제 게시판 수정
// uriSavePortIn.connect(
// new URISaveCommand(
// FRONT_ROOT_ID + ".board.article.update.{{pathVar}}",
// FRONT_ROOT_ID,
// AppType.FRONT,
// "/board/articles/update/{{pathVar}}",
// false,
// "예제 게시판 수정",
// null,
// "예제 게시판 수정",
// "예제 게시판 수정 페이지",
// "예제 게시판 수정",
// null,
// Set.of("ROLE_GENERAL")),
// null,
// false);
}
}

View File

@@ -25,8 +25,8 @@ public class InitUserPrivilegeData implements ApplicationRunner {
return;
}
saveUserPrivilegePortIn.operate(new SaveUserPrivilegeCmd("FRONT_API", "Front API 사용권한", 0));
saveUserPrivilegePortIn.operate(
new SaveUserPrivilegeCmd("FRONT_ACCESS", "Front 사이트 접근 권한", 1));
// saveUserPrivilegePortIn.operate(new SaveUserPrivilegeCmd("FRONT_API", "Front API 사용권한", 0));
// saveUserPrivilegePortIn.operate(
// new SaveUserPrivilegeCmd("FRONT_ACCESS", "Front 사이트 접근 권한", 1));
}
}

View File

@@ -26,7 +26,7 @@ public class InitUserRoleData implements ApplicationRunner {
return;
}
saveUserRolePortIn.operate(
new SaveUserRoleCmd("ROLE_GENERAL", "일반 사용자", 0, List.of("FRONT_API", "FRONT_ACCESS")));
// saveUserRolePortIn.operate(
// new SaveUserRoleCmd("ROLE_GENERAL", "일반 사용자", 0, List.of("FRONT_API", "FRONT_ACCESS")));
}
}

View File

@@ -5,4 +5,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface RemoveAllArticleMapper {
void deleteAll();
void deleteAllFiles();
void deleteAllComments();
}

View File

@@ -0,0 +1,23 @@
package app.module.core.usecase.adminResearch.getAdmin.adapters.persistence;
import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortOut;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetAdminDao implements GetAdminPortOut {
private final GetAdminMapper mapper;
@Override
public Optional<GetAdmin> operate(GetAdminCmd cmd) {
return mapper.findById(cmd).map(admin -> {
admin.setRoles(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq()));
return admin;
});
}
}

View File

@@ -0,0 +1,14 @@
package app.module.core.usecase.adminResearch.getAdmin.adapters.persistence;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
import java.util.List;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetAdminMapper {
Optional<GetAdmin> findById(GetAdminCmd cmd);
List<CoreRole> findRoleHasPrivilegesByAdminId(Long id);
}

View File

@@ -0,0 +1,9 @@
package app.module.core.usecase.adminResearch.getAdmin.ports;
import java.util.Optional;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
public interface GetAdminPortIn {
Optional<GetAdmin> operate(GetAdminCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.core.usecase.adminResearch.getAdmin.ports;
import java.util.Optional;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
public interface GetAdminPortOut {
Optional<GetAdmin> operate(GetAdminCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.core.usecase.adminResearch.getAdmin.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin;
import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd;
import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortIn;
import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortOut;
import java.util.Optional;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetAdminService implements GetAdminPortIn {
private final GetAdminPortOut portOut;
@Override
public Optional<GetAdmin> operate(GetAdminCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,32 @@
package app.module.core.usecase.adminResearch.getAdmin.ports.application.domain;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
public class GetAdmin {
private Long seq;
private String id;
private String password;
private String name;
private String contact;
private Integer inspectionAreaCode;
private LocalDateTime passwordUpdatedAt;
private Boolean accountDisabled;
private Integer loginFailCnt;
private Boolean accountLocked;
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private List<CoreRole> roles;
}

View File

@@ -0,0 +1,14 @@
package app.module.core.usecase.adminResearch.getAdmin.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetAdminCmd {
private String id;
}

View File

@@ -38,10 +38,10 @@ class CreateArticleDao implements CreateArticlePortOut {
command.getStartDate(),
command.getEndDate(),
command.getFileMappingId(),
LocalDateTime.now(),
CommonUtil.getLoginUsername(),
LocalDateTime.now(),
CommonUtil.getLoginUsername());
command.getCreatedAt(),
command.getCreatedBy(),
command.getUpdatedAt(),
command.getUpdatedBy());
mapper.createArticle(dto);
@@ -51,10 +51,10 @@ class CreateArticleDao implements CreateArticlePortOut {
dto.getFileMappingId().stream()
.map(Long::parseLong)
.collect(Collectors.toList()),
LocalDateTime.now(),
CommonUtil.getLoginUsername(),
LocalDateTime.now(),
CommonUtil.getLoginUsername()
dto.getCreatedAt(),
dto.getCreatedBy(),
dto.getUpdatedAt(),
dto.getUpdatedBy()
));
}

View File

@@ -1,5 +1,6 @@
package app.module.core.usecase.article.createArticle.ports.application;
import app.module.core.config.application.annotation.CreateCommand;
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn;
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortOut;
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle;
@@ -15,6 +16,7 @@ class CreateArticleService implements CreateArticlePortIn {
private final CreateArticlePortOut portOut;
@Override
@CreateCommand
public Optional<CreateArticle> operate(CreateArticleCmd command) {
return portOut.operate(command);
}

View File

@@ -1,5 +1,6 @@
package app.module.core.usecase.article.createArticle.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
@@ -11,8 +12,7 @@ import lombok.Setter;
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateArticleCmd {
public class CreateArticleCmd extends AuditCommand {
private String title;
private String content;
private Boolean visible;

View File

@@ -17,7 +17,7 @@ class GetHouseholdDao implements GetHouseholdPortOut {
public Optional<GetHousehold> operate(GetHouseholdCmd cmd) {
return mapper.findByHouseholdNum(cmd.getHouseholdNum())
.map(household -> {
household.setRoles(mapper.findRolesHasPrivilegesById(household.getId()));
household.setRoles(mapper.findRolesHasPrivilegesById(household.getSeq()));
return household;
});
}

View File

@@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetHouseholdMapper {
Optional<GetHousehold> findByHouseholdNum(String householdNum);
Set<CoreRole> findRolesHasPrivilegesById(Long id);
Set<CoreRole> findRolesHasPrivilegesById(Long seq);
}

View File

@@ -15,7 +15,7 @@ import lombok.Setter;
@NoArgsConstructor
@EqualsAndHashCode
public class GetHousehold {
private Long id;
private Long seq;
private String householdNum;
private String ownerName;
private Integer ownerAge;

View File

@@ -12,7 +12,7 @@ import lombok.Setter;
@Setter
@AllArgsConstructor
public class UpdateFrontHouseholdCmd extends AuditCommand {
private Long id;
private Long seq;
private String householdNum;
private String ownerName;
private Integer ownerAge;

View File

@@ -50,6 +50,13 @@ spring:
thymeleaf:
cache: false # 타임리프 캐시 비활성화 (개발 모드)
# 초기 스키마 생성 SQL 경로 설정
sql:
init:
schema-locations:
- classpath:sql/drop-all.sql
- classpath:sql/create-all.sql
# ==============================================
# 암호화 설정
# ==============================================

View File

@@ -0,0 +1,51 @@
<?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.usecase.adminResearch.getAdmin.adapters.persistence.GetAdminMapper">
<select id="findById"
resultType="app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin">
/* findById : 관리자 상세 조회 */
SELECT
a.seq,
a.id,
a.password,
a.name,
a.contact,
a.inspection_area_code,
a.password_updated_at,
a.account_disabled,
a.login_fail_cnt,
a.account_locked,
a.created_at,
a.created_by,
a.updated_at,
a.updated_by
FROM admin_research a
WHERE id = #{id}
AND a.is_deleted = false
</select>
<resultMap id="AdminRoleHasPrivilegesMap" type="app.module.core.config.adapters.web.security.domain.CoreRole">
<id property="id" column="role_id"/>
<result property="description" column="role_description"/>
<collection property="privileges" ofType="app.module.core.config.adapters.web.security.domain.CorePrivilege">
<id property="id" column="privilege_id"/>
</collection>
</resultMap>
<select id="findRoleHasPrivilegesByAdminId" resultMap="AdminRoleHasPrivilegesMap">
/* findRoleHasPrivilegesByAdminId : 관리자 권한, 역할 조회 */
SELECT
r.id AS role_id,
r.description AS role_description,
p.id AS privilege_id
FROM admin_research_has_role ahr
JOIN role r ON ahr.role_id = r.id AND r.is_deleted = false
LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false
LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false
WHERE ahr.admin_seq = #{seq}
AND ahr.is_deleted = false
</select>
</mapper>

View File

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

View File

@@ -7,7 +7,7 @@
<select id="findByHouseholdNum"
resultType="app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold">
SELECT
id,
seq,
household_num,
owner_name,
owner_age,

View File

@@ -15,7 +15,7 @@
city = #{city},
address_detail = #{addressDetail},
<include refid="common.fields.UpdateBaseSet" />
WHERE id = ${id}
WHERE seq = ${seq}
</update>
</mapper>

View File

@@ -6,4 +6,13 @@
<delete id="deleteAll">
DELETE FROM article
</delete>
<delete id="deleteAllFiles">
DELETE FROM article_has_upload_file
</delete>
<delete id="deleteAllComments">
DELETE FROM article_comment
</delete>
</mapper>

View File

@@ -0,0 +1,5 @@
-- test
CREATE TABLE my_first_table (
id SERIAL PRIMARY KEY,
name VARCHAR(255) NOT NULL
);

View File

@@ -0,0 +1,2 @@
-- test
DROP TABLE IF EXISTS my_first_table;

View File

@@ -26,7 +26,7 @@ class UpdateFrontHouseholdController {
}
updateFrontHouseholdPortIn.operate(new UpdateFrontHouseholdCmd(
reqVO.getId(),
reqVO.getSeq(),
reqVO.getHouseholdNum(),
reqVO.getOwnerName(),
reqVO.getOwnerAge(),

View File

@@ -10,7 +10,7 @@ import lombok.Setter;
@AllArgsConstructor
@EqualsAndHashCode
public class UpdateFrontHouseholdReqVO {
private Long id;
private Long seq;
private String householdNum;
private String ownerName;
private Integer ownerAge;

View File

@@ -35,7 +35,9 @@
method="get"
name="reqForm"
th:action="@{/user/info}" th:object="${userInfo}">
<input type="hidden" name="id" th:value="*{id}">
<input type="hidden" name="id" th:value="*{seq}">
<div>
<label for="householdNum">임가번호</label>
<input id="householdNum" name="householdNum" placeholder="아이디" readonly="readonly" th:field="*{householdNum}"