From d67b790c44690cff9011a8ce9f6ac87d7088bc93 Mon Sep 17 00:00:00 2001 From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp> Date: Mon, 19 Oct 2026 16:18:05 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EF=BC=91=E6=97=A5=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/AdminLoanController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java index 45482ec..2746bcc 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java @@ -1,5 +1,21 @@ package com.example.demo.controller; +import java.util.logging.Logger; + +import jakarta.servlet.http.HttpSession; + +import org.springframework.stereotype.Controller; + +@Controller public class AdminLoanController { + + // ログ出力用インスタンス + private final static Logger LOGGER = Logger.getLogger(AdminLoanController.class.getName()); + + // エラーメッセージ用の定数フィールド + private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; + + HttpSession httpSession; + } From 13f2fdedeae81754470fbf1cba832fd0ee58c99f Mon Sep 17 00:00:00 2001 From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp> Date: Tue, 20 Oct 2026 11:16:14 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=E9=80=94=E4=B8=AD=E7=B5=8C=E9=81=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/AdminLoanController.java | 5 ++++ .../demo/service/BookAdminService.java | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java index 2746bcc..f2fe673 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java @@ -6,6 +6,9 @@ import jakarta.servlet.http.HttpSession; import org.springframework.stereotype.Controller; +import com.example.demo.entity.BookCollection; +import com.example.demo.entity.BorrowBook; + @Controller public class AdminLoanController { @@ -16,6 +19,8 @@ public class AdminLoanController { private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; HttpSession httpSession; + BookCollection bookcollection; + BorrowBook borrowBook; } diff --git a/book-rent/src/main/java/com/example/demo/service/BookAdminService.java b/book-rent/src/main/java/com/example/demo/service/BookAdminService.java index d8f4f64..483de2f 100644 --- a/book-rent/src/main/java/com/example/demo/service/BookAdminService.java +++ b/book-rent/src/main/java/com/example/demo/service/BookAdminService.java @@ -1,5 +1,31 @@ package com.example.demo.service; +import java.time.LocalDate; + +import org.springframework.stereotype.Service; + +import com.example.demo.entity.BookCollection; +import com.example.demo.entity.BorrowBook; +import com.example.demo.repository.BookCollectionRepository; +import com.example.demo.repository.BorrowBookRepository; + +@Service public class BookAdminService { + BorrowBookRepository borrowBookRepository; + BookCollectionRepository bookCollectionRepository; + + public BookAdminService(BorrowBookRepository borrowBookRepository, BookCollectionRepository bookCollectionRepository) { + this.borrowBookRepository = borrowBookRepository; + this.bookCollectionRepository = bookCollectionRepository; + } + + @Transactional + public void aprroveBookAdmin(BorrowBook idRequest, BookCollection idBook) { + LocalDate today = LocalDate.now(); + + // 貸出テーブルの更新 + BorrowBook brrowBook = borrowBookRepository.findById(idRequest); + + } } From ff1c43d80b63dbf4635af996716ebd4417b66acf Mon Sep 17 00:00:00 2001 From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp> Date: Tue, 20 Oct 2026 13:45:30 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/AdminLoanController.java | 66 +++++++++++++++---- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java index f2fe673..d97a265 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java @@ -5,22 +5,66 @@ import java.util.logging.Logger; import jakarta.servlet.http.HttpSession; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.example.demo.entity.BookCollection; -import com.example.demo.entity.BorrowBook; +import com.example.demo.common.BusinessException; +import com.example.demo.common.LoginUser; +import com.example.demo.form.RentalForm; +import com.example.demo.service.LoanService; @Controller public class AdminLoanController { - + // ログ出力用インスタンス - private final static Logger LOGGER = Logger.getLogger(AdminLoanController.class.getName()); + private final static Logger LOGGER = Logger.getLogger(AdminLoanController.class.getName()); - // エラーメッセージ用の定数フィールド - private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; - - HttpSession httpSession; - BookCollection bookcollection; - BorrowBook borrowBook; - + // エラーメッセージ用の定数フィールド + private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; + private final LoanService loanService; + + public AdminLoanController(LoanService loanService) { + this.loanService = loanService; + } + + + @PostMapping("/submit") + public String executeApproval( + @ModelAttribute("approvalConfilm") RentalForm form, + @RequestParam("action") + String action, + HttpSession session, + RedirectAttributes redirectAttributes) { + + // セッションからログイン中の管理者情報を取得 + LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER"); + if (loginUser == null) { + return "redirect:/login"; + } + + try { + if ("approve".equals(action)) { + // 確定したLoanServiceのインスタンスメソッド呼び出し + loanService.approve(form.getIdRequest(), loginUser); + redirectAttributes.addFlashAttribute("successMessage", "申請を承認しました。"); + + } else if ("reject".equals(action)) { + // 確定したLoanServiceのインスタンスメソッドを呼び出し、IDにはidRequestを渡す + loanService.reject(form.getIdRequest(), loginUser); + redirectAttributes.addFlashAttribute("successMessage", "申請を却下しました。"); + + } else { + throw new BusinessException("不正な操作が行われました。"); + } + + } catch (BusinessException e) { + redirectAttributes.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/admin/rental/detail/" + form.getIdRequest(); + } + + return "redirect:/applicationList"; + } } From 0b89e4538649a2d12288162964656f3ae352446b Mon Sep 17 00:00:00 2001 From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp> Date: Tue, 20 Oct 2026 14:24:20 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/AdminLoanController.java | 64 ++++++++++++++++--- 1 file changed, 55 insertions(+), 9 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java index d97a265..603826a 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java @@ -5,23 +5,25 @@ import java.util.logging.Logger; import jakarta.servlet.http.HttpSession; 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 org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.example.demo.common.BusinessException; +import com.example.demo.common.Const; import com.example.demo.common.LoginUser; +import com.example.demo.dto.BorrowView; import com.example.demo.form.RentalForm; import com.example.demo.service.LoanService; @Controller public class AdminLoanController { - // ログ出力用インスタンス private final static Logger LOGGER = Logger.getLogger(AdminLoanController.class.getName()); - - // エラーメッセージ用の定数フィールド private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; private final LoanService loanService; @@ -31,28 +33,68 @@ public class AdminLoanController { } + @GetMapping("/admin/applications/{id}") + public String showApprovalConfirm(@PathVariable("id") Integer idRequest, HttpSession session, Model model) { + + // セッションからログイン情報のチェック + LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER"); + if (loginUser == null) { + return "redirect:/login"; + } + + // エラーによる差し戻し(Form)がModel内に存在する場合は、二重に作成しない + if (!model.containsAttribute("approvalConfilm")) { + try { + // LoanServiceから現在の承認待ち状態のデータを取得 + BorrowView view = loanService.getView(idRequest, Const.STATUS_WAITING); + + // 取得したデータを画面用の RentalForm（approvalConfilm）に詰め替える + RentalForm form = new RentalForm(); + form.setIdRequest(view.getIdRequest()); + form.setNmEmployee(view.getNmApplicant()); + form.setDateRequest(view.getDateRequest() != null ? view.getDateRequest().toString() : ""); + form.setIsbn(view.getIsbn()); + form.setNmBook(view.getNmBook()); + form.setPublisher(view.getPublisher()); + form.setNote(view.getNote() != null ? view.getNote() : ""); + form.setDateBorrow(view.getDateBorrow() != null ? view.getDateBorrow().toString() : ""); + form.setDateScheduledReturn( + view.getDateScheduledReturn() != null ? view.getDateScheduledReturn().toString() : ""); + + // 画面オブジェクトをモデルに設定 + model.addAttribute("approvalConfilm", form); + + } catch (BusinessException e) { + // 対象データがない、または既に別の人に処理されていた場合は、一覧画面にメッセージ付きで戻す + model.addAttribute("errorMessage", e.getMessage()); + return "redirect:/applicationList"; + } + } + + // 書籍貸出承認確認画面（HTMLファイル名）を呼び出す + return "admin/approvalConfirm"; + } + @PostMapping("/submit") public String executeApproval( @ModelAttribute("approvalConfilm") RentalForm form, - @RequestParam("action") - String action, + @RequestParam("action") String action, HttpSession session, RedirectAttributes redirectAttributes) { - // セッションからログイン中の管理者情報を取得 + // セッションからログイン中の管理者情報を取得 LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER"); if (loginUser == null) { return "redirect:/login"; } try { + // アクション（ボタンのvalue属性）に応じたサービス処理の実行 if ("approve".equals(action)) { - // 確定したLoanServiceのインスタンスメソッド呼び出し loanService.approve(form.getIdRequest(), loginUser); redirectAttributes.addFlashAttribute("successMessage", "申請を承認しました。"); } else if ("reject".equals(action)) { - // 確定したLoanServiceのインスタンスメソッドを呼び出し、IDにはidRequestを渡す loanService.reject(form.getIdRequest(), loginUser); redirectAttributes.addFlashAttribute("successMessage", "申請を却下しました。"); @@ -62,7 +104,11 @@ public class AdminLoanController { } catch (BusinessException e) { redirectAttributes.addFlashAttribute("errorMessage", e.getMessage()); - return "redirect:/admin/rental/detail/" + form.getIdRequest(); + + // エラーが起きた入力データをそのまま保持して詳細（確認）画面に戻す + redirectAttributes.addFlashAttribute("approvalConfilm", form); + + return "redirect:/admin/applications/" + form.getIdRequest(); } return "redirect:/applicationList"; From b6ada277a20fa178f0fe2dfa05dc61ab561e7a2b Mon Sep 17 00:00:00 2001 From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp> Date: Tue, 20 Oct 2026 14:59:26 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=E9=80=94=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/AdminLoanController.java | 237 ++++++++++-------- 1 file changed, 129 insertions(+), 108 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java index 603826a..b101600 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java @@ -1,116 +1,137 @@ -package com.example.demo.controller; +//package com.example.demo.controller; +// +//import java.util.logging.Logger; +// +//import jakarta.servlet.http.HttpSession; +// +//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 org.springframework.web.bind.annotation.PathVariable; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.servlet.mvc.support.RedirectAttributes; +// +//import com.example.demo.common.BusinessException; +//import com.example.demo.common.Const; +//import com.example.demo.common.LoginUser; +//import com.example.demo.dto.BorrowView; +//import com.example.demo.form.RentalForm; +//import com.example.demo.service.LoanService; +// +//@Controller +//public class AdminLoanController { +// +// private final static Logger LOGGER = Logger.getLogger(AdminLoanController.class.getName()); +// private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; +// +// private final LoanService loanService; +// +// public AdminLoanController(LoanService loanService) { +// this.loanService = loanService; +// } +// +// +// @GetMapping("/admin/applications/{id}") +// public String showApprovalConfirm(@PathVariable("id") Integer idRequest, HttpSession session, Model model) { +// +// // セッションからログイン情報のチェック +// LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER"); +// if (loginUser == null) { +// return "redirect:/login"; +// } +// +// // エラーによる差し戻し(Form)がModel内に存在する場合は、二重に作成しない +// if (!model.containsAttribute("approvalConfilm")) { +// try { +// // LoanServiceから現在の承認待ち状態のデータを取得 +// BorrowView view = loanService.getView(idRequest, Const.STATUS_WAITING); +// +// // 取得したデータを画面用の RentalForm（approvalConfilm）に詰め替える +// RentalForm form = new RentalForm(); +// form.setIdRequest(view.getIdRequest()); +// form.setNmEmployee(view.getNmApplicant()); +// form.setDateRequest(view.getDateRequest() != null ? view.getDateRequest().toString() : ""); +// form.setIsbn(view.getIsbn()); +// form.setNmBook(view.getNmBook()); +// form.setPublisher(view.getPublisher()); +// form.setNote(view.getNote() != null ? view.getNote() : ""); +// form.setDateBorrow(view.getDateBorrow() != null ? view.getDateBorrow().toString() : ""); +// form.setDateScheduledReturn( +// view.getDateScheduledReturn() != null ? view.getDateScheduledReturn().toString() : ""); +// +// // 画面オブジェクトをモデルに設定 +// model.addAttribute("approvalConfilm", form); +// +// } catch (BusinessException e) { +// // 対象データがない、または既に別の人に処理されていた場合は、一覧画面にメッセージ付きで戻す +// model.addAttribute("errorMessage", e.getMessage()); +// return "redirect:/applicationList"; +// } +// } +// +// // 書籍貸出承認確認画面（HTMLファイル名）を呼び出す +// return "admin/approvalConfirm"; +// } +// +// @PostMapping("/submit") +// public String executeApproval( +// @ModelAttribute("approvalConfilm") RentalForm form, +// @RequestParam("action") String action, +// HttpSession session, +// RedirectAttributes redirectAttributes) { +// +// // セッションからログイン中の管理者情報を取得 +// LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER"); +// if (loginUser == null) { +// return "redirect:/login"; +// } +// +// try { +// // アクション（ボタンのvalue属性）に応じたサービス処理の実行 +// if ("approve".equals(action)) { +// loanService.approve(form.getIdRequest(), loginUser); +// redirectAttributes.addFlashAttribute("successMessage", "申請を承認しました。"); +// +// } else if ("reject".equals(action)) { +// loanService.reject(form.getIdRequest(), loginUser); +// redirectAttributes.addFlashAttribute("successMessage", "申請を却下しました。"); +// +// } else { +// throw new BusinessException("不正な操作が行われました。"); +// } +// +// } catch (BusinessException e) { +// redirectAttributes.addFlashAttribute("errorMessage", e.getMessage()); +// +// // エラーが起きた入力データをそのまま保持して詳細（確認）画面に戻す +// redirectAttributes.addFlashAttribute("approvalConfilm", form); +// +// return "redirect:/admin/applications/" + form.getIdRequest(); +// } +// +// return "redirect:/applicationList"; +// } +//} -import java.util.logging.Logger; - -import jakarta.servlet.http.HttpSession; - -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 org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.example.demo.common.BusinessException; import com.example.demo.common.Const; -import com.example.demo.common.LoginUser; -import com.example.demo.dto.BorrowView; -import com.example.demo.form.RentalForm; import com.example.demo.service.LoanService; -@Controller public class AdminLoanController { - - private final static Logger LOGGER = Logger.getLogger(AdminLoanController.class.getName()); - private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; - - private final LoanService loanService; - - public AdminLoanController(LoanService loanService) { - this.loanService = loanService; - } - - - @GetMapping("/admin/applications/{id}") - public String showApprovalConfirm(@PathVariable("id") Integer idRequest, HttpSession session, Model model) { - - // セッションからログイン情報のチェック - LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER"); - if (loginUser == null) { - return "redirect:/login"; - } - - // エラーによる差し戻し(Form)がModel内に存在する場合は、二重に作成しない - if (!model.containsAttribute("approvalConfilm")) { - try { - // LoanServiceから現在の承認待ち状態のデータを取得 - BorrowView view = loanService.getView(idRequest, Const.STATUS_WAITING); - - // 取得したデータを画面用の RentalForm（approvalConfilm）に詰め替える - RentalForm form = new RentalForm(); - form.setIdRequest(view.getIdRequest()); - form.setNmEmployee(view.getNmApplicant()); - form.setDateRequest(view.getDateRequest() != null ? view.getDateRequest().toString() : ""); - form.setIsbn(view.getIsbn()); - form.setNmBook(view.getNmBook()); - form.setPublisher(view.getPublisher()); - form.setNote(view.getNote() != null ? view.getNote() : ""); - form.setDateBorrow(view.getDateBorrow() != null ? view.getDateBorrow().toString() : ""); - form.setDateScheduledReturn( - view.getDateScheduledReturn() != null ? view.getDateScheduledReturn().toString() : ""); - - // 画面オブジェクトをモデルに設定 - model.addAttribute("approvalConfilm", form); - - } catch (BusinessException e) { - // 対象データがない、または既に別の人に処理されていた場合は、一覧画面にメッセージ付きで戻す - model.addAttribute("errorMessage", e.getMessage()); - return "redirect:/applicationList"; - } - } - - // 書籍貸出承認確認画面（HTMLファイル名）を呼び出す - return "admin/approvalConfirm"; - } - - @PostMapping("/submit") - public String executeApproval( - @ModelAttribute("approvalConfilm") RentalForm form, - @RequestParam("action") String action, - HttpSession session, - RedirectAttributes redirectAttributes) { - - // セッションからログイン中の管理者情報を取得 - LoginUser loginUser = (LoginUser) session.getAttribute("LOGIN_USER"); - if (loginUser == null) { - return "redirect:/login"; - } - - try { - // アクション（ボタンのvalue属性）に応じたサービス処理の実行 - if ("approve".equals(action)) { - loanService.approve(form.getIdRequest(), loginUser); - redirectAttributes.addFlashAttribute("successMessage", "申請を承認しました。"); - - } else if ("reject".equals(action)) { - loanService.reject(form.getIdRequest(), loginUser); - redirectAttributes.addFlashAttribute("successMessage", "申請を却下しました。"); - - } else { - throw new BusinessException("不正な操作が行われました。"); - } - - } catch (BusinessException e) { - redirectAttributes.addFlashAttribute("errorMessage", e.getMessage()); - - // エラーが起きた入力データをそのまま保持して詳細（確認）画面に戻す - redirectAttributes.addFlashAttribute("approvalConfilm", form); - - return "redirect:/admin/applications/" + form.getIdRequest(); - } - - return "redirect:/applicationList"; - } -} + private final LoanService loanService; + + public AdminLoanController(LoanService loanService) { + this.loanService = loanService; + } + + // ===== LOAN-02 書籍申請一覧（承認待） ===== + @GetMapping("/admin/applications") + public String applications(Model model) { + model.addAttribute("list", loanService.listByStatus(Const.STATUS_WAITING)); + return "applicationList"; + } +} \ No newline at end of file From 3d5653418ab166cc7e9d249633ef8c93218b8013 Mon Sep 17 00:00:00 2001 From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp> Date: Tue, 20 Oct 2026 16:04:18 +0900 Subject: [PATCH 6/9] =?UTF-8?q?05=E7=95=AA=E5=AE=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/AdminLoanController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java index d453b82..1ff68d7 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java @@ -36,7 +36,7 @@ public class AdminLoanController { public String approvalConfirm(@PathVariable Integer id, Model model, RedirectAttributes ra) { try { model.addAttribute("r", loanService.getView(id, Const.STATUS_WAITING)); - return "approvalConfirm"; + return "approvalConfilm"; } catch (BusinessException e) { ra.addFlashAttribute("errorMessage", e.getMessage()); return "redirect:/admin/applications"; @@ -49,7 +49,7 @@ public class AdminLoanController { try { loanService.approve(id, admin); ra.addFlashAttribute("message", "書籍貸出申請を承認しました。"); - return "redirect:/admin/approval/complete"; + return "approvalComplete"; } catch (BusinessException e) { ra.addFlashAttribute("errorMessage", e.getMessage()); return "redirect:/admin/applications"; @@ -62,7 +62,7 @@ public class AdminLoanController { try { loanService.reject(id, admin); ra.addFlashAttribute("message", "書籍貸出申請を却下しました。"); - return "redirect:/admin/approval/complete"; + return "approvalRejected"; } catch (BusinessException e) { ra.addFlashAttribute("errorMessage", e.getMessage()); return "redirect:/admin/applications"; From e5f3a3774a71402a6d9b09c4515b96037e121c74 Mon Sep 17 00:00:00 2001 From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp> Date: Tue, 20 Oct 2026 16:38:00 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=E3=81=8A=E9=A1=98=E3=81=84=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/approvalComplete.html | 31 +++++++ .../resources/templates/approvalConfilm.html | 84 +++++++++++++++++++ .../resources/templates/approvalRejected.html | 31 +++++++ 3 files changed, 146 insertions(+) create mode 100644 book-rent/src/main/resources/templates/approvalComplete.html create mode 100644 book-rent/src/main/resources/templates/approvalConfilm.html create mode 100644 book-rent/src/main/resources/templates/approvalRejected.html diff --git a/book-rent/src/main/resources/templates/approvalComplete.html b/book-rent/src/main/resources/templates/approvalComplete.html new file mode 100644 index 0000000..bedbc40 --- /dev/null +++ b/book-rent/src/main/resources/templates/approvalComplete.html @@ -0,0 +1,31 @@ + + + + + + 書籍貸出申請 + + + +

+ 　　　 +
+ ログイン者名： + +
+

+

書籍貸出申請を承認しました。

+ + +
+ +
+ +
+
+ 承認待ち一覧に戻る + メニューに戻る + + + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/approvalConfilm.html b/book-rent/src/main/resources/templates/approvalConfilm.html new file mode 100644 index 0000000..1202633 --- /dev/null +++ b/book-rent/src/main/resources/templates/approvalConfilm.html @@ -0,0 +1,84 @@ + + + + + + 書籍貸出承認確認 + + + + +

+ 書籍貸出承認確認　　　 +
+ ログイン者名： + +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
申請ID
申請者名
申請日
ISBN
書籍名
出版社
特記事項
貸出日
返却予定日
+ +
+ +
+ +
+ + +
+ +
+
+ +
+ 承認待ち一覧へ戻る + + + + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/approvalRejected.html b/book-rent/src/main/resources/templates/approvalRejected.html new file mode 100644 index 0000000..0555880 --- /dev/null +++ b/book-rent/src/main/resources/templates/approvalRejected.html @@ -0,0 +1,31 @@ + + + + + + 書籍貸出申請 + + + +

+ 　　　 +
+ ログイン者名： + +
+

+

書籍貸出申請を却下しました。

+ + +
+ +
+ +
+
+ 承認待ち一覧に戻る + メニューに戻る + + + + \ No newline at end of file From b298aa01c34e6bb63f434ecfdb47caf4d684f7d8 Mon Sep 17 00:00:00 2001 From: "h.hein" <26-h-kyaw-sakuracommunication@it-college.co.jp> Date: Wed, 21 Oct 2026 09:24:53 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=E6=9B=B8=E3=81=8D=E5=87=BA=E3=81=97?= =?UTF-8?q?=E4=B8=AD=E4=B8=80=E8=A6=A7=E3=81=AB=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/lendingList.html | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 book-rent/src/main/resources/templates/lendingList.html diff --git a/book-rent/src/main/resources/templates/lendingList.html b/book-rent/src/main/resources/templates/lendingList.html new file mode 100644 index 0000000..d4e58c1 --- /dev/null +++ b/book-rent/src/main/resources/templates/lendingList.html @@ -0,0 +1,34 @@ + + + + + 貸出中書籍一覧 + + + +
+
+

貸出中書籍一覧

+
+
+
+

貸出中の書籍はありません。

+ + + + + + + + + + + + + +
申請ID申請者名書籍名申請日貸出日返却予定日操作
返却
+
+

メニューに戻る

+
+ + From 8a0b53522b781540803e1a01f3af4a15586a85f0 Mon Sep 17 00:00:00 2001 From: "h.hein" <26-h-kyaw-sakuracommunication@it-college.co.jp> Date: Wed, 21 Oct 2026 10:02:14 +0900 Subject: [PATCH 9/9] Employee Controller --- .../demo/controller/EmployeeController.java | 175 +++++++++++++++++- 1 file changed, 174 insertions(+), 1 deletion(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/EmployeeController.java b/book-rent/src/main/java/com/example/demo/controller/EmployeeController.java index 71bd363..b358d4e 100644 --- a/book-rent/src/main/java/com/example/demo/controller/EmployeeController.java +++ b/book-rent/src/main/java/com/example/demo/controller/EmployeeController.java @@ -1,5 +1,178 @@ package com.example.demo.controller; -public class EmployeeController { +import java.util.List; +import java.util.Optional; +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 org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.SessionAttribute; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.example.demo.common.BusinessException; +import com.example.demo.common.Const; +import com.example.demo.common.LoginUser; +import com.example.demo.entity.Employee; +import com.example.demo.form.EmployeeForm; +import com.example.demo.service.EmployeeService; + +/** + * EMP-01 社員登録（管理者のみ：/admin/** で拒否） + * EMP-02 社員編集（管理者：メールアドレスで検索して全項目 ／ 一般：自分のパスワードのみ） + */ +@Controller +public class EmployeeController { + private static final String NEW = "/admin/employees/new"; + private static final String EDIT = "/employees/edit"; + + private final EmployeeService employeeService; + + public EmployeeController(EmployeeService employeeService) { + this.employeeService = employeeService; + } + + // ===== EMP-01 社員登録 ===== + @GetMapping(NEW) + public String registInput(Model model) { + return registView(new EmployeeForm(), List.of(), model); + } + + @PostMapping(NEW + "/input") + public String registBack(@ModelAttribute("form") EmployeeForm form, Model model) { + return registView(form, List.of(), model); + } + + @PostMapping(NEW + "/confirm") + public String registConfirm(@ModelAttribute("form") EmployeeForm form, Model model) { + List errors = employeeService.validateRegist(form); + if (!errors.isEmpty()) + return registView(form, errors, model); + return "employeeRegistConfirm"; + } + + @PostMapping(NEW + "/execute") + public String registExecute(@ModelAttribute("form") EmployeeForm form, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, + Model model, RedirectAttributes ra) { + try { + employeeService.register(form, admin); + } catch (BusinessException e) { + return registView(form, List.of(e.getMessage()), model); + } + ra.addFlashAttribute("message", "社員登録が完了しました。"); + return "redirect:" + NEW + "/complete"; + } + + @GetMapping(NEW + "/complete") + public String registComplete(Model model) { + return complete(model); + } + + private String registView(EmployeeForm form, List errors, Model model) { + model.addAttribute("form", form); + model.addAttribute("errors", errors); + return "employeeRegistInput"; + } + + // ===== EMP-02 社員編集 ===== + + /** メニュー「社員編集」：管理者は検索画面へ、一般ユーザーは検索せず自分の編集画面へ */ + @GetMapping("/employees/search") + public String search(@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user) { + return user.isAdmin() ? "employeeSearch" : "redirect:" + EDIT; + } + + @PostMapping("/employees/search") + public String doSearch(@RequestParam(defaultValue = "") String mailAddress, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) { + if (!user.isAdmin()) + return "redirect:/menu"; + Optional e = employeeService.findByMail(mailAddress); + if (e.isEmpty()) { + model.addAttribute("mailAddress", mailAddress); + model.addAttribute("errorMessage", "該当する社員が見つかりません。"); + return "employeeSearch"; + } + return "redirect:" + EDIT + "?idEmployee=" + e.get().getIdEmployee(); + } + + @GetMapping(EDIT) + public String editInput(@RequestParam(required = false) Integer idEmployee, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + Model model, RedirectAttributes ra) { + // 一般ユーザーは常に自分自身（リクエストの社員IDは使わない） + Integer target = user.isAdmin() ? idEmployee : user.getIdEmployee(); + if (target == null) + return "redirect:/employees/search"; + try { + return editView(employeeService.toForm(employeeService.find(target)), List.of(), user, model); + } catch (BusinessException e) { + ra.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/menu"; + } + } + + @PostMapping(EDIT + "/input") + public String editBack(@ModelAttribute("form") EmployeeForm form, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) { + fixTarget(form, user); + return editView(form, List.of(), user, model); + } + + @PostMapping(EDIT + "/confirm") + public String editConfirm(@ModelAttribute("form") EmployeeForm form, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, Model model) { + fixTarget(form, user); + List errors = user.isAdmin() + ? employeeService.validateUpdateByAdmin(form) + : employeeService.validateUpdateBySelf(form); + if (!errors.isEmpty()) + return editView(form, errors, user, model); + model.addAttribute("admin", user.isAdmin()); + return "employeeUpdateConfirm"; + } + + @PostMapping(EDIT + "/execute") + public String editExecute(@ModelAttribute("form") EmployeeForm form, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + Model model, RedirectAttributes ra) { + fixTarget(form, user); + try { + if (user.isAdmin()) + employeeService.updateByAdmin(form, user); + else + employeeService.updateBySelf(form, user); + } catch (BusinessException e) { + return editView(form, List.of(e.getMessage()), user, model); + } + ra.addFlashAttribute("message", "社員編集が完了しました。"); + return "redirect:" + EDIT + "/complete"; + } + + @GetMapping(EDIT + "/complete") + public String editComplete(Model model) { + return complete(model); + } + + /** 一般ユーザーの対象は常にセッションの社員ID（URL/フォーム値の書き換えを無視） */ + private static void fixTarget(EmployeeForm form, LoginUser user) { + if (!user.isAdmin()) + form.setIdEmployee(user.getIdEmployee()); + } + + private String editView(EmployeeForm form, List errors, LoginUser user, Model model) { + model.addAttribute("form", form); + model.addAttribute("errors", errors); + model.addAttribute("admin", user.isAdmin()); + return "employeeUpdateInput"; + } + + private String complete(Model model) { + model.addAttribute("backUrl", "/menu"); + model.addAttribute("backLabel", "メニューに戻る"); + return "complete"; + } }