[2025.05.31] initData 작업

This commit is contained in:
kangsunlee
2025-05-31 22:24:28 +09:00
parent 64ba09e086
commit 525462b659
96 changed files with 1726 additions and 985 deletions

View File

@@ -34,7 +34,7 @@ public class RoleUpdateAspect {
public Object operate(ProceedingJoinPoint joinPoint) throws Throwable {
Object[] args = joinPoint.getArgs();
String adminId = (String) args[0];
String adminId = (String) args[1];
List<String> currentRoles = Collections.emptyList();
MethodSignature signature = (MethodSignature) joinPoint.getSignature();

View File

@@ -4,10 +4,6 @@ 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;
import java.util.Optional;
@@ -21,13 +17,13 @@ import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@RequiredArgsConstructor
public class AdminDetailsService implements UserDetailsService {
private final AdminViewPortIn adminViewPortIn;
private final GetAdminPortIn getAdminPortIn;
@Value("${app.admin.password.validity.period.days}")
private long passwordValidPeriodDays;
@@ -36,28 +32,23 @@ public class AdminDetailsService implements UserDetailsService {
@Transactional
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
GetAdmin getAdmin =
getAdminPortIn
.operate(new GetAdminCmd(username))
AdminView adminUser =
adminViewPortIn
.connect(username)
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
// 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);
boolean accountLocked = Optional.ofNullable(adminUser.getAccountLocked()).orElse(false);
boolean accountDisabled = Optional.ofNullable(adminUser.getAccountDisabled()).orElse(false);
return new AdminUser(
getAdmin.getId(),
getAdmin.getPassword(),
adminUser.getId(),
adminUser.getPassword(),
!accountDisabled,
true,
isCredentialsNonExpired(getAdmin.getPasswordUpdatedAt()),
isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()),
!accountLocked,
getAuthorities(getAdmin.getRoles()),
passwordValidPeriodDays - getDaysPassedFrom(getAdmin.getPasswordUpdatedAt()));
getAuthorities(adminUser.getRoles()),
passwordValidPeriodDays - getDaysPassedFrom(adminUser.getPasswordUpdatedAt()));
}
/**

View File

@@ -38,6 +38,7 @@ public class AdminCreatePostController {
}
savePortIn.connect(
bindingVO.getSeq(),
bindingVO.getId(),
bindingVO.getPassword(),
bindingVO.getEmail(),

View File

@@ -48,6 +48,7 @@ class AdminUpdateGetController {
output.getCreatedAt(),
output.getUpdatedBy(),
output.getUpdatedAt(),
output.getSeq(),
output.getId(),
null,
output.getEmail(),

View File

@@ -38,6 +38,7 @@ class AdminUpdatePostController {
}
saveAdminPortIn.connect(
bindingVO.getSeq(),
bindingVO.getId(),
bindingVO.getUpdatePassword(),
bindingVO.getEmail(),

View File

@@ -11,7 +11,7 @@ import lombok.Setter;
@Setter
@AllArgsConstructor
public class AdminCreateBindingVO {
private Long seq;
private String id;
private String password;

View File

@@ -22,6 +22,7 @@ public class AdminUpdateBindingVO implements AuditOutput {
private final LocalDateTime updatedAt;
private Long seq;
private String id;
private String updatePassword;

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI.model.GetAnalystDashboardReqVO;
@Controller
@RequiredArgsConstructor
class GetAnalystDashboardController {
@GetMapping(path = "/analyst/dashboard")
String operate(
Model model,
@ModelAttribute("reqVO") GetAnalystDashboardReqVO reqVO) {
return "analyst/dashboard";
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetAnalystDashboardReqVO {
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.communication.notice.getNoticesUI;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.communication.notice.getNoticesUI.model.GetNoticesReqVO;
@Controller
@RequiredArgsConstructor
class GetNoticesController {
@GetMapping(path = "/communication/notices")
String operate(
Model model,
@ModelAttribute("reqVO") GetNoticesReqVO reqVO) {
return "communication/notices";
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.communication.notice.getNoticesUI.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetNoticesReqVO {
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.communication.sms.getSmsUI;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.communication.sms.getSmsUI.model.GetSmsReqVO;
@Controller
@RequiredArgsConstructor
class GetSmsController {
@GetMapping(path = "/communication/sms")
String operate(
Model model,
@ModelAttribute("reqVO") GetSmsReqVO reqVO) {
return "communication/sms";
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.communication.sms.getSmsUI.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetSmsReqVO {
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.household.getHouseholdsUI;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.household.getHouseholdsUI.model.GetHouseholdsUIReqVO;
@Controller
@RequiredArgsConstructor
class GetHouseholdsUIController {
@GetMapping(path = "/household/households")
String operate(
Model model,
@ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) {
return "household/households";
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.getHouseholdsUI.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetHouseholdsUIReqVO {
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web.model.GetResearcherDashboardUIReqVO;
@Controller
@RequiredArgsConstructor
class GetResearcherDashboardUIController {
@GetMapping(path = "/researcher/dashboard")
String operate(
Model model,
@ModelAttribute("reqVO") GetResearcherDashboardUIReqVO reqVO) {
return "researcher/dashboard";
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetResearcherDashboardUIReqVO {
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web.model.GetResearcherHouseholdsUIReqVO;
@Controller
@RequiredArgsConstructor
class GetResearcherHouseholdsUIController {
@GetMapping(path = "/researcher/households")
String operate(
Model model,
@ModelAttribute("reqVO") GetResearcherHouseholdsUIReqVO reqVO) {
return "researcher/households";
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetResearcherHouseholdsUIReqVO {
}

View File

@@ -26,4 +26,23 @@ uri.admin.analysis.operationLog=Operation Log (\uC218\uD589\uB85C\uADF8)
uri.admin.analysis.operationLog.{{pathVar}}=\uC218\uD589\uB85C\uADF8 \uC0C1\uC138
uri.admin.addons=Add-ons (\uBD80\uAC00\uAE30\uB2A5)
uri.admin.addons.email=Email
uri.admin.addons.email.form=Email \uBC1C\uC1A1\uD3FC
uri.admin.addons.email.create=Email \uBC1C\uC1A1\uD3FC
uri.admin.researcher=\uC870\uC0AC\uC6D0
uri.admin.researcher.household=\uC784\uAC00\uD604\uD669
uri.admin.researcher.household.{{pathVar}}=\uC784\uAC00\uD604\uD669 \uC0C1\uC138
uri.admin.researcher.dashboard=\uB300\uC2DC\uBCF4\uB4DC
uri.admin.analyst=\uC5F0\uAD6C\uC6D0
uri.admin.analyst.dashboard=\uB300\uC2DC\uBCF4\uB4DC
uri.admin.communication=\uCEE4\uBBA4\uB2C8\uCF00\uC774\uC158
uri.admin.communication.notice=\uACF5\uC9C0\uC0AC\uD56D
uri.admin.communication.notice.create=\uACF5\uC9C0\uC0AC\uD56D \uB4F1\uB85D
uri.admin.communication.notice.update.{{pathVar}}=\uACF5\uC9C0\uC0AC\uD56D \uC218\uC815
uri.admin.communication.sms=\uBB38\uC790\uBC1C\uC1A1
uri.admin.household=\uC784\uAC00\uD68C\uC6D0\uAD00\uB9AC
uri.admin.household.household=\uC784\uAC00\uD68C\uC6D0
uri.admin.household.household.create=\uC784\uAC00\uD68C\uC6D0 \uB4F1\uB85D
uri.admin.household.household.update.{{pathVar}}=\uC784\uAC00\uD68C\uC6D0 \uC218\uC815

View File

@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<h1>/analyst/dashboard</h1>
</section>
</html>

View File

@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<h1>/communication/notices</h1>
</section>
</html>

View File

@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<h1>/communication/sms</h1>
</section>
</html>

View File

@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<h1>/household/households</h1>
</section>
</html>

View File

@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<h1>/researcher/dashboard</h1>
</section>
</html>

View File

@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<h1>/researcher/households</h1>
</section>
</html>

View File

@@ -44,6 +44,7 @@ class AdminAuthFailHandlerTest {
@BeforeAll
public void beforeAll() {
saveAdminPortIn.connect(
1L,
testUsername,
"test.1@#$",
"xx4@test.com",

View File

@@ -49,6 +49,7 @@ class AdminAuthSuccessHandlerTest {
@BeforeAll
public void beforeAll() {
saveAdminPortIn.connect(
1L,
username,
password,
"admin_for_createDao_test@test.com",

View File

@@ -39,6 +39,7 @@ class AdminDetailsServiceTest {
@BeforeAll
public void beforeAll() {
saveAdminPortIn.connect(
1L,
username,
password,
"xx1@test.com",

View File

@@ -35,6 +35,7 @@ class AdminCreateUpdateDaoTest {
void operate() {
saveAdminPortIn.connect(
1L,
"admin_for_createDao_test",
"test.1@#$",
"admin_for_createDao_test@test.com",
@@ -51,6 +52,7 @@ class AdminCreateUpdateDaoTest {
retrieveUser.getRoles().size()));
saveAdminPortIn.connect(
2L,
"admin_for_createDao_test",
"test.1@#$",
"admin_for_createDao_test@test.com",