[BO] 임가현황 작업 중 - url 변경
This commit is contained in:
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
class CheckHouseholdNumController {
|
||||
private final CheckHouseholdNumPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/households/check")
|
||||
@GetMapping(path = "/api/households/check")
|
||||
ResponseEntity<CheckHouseholdNum> operate(
|
||||
@Valid CheckHouseholdNumReqVO reqVO) {
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ class CreateHouseholdController {
|
||||
private final CreateHouseholdValidator validator;
|
||||
private final CreateHouseholdPortIn createHouseholdPortIn;
|
||||
|
||||
@PostMapping(path = "/api/household/households/create")
|
||||
@PostMapping(path = "/api/households/create")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody CreateHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
@@ -16,14 +16,14 @@ class CreateHouseholdUIController {
|
||||
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/create")
|
||||
@GetMapping(path = "/households/create")
|
||||
String operate(Model model, @ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
|
||||
// 임가 등록 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/household/households";
|
||||
return "redirect:/households";
|
||||
}
|
||||
|
||||
// 실사
|
||||
@@ -37,6 +37,6 @@ class CreateHouseholdUIController {
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
|
||||
return "household/households/create";
|
||||
return "households/create";
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||
class GetHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/{seq}")
|
||||
@GetMapping(path = "/households/{seq}")
|
||||
String operate(
|
||||
@PathVariable Long seq,
|
||||
@RequestParam(required = false) String recordMonth,
|
||||
@@ -34,6 +34,6 @@ class GetHouseholdStatusUIController {
|
||||
model.addAttribute("householdInfo",
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
|
||||
return "household/households/{seq}";
|
||||
return "households/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,7 @@ import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model
|
||||
class GetHouseholdsStatusController {
|
||||
private final GetHouseholdsStatusPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/household/households")
|
||||
@GetMapping(path = "/api/households")
|
||||
ResponseEntity<Page<GetHouseholdsStatus>> operate(
|
||||
@PageableDefault(size = 10) Pageable pageable,
|
||||
GetHouseholdsStatusReqVO reqVO) {
|
||||
|
||||
@@ -3,7 +3,6 @@ package app.module.admin.usecase.household.getHouseholdsStatusUI;
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
import app.module.admin.usecase.household.getHouseholdsStatusUI.model.GetHouseholdsUIReqVO;
|
||||
import app.module.core.config.adapters.persistence.entity.Admin;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.admin.view.ports.AdminViewPortIn;
|
||||
import app.module.core.usecase.admin.view.ports.application.domain.AdminView;
|
||||
@@ -20,7 +19,7 @@ class GetHouseholdsStatusUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final AdminViewPortIn adminViewPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households")
|
||||
@GetMapping(path = "/households")
|
||||
String operate(
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) {
|
||||
@@ -56,6 +55,6 @@ class GetHouseholdsStatusUIController {
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
|
||||
|
||||
return "household/households";
|
||||
return "households/households";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoDao implements GetHouseholdVisitInfoPortOut {
|
||||
private final GetHouseholdVisitInfoMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd) {
|
||||
return mapper.getHouseholdVisitInfo(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetHouseholdVisitInfoMapper {
|
||||
Optional<GetHouseholdVisitInfo> getHouseholdVisitInfo(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoReqVO;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoResVO;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoController {
|
||||
private final GetHouseholdVisitInfoPortIn portIn;
|
||||
|
||||
@GetMapping(path = "/api/visitInfo/{id}")
|
||||
ResponseEntity<?> operate(
|
||||
@PathVariable Long id,
|
||||
GetHouseholdVisitInfoReqVO reqVO) {
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(portIn.operate(new GetHouseholdVisitInfoCmd(id)).orElse(null));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoReqVO {
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoResVO {
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
|
||||
public interface GetHouseholdVisitInfoPortIn {
|
||||
Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports;
|
||||
|
||||
import java.util.Optional;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
|
||||
public interface GetHouseholdVisitInfoPortOut {
|
||||
Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn;
|
||||
import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut;
|
||||
import java.util.Optional;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetHouseholdVisitInfoService implements GetHouseholdVisitInfoPortIn {
|
||||
private final GetHouseholdVisitInfoPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetHouseholdVisitInfo> operate(GetHouseholdVisitInfoCmd cmd) {
|
||||
return portOut.operate(cmd);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain;
|
||||
|
||||
import app.module.admin.config.application.enums.ManagementType;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfo {
|
||||
private Long id;
|
||||
private Long householdSeq;
|
||||
private Date visitDate;
|
||||
private ManagementType managementType;
|
||||
private String content;
|
||||
private Boolean isGiftSent;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdVisitInfoCmd {
|
||||
private Long id;
|
||||
}
|
||||
@@ -20,7 +20,7 @@ class UpdateHouseholdController {
|
||||
private final UpdateHouseholdValidator validator;
|
||||
private final UpdateHouseholdPortIn updateHouseholdPortIn;
|
||||
|
||||
@PutMapping(path = "/api/household/households/update")
|
||||
@PutMapping(path = "/api/households/update")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody UpdateHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
@@ -23,7 +23,7 @@ class UpdateHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/update/{seq}")
|
||||
@GetMapping(path = "/households/update/{seq}")
|
||||
String operate(@PathVariable Long seq, Model model,
|
||||
@ModelAttribute("reqVO") UpdateHouseholdStatusUIReqVO reqVO,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
@@ -31,7 +31,7 @@ class UpdateHouseholdStatusUIController {
|
||||
// 임가 수정 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/household/households";
|
||||
return "redirect:/households";
|
||||
}
|
||||
|
||||
model.addAttribute("seq", seq);
|
||||
@@ -80,6 +80,6 @@ class UpdateHouseholdStatusUIController {
|
||||
result.getResearcherPhone()
|
||||
));
|
||||
|
||||
return "household/households/update/{seq}";
|
||||
return "households/update/{seq}";
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user