null 가능성 및 데이터 흐름 문제
This commit is contained in:
@@ -10,6 +10,8 @@ import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
|||||||
import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand;
|
import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand;
|
||||||
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
|
import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -37,7 +39,7 @@ public class AdminAuthFailEvent {
|
|||||||
@EventListener
|
@EventListener
|
||||||
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
|
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
|
||||||
HttpServletRequest request =
|
HttpServletRequest request =
|
||||||
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
|
||||||
|
|
||||||
if (event.getException() instanceof BadCredentialsException) {
|
if (event.getException() instanceof BadCredentialsException) {
|
||||||
adminViewPortIn
|
adminViewPortIn
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn;
|
|||||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
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;
|
||||||
@@ -49,7 +51,7 @@ public class AdminAuthSuccessEvent {
|
|||||||
AdminUser adminUser = (AdminUser) authentication.getPrincipal();
|
AdminUser adminUser = (AdminUser) authentication.getPrincipal();
|
||||||
|
|
||||||
HttpServletRequest request =
|
HttpServletRequest request =
|
||||||
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
|
||||||
|
|
||||||
// 로그인 실패 회수 초기화
|
// 로그인 실패 회수 초기화
|
||||||
adminViewPortIn
|
adminViewPortIn
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package app.module.admin.usecase.home.adapters.web;
|
|||||||
|
|
||||||
import app.module.admin.config.application.util.AdminUtil;
|
import app.module.admin.config.application.util.AdminUtil;
|
||||||
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
|
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn;
|
||||||
|
import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus;
|
||||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||||
import java.security.Principal;
|
import java.security.Principal;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -28,8 +29,9 @@ public class HomeController {
|
|||||||
model.addAttribute("loginUserRoles", loginUser.getRole());
|
model.addAttribute("loginUserRoles", loginUser.getRole());
|
||||||
});
|
});
|
||||||
|
|
||||||
model.addAttribute("smsActive",
|
GetSmsAutoStatus smsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null);
|
||||||
getSmsAutoStatusPortIn.operate().orElse(null).getActive());
|
|
||||||
|
model.addAttribute("smsActive", smsAutoStatus != null && smsAutoStatus.getActive());
|
||||||
|
|
||||||
return "home";
|
return "home";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class CreateHouseholdUIController {
|
|||||||
RedirectAttributes redirectAttributes) {
|
RedirectAttributes redirectAttributes) {
|
||||||
|
|
||||||
// 임가 등록 페이지는 관리자만 접근 가능
|
// 임가 등록 페이지는 관리자만 접근 가능
|
||||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
|
||||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||||
return "redirect:/households";
|
return "redirect:/households";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
|||||||
CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null);
|
CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null);
|
||||||
ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3));
|
ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3));
|
||||||
|
|
||||||
if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) {
|
if(checkHouseholdNum != null && !checkHouseholdNum.getIsDuplicated() && contactVO != null) {
|
||||||
int flag = 0;
|
int flag = 0;
|
||||||
ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO();
|
ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO();
|
||||||
household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호
|
household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ class GetHouseholdsStatusUIController {
|
|||||||
|
|
||||||
// 로그인한 관리자 역할
|
// 로그인한 관리자 역할
|
||||||
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
|
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
|
||||||
model.addAttribute("userRegionMainCode", admin.getRegionMainCode());
|
model.addAttribute("userRegionMainCode", admin != null ? admin.getRegionMainCode() : null);
|
||||||
|
|
||||||
// 실사 코드 목록
|
// 실사 코드 목록
|
||||||
// 지방실사와 조사원은 담당실사 지역만 조회
|
// 지방실사와 조사원은 담당실사 지역만 조회
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class SaveBankAutoTransferExpenseService implements SaveBankAutoTransferExpenseP
|
|||||||
inCmd.getPrice(),
|
inCmd.getPrice(),
|
||||||
"code.bank.output", // 지출 type code
|
"code.bank.output", // 지출 type code
|
||||||
"2", // 지출 유형 2 고정
|
"2", // 지출 유형 2 고정
|
||||||
monthlyInputStatus.getId(),
|
monthlyInputStatus != null ? monthlyInputStatus.getId() : null,
|
||||||
monthlyInputStatus.getBankAutoTransferOutputStatus()));
|
monthlyInputStatus != null ? monthlyInputStatus.getBankAutoTransferOutputStatus() : null));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -41,8 +41,8 @@ class SaveBankAutoTransferIncomeService implements SaveBankAutoTransferIncomePor
|
|||||||
inCmd.getPrice(),
|
inCmd.getPrice(),
|
||||||
"code.bank.input", // 수입 type code
|
"code.bank.input", // 수입 type code
|
||||||
"1", // 수입 유형 1 고정
|
"1", // 수입 유형 1 고정
|
||||||
monthlyInputStatus.getId(),
|
monthlyInputStatus != null ? monthlyInputStatus.getId() : null,
|
||||||
monthlyInputStatus.getBankAutoTransferInputStatus()
|
monthlyInputStatus != null ? monthlyInputStatus.getBankAutoTransferInputStatus() : null
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -32,7 +32,7 @@ class UpdateHouseholdStatusUIController {
|
|||||||
RedirectAttributes redirectAttributes) {
|
RedirectAttributes redirectAttributes) {
|
||||||
|
|
||||||
// 임가 수정 페이지는 관리자만 접근 가능
|
// 임가 수정 페이지는 관리자만 접근 가능
|
||||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) {
|
||||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||||
return "redirect:/households";
|
return "redirect:/households";
|
||||||
}
|
}
|
||||||
@@ -52,6 +52,7 @@ class UpdateHouseholdStatusUIController {
|
|||||||
GetHouseholdStatus result =
|
GetHouseholdStatus result =
|
||||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null);
|
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null);
|
||||||
|
|
||||||
|
if (result != null) {
|
||||||
model.addAttribute("householdInfo",
|
model.addAttribute("householdInfo",
|
||||||
new UpdateHouseholdStatusUIResVO(
|
new UpdateHouseholdStatusUIResVO(
|
||||||
result.getHouseholdSeq(),
|
result.getHouseholdSeq(),
|
||||||
@@ -80,6 +81,7 @@ class UpdateHouseholdStatusUIController {
|
|||||||
result.getResearcherName(),
|
result.getResearcherName(),
|
||||||
result.getResearcherPhone()
|
result.getResearcherPhone()
|
||||||
));
|
));
|
||||||
|
}
|
||||||
|
|
||||||
return "households/update/{seq}";
|
return "households/update/{seq}";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user