diff --git a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java index c4cf8d63..084c4a73 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java @@ -63,7 +63,7 @@ public class RoleUpdateAspect { || currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) { createLog = true; } - } else if (currentRoles.size() > 0) { + } else if (!currentRoles.isEmpty()) { createLog = true; } diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java index 3854cdd8..124ac72f 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java @@ -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.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; + +import java.util.Objects; import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -37,7 +39,7 @@ public class AdminAuthFailEvent { @EventListener public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) { HttpServletRequest request = - ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); if (event.getException() instanceof BadCredentialsException) { adminViewPortIn diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java index 61c61a2b..bd3dee3a 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java @@ -10,6 +10,8 @@ import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import jakarta.servlet.http.HttpServletRequest; import java.time.LocalDateTime; +import java.util.Objects; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -49,7 +51,7 @@ public class AdminAuthSuccessEvent { AdminUser adminUser = (AdminUser) authentication.getPrincipal(); HttpServletRequest request = - ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); // 로그인 실패 회수 초기화 adminViewPortIn diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java b/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java index 342b773d..8a3e6acd 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java @@ -82,7 +82,7 @@ public class AdminSecurityConfig { List permitPaths = Arrays.stream(PublicAccess.values()) .map(PublicAccess::getPath) - .collect(Collectors.toList()); + .toList(); http.authorizeHttpRequests( (auth) -> diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java index 789a447a..ee18560c 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java @@ -2,10 +2,12 @@ package app.module.admin.config.application.security; import java.util.Collection; import lombok.Getter; +import lombok.Setter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; @Getter +@Setter public class AdminUser extends User { private Long seq; private String roleId; diff --git a/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java b/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java index 176d6ba7..d9cbbad9 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java +++ b/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java @@ -1,11 +1,15 @@ package app.module.admin.config.application.util.model; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.IndexedColors; import java.util.List; import java.util.Set; import java.util.Map; +@Getter +@Setter public class ExcelSheetDto { /** * 시트명 @@ -36,10 +40,4 @@ public class ExcelSheetDto { this.commaColumns = commaColumns; this.headerBgColors = headerBgColors; } - - public String getSheetName() { return sheetName; } - public List getHeaders() { return headers; } - public List> getData() { return data; } - public Set getCommaColumns() { return commaColumns; } - public Map getHeaderBgColors() { return headerBgColors; } } diff --git a/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java b/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java index 7585f5aa..a02f7bbb 100644 --- a/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.home.adapters.web; 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.application.domain.GetSmsAutoStatus; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import java.security.Principal; import lombok.RequiredArgsConstructor; @@ -28,8 +29,9 @@ public class HomeController { model.addAttribute("loginUserRoles", loginUser.getRole()); }); - model.addAttribute("smsActive", - getSmsAutoStatusPortIn.operate().orElse(null).getActive()); + GetSmsAutoStatus smsAutoStatus = getSmsAutoStatusPortIn.operate().orElse(null); + + model.addAttribute("smsActive", smsAutoStatus != null && smsAutoStatus.getActive()); return "home"; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java index 4c61700a..32418eb7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java @@ -23,7 +23,7 @@ class CreateHouseholdUIController { RedirectAttributes redirectAttributes) { // 임가 등록 페이지는 관리자만 접근 가능 - if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) { + if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) { redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다."); return "redirect:/households"; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 99d7f34b..5f975f59 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -63,7 +63,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null); ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3)); - if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) { + if(checkHouseholdNum != null && !checkHouseholdNum.getIsDuplicated() && contactVO != null) { int flag = 0; ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO(); household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호 diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java index 8b9b9d5f..c30ae5de 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java @@ -31,7 +31,7 @@ class GetHouseholdsStatusUIController { // 로그인한 관리자 역할 model.addAttribute("userRole", AdminUtil.getLoginUserRole()); - model.addAttribute("userRegionMainCode", admin.getRegionMainCode()); + model.addAttribute("userRegionMainCode", admin != null ? admin.getRegionMainCode() : null); // 실사 코드 목록 // 지방실사와 조사원은 담당실사 지역만 조회 diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java index 432b0860..7fca3102 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java @@ -39,7 +39,7 @@ class SaveBankAutoTransferExpenseService implements SaveBankAutoTransferExpenseP inCmd.getPrice(), "code.bank.output", // 지출 type code "2", // 지출 유형 2 고정 - monthlyInputStatus.getId(), - monthlyInputStatus.getBankAutoTransferOutputStatus())); + monthlyInputStatus != null ? monthlyInputStatus.getId() : null, + monthlyInputStatus != null ? monthlyInputStatus.getBankAutoTransferOutputStatus() : null)); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java index e690d351..19bf915a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java @@ -41,8 +41,8 @@ class SaveBankAutoTransferIncomeService implements SaveBankAutoTransferIncomePor inCmd.getPrice(), "code.bank.input", // 수입 type code "1", // 수입 유형 1 고정 - monthlyInputStatus.getId(), - monthlyInputStatus.getBankAutoTransferInputStatus() + monthlyInputStatus != null ? monthlyInputStatus.getId() : null, + monthlyInputStatus != null ? monthlyInputStatus.getBankAutoTransferInputStatus() : null )); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index c338737e..667c3457 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -32,7 +32,7 @@ class UpdateHouseholdStatusUIController { RedirectAttributes redirectAttributes) { // 임가 수정 페이지는 관리자만 접근 가능 - if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) { + if (!"ROLE_ADMIN".equals(AdminUtil.getLoginUserRole())) { redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다."); return "redirect:/households"; } @@ -52,34 +52,36 @@ class UpdateHouseholdStatusUIController { GetHouseholdStatus result = getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null); - model.addAttribute("householdInfo", - new UpdateHouseholdStatusUIResVO( - result.getHouseholdSeq(), - result.getHouseholdNum(), - result.getHouseholdName(), - result.getHouseholdAge(), - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "", - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "", - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "", - result.getRegionMainCode(), - result.getRegionSubCode(), - result.getRegionDetailCode(), - result.getAddress(), - result.getIndustryLargeCode(), - result.getIndustryMiddleCode(), - result.getIndustrySubMiddleName(), - result.getIndustryDetailName(), - result.getIsPanel(), - result.getUsageType(), - result.getEmploymentType(), - result.getMemo(), - result.getResearcherSeq(), - result.getResearcherName(), - result.getResearcherPhone() - )); + if (result != null) { + model.addAttribute("householdInfo", + new UpdateHouseholdStatusUIResVO( + result.getHouseholdSeq(), + result.getHouseholdNum(), + result.getHouseholdName(), + result.getHouseholdAge(), + StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "", + StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "", + StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "", + StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "", + StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "", + StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "", + result.getRegionMainCode(), + result.getRegionSubCode(), + result.getRegionDetailCode(), + result.getAddress(), + result.getIndustryLargeCode(), + result.getIndustryMiddleCode(), + result.getIndustrySubMiddleName(), + result.getIndustryDetailName(), + result.getIsPanel(), + result.getUsageType(), + result.getEmploymentType(), + result.getMemo(), + result.getResearcherSeq(), + result.getResearcherName(), + result.getResearcherPhone() + )); + } return "households/update/{seq}"; } diff --git a/core/src/main/java/app/module/core/config/application/util/ExcelUtil.java b/core/src/main/java/app/module/core/config/application/util/ExcelUtil.java index fb54bc6c..cf854e12 100644 --- a/core/src/main/java/app/module/core/config/application/util/ExcelUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/ExcelUtil.java @@ -98,7 +98,7 @@ public class ExcelUtil { wb.write(responseOutputStream); wb.close(); } catch (IOException e) { - e.printStackTrace(); + log.error("[ExcelUtil] generateWithoutPassword: {}", e.getMessage(), e); } } } diff --git a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java index 92111f50..5b15dc23 100644 --- a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java +++ b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java @@ -84,7 +84,7 @@ public class CreateCellService implements CreateCellPortIn { // 셀 스타일 적용 (null 체크) if (cellConfig.getCellStyle() != null) { cell.setCellStyle(cellConfig.getCellStyle()); - } else { + //} else { // TODO: cellConfig.getCellStyle()이 null인 경우, 워크북에서 새로운 스타일을 생성하거나 기본 스타일을 적용하는 로직 고려 // XSSFWorkbook workbook = (XSSFWorkbook) sheet.getWorkbook(); // cell.setCellStyle(workbook.createCellStyle()); diff --git a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java index f98bc4ce..7239e81e 100644 --- a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java +++ b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java @@ -34,9 +34,9 @@ class URICurrentMatchingService implements URICurrentMatchingPortIn { // {{pathVar}} 을 가진 URI 라면 배열검증 수행 if (comparePath.endsWith("/{{pathVar}}")) { List pathComponents = - Arrays.stream(comparePath.split("/")).collect(Collectors.toList()); + Arrays.stream(comparePath.split("/")).toList(); List targetComponents = - Arrays.stream(targetUri.split("/")).collect(Collectors.toList()); + Arrays.stream(targetUri.split("/")).toList(); if (pathComponents.size() != targetComponents.size()) { return false; diff --git a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java index 5fc37dc2..db82a261 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java @@ -69,7 +69,7 @@ public class FrontSecurityConfig { List publicAccess = Arrays.stream(PublicAccess.values()) .map(PublicAccess::getPath) - .collect(Collectors.toList()); + .toList(); // front - 익명 사용자 접근 허용 URI 등록 (admin 과 달리 공개/비공개 URL 이 존재한다) FrontPublicAccess.getInstance().setURIs(List.of("/", "/user/register", "/policy/**")); diff --git a/front/src/main/java/app/module/front/config/application/security/FrontUser.java b/front/src/main/java/app/module/front/config/application/security/FrontUser.java index 46237059..c4b5aac1 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontUser.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontUser.java @@ -2,10 +2,12 @@ package app.module.front.config.application.security; import java.util.Collection; import lombok.Getter; +import lombok.Setter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; @Getter +@Setter public class FrontUser extends User { private String nickname; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java index 4f6d9b8b..f9951da3 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java @@ -70,7 +70,7 @@ public class DailyRecordController { */ @PostMapping(path = "/{searchMonth}/{groupNo}/today-none") ResponseEntity todayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @RequestParam(name = "target", required = true, defaultValue = "") String targetType + , @RequestParam(name = "target", defaultValue = "") String targetType , @RequestParam(name = "status", required = false, defaultValue = "N") String targetStatus) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java index d53511b4..263509a8 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java @@ -12,7 +12,6 @@ import java.util.List; @EqualsAndHashCode public class CreateBankInputReqVO { - // private Boolean status; private Long id; private String transferType; @@ -22,9 +21,4 @@ public class CreateBankInputReqVO { return bankList != null ? bankList : new ArrayList<>(); } - public void setBankList(List bankList) { - this.bankList = bankList; - } - - } diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyReqVO.java b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyReqVO.java index d0bf0af1..ef70dcdb 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyReqVO.java @@ -11,8 +11,6 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode public class CreateMonthlyReqVO { - - private Boolean status; private Long id; private List productList; @@ -20,10 +18,4 @@ public class CreateMonthlyReqVO { public List getProductList() { return productList != null ? productList : new ArrayList<>(); } - - public void setProductList(List productList) { - this.productList = productList; - } - - }