diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java b/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java index 4dd8b4d..e21502e 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java +++ b/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 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 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 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"; + } } diff --git a/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java b/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java index 144d1fd..6f86154 100644 --- a/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java +++ b/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; + } } diff --git a/book-rent/src/main/java/com/example/demo/controller/LoanContorller.java b/book-rent/src/main/java/com/example/demo/controller/LoanContorller.java deleted file mode 100644 index 2e5d21b..0000000 --- a/book-rent/src/main/java/com/example/demo/controller/LoanContorller.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.demo.controller; - -public class LoanContorller { - -} diff --git a/book-rent/src/main/java/com/example/demo/controller/LoanController.java b/book-rent/src/main/java/com/example/demo/controller/LoanController.java new file mode 100644 index 0000000..192665a --- /dev/null +++ b/book-rent/src/main/java/com/example/demo/controller/LoanController.java @@ -0,0 +1,113 @@ +package com.example.demo.controller; + + + +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +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.service.LoanService; + +/** LOAN-01：書籍貸出申請（一般ユーザーのみ）。入力 → 確認 → 完了 */ +@Controller +@RequestMapping("/loan") +public class LoanController { + private final LoanService loanService; + + public LoanController(LoanService loanService) { + this.loanService = loanService; + } + + /** 書籍一覧 →（申請ボタン）→ 申請入力 */ + @GetMapping("/apply") + public String input(@RequestParam Integer idBook, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + Model model, RedirectAttributes ra) { + return showInput(idBook, "", "", List.of(), user, model, ra); + } + + /** 確認画面 →（申請情報入力に戻る）→ 申請入力（入力値を保持） */ + @PostMapping("/apply/input") + public String back(@RequestParam Integer idBook, + @RequestParam(defaultValue = "") String dateBorrow, + @RequestParam(defaultValue = "") String dateScheduledReturn, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + Model model, RedirectAttributes ra) { + return showInput(idBook, dateBorrow, dateScheduledReturn, List.of(), user, model, ra); + } + + /** 申請入力 →（申請確認）→ 確認 */ + @PostMapping("/apply/confirm") + public String confirm(@RequestParam Integer idBook, + @RequestParam(defaultValue = "") String dateBorrow, + @RequestParam(defaultValue = "") String dateScheduledReturn, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + Model model, RedirectAttributes ra) { + List errors = loanService.validateDates(dateBorrow, dateScheduledReturn); + if (!errors.isEmpty()) { + return showInput(idBook, dateBorrow, dateScheduledReturn, errors, user, model, ra); + } + if (user.isAdmin()) return "redirect:/menu"; + try { + model.addAttribute("book", loanService.getLendableBook(idBook)); + } catch (BusinessException e) { + ra.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/books"; + } + model.addAttribute("idBook", idBook); + model.addAttribute("dateBorrow", dateBorrow); + model.addAttribute("dateScheduledReturn", dateScheduledReturn); + return "loanApplyConfirm"; + } + + /** 確認 →（申請）→ 完了。二重送信防止のため登録後はリダイレクトする（PRG） */ + @PostMapping("/apply/execute") + public String execute(@RequestParam Integer idBook, + @RequestParam(defaultValue = "") String dateBorrow, + @RequestParam(defaultValue = "") String dateScheduledReturn, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + RedirectAttributes ra) { + if (user.isAdmin()) return "redirect:/menu"; + try { + Integer id = loanService.apply(idBook, dateBorrow, dateScheduledReturn, user); + ra.addFlashAttribute("message", "書籍貸出申請が完了しました。（申請ID：" + id + "）"); + return "redirect:/loan/apply/complete"; + } catch (BusinessException e) { + ra.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/books"; + } + } + + @GetMapping("/apply/complete") + public String complete(Model model) { + model.addAttribute("backUrl", "/books"); + model.addAttribute("backLabel", "書籍一覧に戻る"); + return "complete"; + } + + private String showInput(Integer idBook, String dateBorrow, String dateScheduledReturn, List errors, + LoginUser user, Model model, RedirectAttributes ra) { + if (user.isAdmin()) return "redirect:/menu"; // 申請は一般ユーザーのみ + try { + model.addAttribute("book", loanService.getLendableBook(idBook)); + } catch (BusinessException e) { + ra.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/books"; + } + model.addAttribute("idBook", idBook); + model.addAttribute("dateBorrow", dateBorrow); + model.addAttribute("dateScheduledReturn", dateScheduledReturn); + model.addAttribute("errors", errors); + return "loanApplyInput"; + } +} diff --git a/book-rent/src/main/java/com/example/demo/controller/LoginController.java b/book-rent/src/main/java/com/example/demo/controller/LoginController.java index 5880c4f..81c8dfc 100644 --- a/book-rent/src/main/java/com/example/demo/controller/LoginController.java +++ b/book-rent/src/main/java/com/example/demo/controller/LoginController.java @@ -1,5 +1,73 @@ package com.example.demo.controller; -public class LoginController { +import java.util.Optional; + +import jakarta.servlet.http.HttpServletRequest; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.demo.common.Const; +import com.example.demo.common.LoginUser; +import com.example.demo.service.AuthService; + +/** AUTH-01：ログイン／ログアウト（login.html） */ +@Controller +public class LoginController { + private final AuthService authService; + + public LoginController(AuthService authService) { + this.authService = authService; + } + + @GetMapping("/") + public String root() { + return "redirect:/menu"; + } + + @GetMapping("/login") + public String loginForm(HttpSession session) { + if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) { + return "redirect:/menu"; + } + return "login"; + } + + @PostMapping("/login") + public String login(@RequestParam(defaultValue = "") String mailAddress, + @RequestParam(defaultValue = "") String password, + HttpServletRequest request, Model model) { + String mail = mailAddress.trim(); + model.addAttribute("mailAddress", mail); // 入力値を保持（パスワードは保持しない） + + if (mail.isEmpty() || password.isEmpty()) { + model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。"); + return "login"; + } + Optional user = authService.authenticate(mail, password); + if (user.isEmpty()) { + // どちらが誤りかは分からない文言にする + model.addAttribute("errorMessage", "メールアドレスまたはパスワードが正しくありません。"); + return "login"; + } + // セッション固定化攻撃対策：古いセッションを破棄して新規発行 + HttpSession old = request.getSession(false); + if (old != null) { + old.invalidate(); + } + request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get()); + return "redirect:/menu"; + } + + @PostMapping("/logout") + public String logout(HttpSession session) { + session.invalidate(); + return "redirect:/login"; + } } + diff --git a/book-rent/src/main/java/com/example/demo/controller/MenuController.java b/book-rent/src/main/java/com/example/demo/controller/MenuController.java index a84e905..d914065 100644 --- a/book-rent/src/main/java/com/example/demo/controller/MenuController.java +++ b/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) { - - // 仮のログインユーザー名 - model.addAttribute("loginUserName", "テストユーザー"); - - // menu.htmlを表示 + public String menu() { return "menu"; } } diff --git a/book-rent/src/main/java/com/example/demo/form/BookForm.java b/book-rent/src/main/java/com/example/demo/form/BookForm.java index d801e04..68f84c4 100644 --- a/book-rent/src/main/java/com/example/demo/form/BookForm.java +++ b/book-rent/src/main/java/com/example/demo/form/BookForm.java @@ -1,30 +1,71 @@ package com.example.demo.form; - /** 書籍登録・編集フォーム */ public class BookForm { - private Integer idBook; - private String isbn = ""; - private String nmBook = ""; - private String knBook = ""; - private String publisher = ""; - private String note = ""; + private Integer idBook; + private String isbn = ""; + private String nmBook = ""; + private String knBook = ""; + private String publisher = ""; + private String note = ""; - public void trim() { - isbn = t(isbn); nmBook = t(nmBook); knBook = t(knBook); publisher = t(publisher); note = t(note); - } - private static String t(String s) { return s == null ? "" : s.trim(); } + public void trim() { + isbn = t(isbn); + nmBook = t(nmBook); + knBook = t(knBook); + publisher = t(publisher); + note = t(note); + } - public Integer getIdBook() { return idBook; } - public void setIdBook(Integer v) { this.idBook = v; } - public String getIsbn() { return isbn; } - public void setIsbn(String v) { this.isbn = v; } - public String getNmBook() { return nmBook; } - public void setNmBook(String v) { this.nmBook = v; } - public String getKnBook() { return knBook; } - public void setKnBook(String v) { this.knBook = v; } - public String getPublisher() { return publisher; } - public void setPublisher(String v) { this.publisher = v; } - public String getNote() { return note; } - public void setNote(String v) { this.note = v; } + private static String t(String s) { + return s == null ? "" : s.trim(); + } + + public Integer getIdBook() { + return idBook; + } + + public void setIdBook(Integer v) { + this.idBook = v; + } + + public String getIsbn() { + return isbn; + } + + public void setIsbn(String v) { + this.isbn = v; + } + + public String getNmBook() { + return nmBook; + } + + public void setNmBook(String v) { + this.nmBook = v; + } + + public String getKnBook() { + return knBook; + } + + public void setKnBook(String v) { + this.knBook = v; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String v) { + this.publisher = v; + } + + public String getNote() { + return note; + } + + public void setNote(String v) { + this.note = v; + } } diff --git a/book-rent/src/main/resources/static/css/style.css b/book-rent/src/main/resources/static/css/style.css new file mode 100644 index 0000000..bfebba8 --- /dev/null +++ b/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 +} diff --git a/book-rent/src/main/resources/templates/applicationConfirm.html b/book-rent/src/main/resources/templates/applicationConfirm.html new file mode 100644 index 0000000..cc28384 --- /dev/null +++ b/book-rent/src/main/resources/templates/applicationConfirm.html @@ -0,0 +1,37 @@ + + + + + + 書籍貸出申請画面 + + + + + + +
+ +
+ + + + + + + + + 申請 +
蔵書ID + + 書籍名 + + 貸出日 + + 返却予定日 + +
+ 申請情報入力 + + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/applicationList.html b/book-rent/src/main/resources/templates/applicationList.html new file mode 100644 index 0000000..6cacc8b --- /dev/null +++ b/book-rent/src/main/resources/templates/applicationList.html @@ -0,0 +1,34 @@ + + + + + 書籍貸出申請一覧（承認待ち） + + + +
+
+

書籍貸出申請一覧（承認待ち）

+
+
+
+

承認待ちの申請はありません。

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

メニューに戻る

+
+ + diff --git a/book-rent/src/main/resources/templates/error.html b/book-rent/src/main/resources/templates/error.html new file mode 100644 index 0000000..70e22bf --- /dev/null +++ b/book-rent/src/main/resources/templates/error.html @@ -0,0 +1,17 @@ + + + + + エラー + + + +
+

エラー

+
+
+ メニューに戻る +
+
+ + diff --git a/book-rent/src/main/resources/templates/fragments/header.html b/book-rent/src/main/resources/templates/fragments/header.html new file mode 100644 index 0000000..dfe0ed6 --- /dev/null +++ b/book-rent/src/main/resources/templates/fragments/header.html @@ -0,0 +1,15 @@ + + + + + +
+ 書籍貸出管理システム + + 社員名 +
+ +
+ + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/frament/header.html b/book-rent/src/main/resources/templates/frament/header.html deleted file mode 100644 index 2571001..0000000 --- a/book-rent/src/main/resources/templates/frament/header.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - -Insert title here - - - - - \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/login.html b/book-rent/src/main/resources/templates/login.html index 6ee30de..dcd376a 100644 --- a/book-rent/src/main/resources/templates/login.html +++ b/book-rent/src/main/resources/templates/login.html @@ -2,93 +2,122 @@ - - - - - - - - - - - ログイン + + ログイン + - -
- -

ログイン

- -
- - -
- -
- - - - - - - - - - - - - - - - - - -
メールアドレス - -
パスワード - -
- - - -
- -
- -
- - - - +
+

書籍貸出管理システム

+
+

ログイン

+
+
+ + + + +

+
+
+
- \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/menu.html b/book-rent/src/main/resources/templates/menu.html index ff60b1b..0f9a7c2 100644 --- a/book-rent/src/main/resources/templates/menu.html +++ b/book-rent/src/main/resources/templates/menu.html @@ -1,28 +1,25 @@ - - - メニュー - + + メニュー + - -
-
-

メニュー

-
-
- 書籍一覧 - - - 書籍貸出申請一覧 - 貸出中書籍一覧 - 社員登録 - - 社員編集 -
-
+
+
+

メニュー

+
+
+ 書籍一覧 + + + 書籍貸出申請一覧 + 貸出中書籍一覧 + 社員登録 + + 社員編集 +
+
- - \ No newline at end of file + diff --git a/book-rent/src/main/resources/templates/returnConfirm.html b/book-rent/src/main/resources/templates/returnConfirm.html new file mode 100644 index 0000000..5d2fec6 --- /dev/null +++ b/book-rent/src/main/resources/templates/returnConfirm.html @@ -0,0 +1,31 @@ + + + + + 書籍返却確認 + + + +
+
+

書籍返却確認

+
+
+
+ + + + + + + + + + +
申請ID
申請者名
申請日
ISBN
書籍名
出版社
特記事項
貸出日
返却予定日
+
+
+ 貸出中書籍一覧に戻る +
+ +