diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java index 067b01d0..11fd9c68 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java @@ -10,12 +10,14 @@ import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.applic import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -28,35 +30,45 @@ class GetBanksUIController { private final GetMonthlyInputStatussPortIn portIn; - @GetMapping(path = "/info/bank") - String operate(Model model, - @PageableDefault(sort = "month", direction = Sort.Direction.DESC, page = 0, size = 13) Pageable pageable - ) { + @GetMapping(path = "/info/bank/{currentMonth}") + String operateMonth(Model model, @PathVariable String currentMonth) { + + Pageable pageable = PageRequest.of( + 0, + 13, + Sort.by(Sort.Direction.DESC, "month") + ); - //TODO 사양 결정이 아직 안되 리스트 가져오는것과 오늘 날짜로 가져오는것 둘다 Page list = portIn.operate( pageable, new GetMonthlyInputStatussCmd( null, null, AuthUtil.getUserSeq())); + model.addAttribute("list", list); - - String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); - - GetMonthlyInputStatuss matched = list.getContent().stream() + GetMonthlyInputStatuss monthStatus = list.getContent().stream() .filter(item -> currentMonth.equals(item.getMonth())) .findFirst() .orElseThrow(() -> new NoSuchElementException("해당 월의 데이터가 없습니다.")); - - - + model.addAttribute("monthStatus", monthStatus); // TODO 페키지명이 넘무 길어서 그냥 model.addAttribute("MonthStatus", MonthStatus.class); return "info/bank/banks"; } + + + + @GetMapping(path = "/info/bank") + String operate() { + + String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); + + return "redirect:/info/bank/" + currentMonth; + + } } \ No newline at end of file diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties index b1abe7cc..565797b1 100644 --- a/front/src/main/resources/messages/uri.properties +++ b/front/src/main/resources/messages/uri.properties @@ -25,6 +25,11 @@ uri.front.info.monthly.path=/info/monthly uri.front.info.monthly.create.{{pathVar}}=\uC784\uC0B0\uBB3C \uD604\uD669 uri.front.info.bank=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED uri.front.info.bank.path=/info/bank +uri.front.info.bank.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.input.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.input.month.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.output.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED +uri.front.info.bank.create.output.month.{{pathVar}}=\uC740\uD589 \uC790\uB3D9\uC774\uCCB4 \uB0B4\uC5ED diff --git a/front/src/main/resources/templates/info/bank/banks.html b/front/src/main/resources/templates/info/bank/banks.html index 2a6cb7f6..89f725eb 100644 --- a/front/src/main/resources/templates/info/bank/banks.html +++ b/front/src/main/resources/templates/info/bank/banks.html @@ -13,18 +13,35 @@ @@ -34,7 +51,7 @@