途中

book-rent/src/main/java/com/example/demo/controller/AdminBookController.java

@@ -1,5 +1,125 @@
 package com.example.demo.controller;
 
-public class AdminBookController {
+import java.util.List;
 
+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.form.BookForm;
+import com.example.demo.service.BookAdminService;
+
+/** BOOK-02 書籍登録 / BOOK-03 書籍編集（管理者のみ：/admin/** で拒否）。入力 → 確認 → 完了 */
+@Controller
+public class AdminBookController {
+    private static final String NEW = "/admin/books/new";
+    private static final String EDIT = "/admin/books/edit";
+
+    private final BookAdminService bookAdminService;
+
+    public AdminBookController(BookAdminService bookAdminService) {
+        this.bookAdminService = bookAdminService;
+    }
+
+    // ===== BOOK-02 登録 =====
+    @GetMapping(NEW)
+    public String newInput(Model model) {
+        return input(new BookForm(), List.of(), "書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/input")
+    public String newBack(@ModelAttribute("form") BookForm form, Model model) {
+        return input(form, List.of(), "書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/confirm")
+    public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
+        List<String> errors = bookAdminService.validate(form);
+        if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model);
+        return confirm("書籍登録", NEW, model);
+    }
+
+    @PostMapping(NEW + "/execute")
+    public String newExecute(@ModelAttribute("form") BookForm form,
+                             @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+                             Model model, RedirectAttributes ra) {
+        try {
+            bookAdminService.register(form, admin);
+        } catch (BusinessException e) {
+            return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
+        }
+        ra.addFlashAttribute("message", "書籍登録が完了しました。");
+        return "redirect:" + NEW + "/complete";
+    }
+
+    @GetMapping(NEW + "/complete")
+    public String newComplete(Model model) {
+        model.addAttribute("backUrl", "/books");
+        model.addAttribute("backLabel", "書籍一覧に戻る");
+        return "complete";
+    }
+
+    // ===== BOOK-03 編集 =====
+    @GetMapping(EDIT)
+    public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
+        try {
+            BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
+            return input(form, List.of(), "書籍編集", EDIT, model);
+        } catch (BusinessException e) {
+            ra.addFlashAttribute("errorMessage", e.getMessage());
+            return "redirect:/books";
+        }
+    }
+
+    @PostMapping(EDIT + "/input")
+    public String editBack(@ModelAttribute("form") BookForm form, Model model) {
+        return input(form, List.of(), "書籍編集", EDIT, model);
+    }
+
+    @PostMapping(EDIT + "/confirm")
+    public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
+        List<String> errors = bookAdminService.validate(form);
+        if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model);
+        return confirm("書籍編集", EDIT, model);
+    }
+
+    @PostMapping(EDIT + "/execute")
+    public String editExecute(@ModelAttribute("form") BookForm form,
+                              @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+                              Model model, RedirectAttributes ra) {
+        try {
+            bookAdminService.update(form, admin);
+        } catch (BusinessException e) {
+            return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
+        }
+        ra.addFlashAttribute("message", "書籍編集が完了しました。");
+        return "redirect:" + EDIT + "/complete";
+    }
+
+    @GetMapping(EDIT + "/complete")
+    public String editComplete(Model model) {
+        return newComplete(model);
+    }
+
+    private String input(BookForm form, List<String> errors, String title, String base, Model model) {
+        model.addAttribute("form", form);
+        model.addAttribute("errors", errors);
+        model.addAttribute("title", title);
+        model.addAttribute("base", base);
+        return "bookInput";
+    }
+
+    private String confirm(String title, String base, Model model) {
+        model.addAttribute("title", title);
+        model.addAttribute("base", base);
+        return "bookConfirm";
+    }
 }

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 LoanService loanService;
  
-	private final static Logger LOGGER = Logger.getLogger(AdminLoanController.class.getName());
+    public AdminLoanController(LoanService loanService) {
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+        this.loanService = loanService;
+    }
  
-	private final LoanService loanService;
+    // ===== LOAN-02 書籍申請一覧（承認待） =====
-
+    @GetMapping("/admin/applications")
-	public AdminLoanController(LoanService loanService) {
+    public String applications(Model model) {
-		this.loanService = loanService;
+        model.addAttribute("list", loanService.listByStatus(Const.STATUS_WAITING));
-	}
+        return "applicationList";
-
+    }
-	
-	@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";
-	}
 }

book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java

@@ -1,5 +1,34 @@
 package com.example.demo.controller;
 
-public class GlobalExceptionHandler {
 
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
+
+/** 予期しない例外：内部情報を画面に出さず、原因調査用にログへ出力する（NFR-04, NFR-08） */
+@ControllerAdvice
+public class GlobalExceptionHandler {
+    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    /** 存在しないURL（favicon.ico など）はエラーログを出さず404にする */
+    @ExceptionHandler(NoResourceFoundException.class)
+    public ModelAndView handleNotFound(NoResourceFoundException e) {
+        ModelAndView mav = new ModelAndView("error");
+        mav.setStatus(HttpStatus.NOT_FOUND);
+        mav.addObject("errorMessage", "ページが見つかりません。");
+        return mav;
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ModelAndView handle(Exception e) {
+        log.error("予期しないエラーが発生しました", e);
+        ModelAndView mav = new ModelAndView("error");
+        mav.addObject("errorMessage", "システムエラーが発生しました。しばらくしてからもう一度お試しください。");
+        return mav;
+    }
 }

book-rent/src/main/java/com/example/demo/controller/MenuController.java

@@ -1,19 +1,13 @@
 package com.example.demo.controller;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
+/** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */
 @Controller
 public class MenuController {
-
     @GetMapping("/menu")
-    public String showMenu(Model model) {
+    public String menu() {
-
-        // 仮のログインユーザー名
-        model.addAttribute("loginUserName", "テストユーザー");
-
-        // menu.htmlを表示
         return "menu";
     }
 }

book-rent/src/main/resources/static/css/style.css

@@ -0,0 +1,90 @@
+body
+{font-family:
+	"Meiryo","Hiragino Sans",sans-serif;
+	margin:0;color:#222;
+	background:#f6f7f9}
+header.top
+{display:flex;
+	justify-content:space-between;
+	align-items:center;
+	background:#176a78;color:#fff;
+	padding:10px 20px
+}
+header.top form
+{display:inline;
+	margin:0}
+header.top .user
+{margin-right:12px
+}
+main
+{max-width:960px;
+	margin:24px auto;
+	padding:0 16px
+}
+h1
+{font-size:20px
+}
+.card
+{background:#fff;
+	border:1px solid #dde;
+	border-radius:6px;
+	padding:20px;
+	margin-bottom:16px
+}
+label
+{display:block;
+	margin:10px 0 4px;
+	font-weight:bold
+}
+input[type=text],input[type=password],input[type=email]
+{width:100%;
+	max-width:360px;
+	padding:6px;
+	box-sizing:border-box
+}
+button,.btn
+{display:inline-block;
+	background:#176a78;
+	color:#fff;border:0;
+	border-radius:4px;
+	padding:7px 16px;
+	cursor:pointer;
+	text-decoration:none;
+	font-size:14px
+}
+button.sub,.btn.sub
+{background:#6b7b80
+}
+.error
+{background:#fdecea;color:#b3261e;
+	border:1px solid #f5c2be;
+	padding:8px 12px;
+	border-radius:4px;
+	margin-bottom:12px
+}
+.info
+{background:#e8f4ea;
+	color:#1b5e20;
+	border:1px solid #bfdcc3;
+	padding:8px 12px;
+	border-radius:4px;
+	margin-bottom:12px
+}
+table
+{border-collapse:collapse;
+	width:100%;
+	background:#fff
+}
+th,td
+{border:1px solid #dde;
+	padding:6px 8px;
+	text-align:left;
+	font-size:14px
+}
+th
+{background:#eaf4f6
+}
+.menu a
+{display:block;
+	margin:8px 0
+}

book-rent/src/main/resources/templates/fragments/header.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<body>
+	<!-- ログイン後の全画面共通ヘッダー：右上にログイン者名とログアウト（要件定義書 7.1） -->
+	<header class="top" th:fragment="header">
+		<span>書籍貸出管理システム</span>
+		<span>
+			<span class="user" th:text="${session.loginUser.nmEmployee}">社員名</span>
+			<form th:action="@{/logout}" method="post"><button type="submit" class="sub">ログアウト</button></form>
+		</span>
+	</header>
+</body>
+
+</html>

book-rent/src/main/resources/templates/frament/header.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
-
-</body>
-</html>

book-rent/src/main/resources/templates/menu.html

@@ -1,28 +1,25 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
-
 <head>
-	<meta charset="UTF-8">
+  <meta charset="UTF-8">
-	<title>メニュー</title>
+  <title>メニュー</title>
-<!--	<link rel="stylesheet" th:href="@{/css/style.css}">-->
+  <link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
-
 <body>
-	<div th:replace="~{fragments/header :: header}"></div>
+<div th:replace="~{fragments/header :: header}"></div>
-	<main>
+<main>
-		<h1>メニュー</h1>
+  <h1>メニュー</h1>
-		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
-		<div class="card menu">
+  <div class="card menu">
-			<a class="btn" th:href="@{/books}">書籍一覧</a>
+    <a class="btn" th:href="@{/books}">書籍一覧</a>
-			<!-- 管理者のみ（サーバー側でも /admin/** は管理者以外を拒否している） -->
+    <!-- 管理者のみ（サーバー側でも /admin/** は管理者以外を拒否している） -->
-			<th:block th:if="${session.loginUser.admin}">
+    <th:block th:if="${session.loginUser.admin}">
-				<a class="btn" th:href="@{/admin/applications}">書籍貸出申請一覧</a>
+      <a class="btn" th:href="@{/admin/applications}">書籍貸出申請一覧</a>
-				<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧</a>
+      <a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧</a>
-				<a class="btn" th:href="@{/admin/employees/new}">社員登録</a>
+      <a class="btn" th:href="@{/admin/employees/new}">社員登録</a>
-			</th:block>
+    </th:block>
-			<a class="btn" th:href="@{/employees/search}">社員編集</a>
+    <a class="btn" th:href="@{/employees/search}">社員編集</a>
-		</div>
+  </div>
-	</main>
+</main>
 </body>
-
 </html>

book-rent/src/main/resources/templates/returnConfirm.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+  <meta charset="UTF-8">
+  <title>書籍返却確認</title>
+  <link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+<body>
+<div th:replace="~{fragments/header :: header}"></div>
+<main>
+  <h1>書籍返却確認</h1>
+  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+  <div class="card">
+    <table>
+      <tr><th>申請ID</th><td th:text="${r.idRequest}"></td></tr>
+      <tr><th>申請者名</th><td th:text="${r.nmApplicant}"></td></tr>
+      <tr><th>申請日</th><td th:text="${r.dateRequest}"></td></tr>
+      <tr><th>ISBN</th><td th:text="${r.isbn}"></td></tr>
+      <tr><th>書籍名</th><td th:text="${r.nmBook}"></td></tr>
+      <tr><th>出版社</th><td th:text="${r.publisher}"></td></tr>
+      <tr><th>特記事項</th><td th:text="${r.note}"></td></tr>
+      <tr><th>貸出日</th><td th:text="${r.dateBorrow}"></td></tr>
+      <tr><th>返却予定日</th><td th:text="${r.dateScheduledReturn}"></td></tr>
+    </table>
+  </div>
+  <form method="post" style="display:inline" th:action="@{/admin/lendings/{id}/return(id=${r.idRequest})}"><button type="submit">返却</button></form>
+  <a class="btn sub" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
+</main>
+</body>
+</html>