コンフリクト解消

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

@@ -43,8 +43,7 @@ public class AdminBookController {
     @PostMapping(NEW + "/confirm")
     public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
         List<String> errors = bookAdminService.validate(form);
-		if (!errors.isEmpty())
+        if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model);
-			return input(form, errors, "書籍登録", NEW, model);
         return confirm("書籍登録", NEW, model);
     }
 
@@ -88,8 +87,7 @@ public class AdminBookController {
     @PostMapping(EDIT + "/confirm")
     public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
         List<String> errors = bookAdminService.validate(form);
-		if (!errors.isEmpty())
+        if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model);
-			return input(form, errors, "書籍編集", EDIT, model);
         return confirm("書籍編集", EDIT, model);
     }
 

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

@@ -1,5 +1,6 @@
 package com.example.demo.controller;
  
+ 
 import java.util.List;
 import java.util.stream.IntStream;
 
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.example.demo.entity.BookCollection;
 import com.example.demo.service.BookService;
  
+ 
 /** BOOK-01：書籍検索（bookList.html） */
 @Controller
 public class BookController {
@@ -21,6 +23,7 @@ public class BookController {
         this.bookService = bookService;
     }
  
+ 
     /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
     @GetMapping("/books")
     public String list(@RequestParam(defaultValue = "") String nmBook,
@@ -30,8 +33,10 @@ public class BookController {
                        @RequestParam(defaultValue = "10") int size,
                        Model model) {
  
-		Page<BookCollection> bookPage = bookService.searchLendable(nmBook, publisher, note, page, size);
+    	 Page<BookCollection> bookPage =
-		List<Integer> pageNumbers = IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
+    			 bookService.searchLendable(nmBook, publisher, note, page, size);
+    	 List<Integer> pageNumbers =
+    			 IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
  
         model.addAttribute("books", bookPage);
         model.addAttribute("bookPage", bookPage);
@@ -44,3 +49,42 @@ public class BookController {
     }
  
 }
+//package com.example.demo.controller;
+//
+//
+//
+//
+//	
+//
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import com.example.demo.service.BookService;
+//
+//
+///** BOOK-01：書籍検索（bookList.html） */
+//@Controller
+//public class BookController {
+//    private final BookService bookService;
+//
+//    public BookController(BookService bookService) {
+//        this.bookService = bookService;
+//    }
+//
+//    /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
+//    @GetMapping("/books")
+//    public String list(@RequestParam(defaultValue = "") String nmBook,
+//                       @RequestParam(defaultValue = "") String publisher,
+//                       @RequestParam(defaultValue = "") String note,
+//                       Model model) {
+//        model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
+//        // 検索条件を保持
+//        model.addAttribute("nmBook", nmBook);
+//        model.addAttribute("publisher", publisher);
+//        model.addAttribute("note", note);
+//        return "bookList";
+//    }
+//
+//}

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

@@ -46,8 +46,7 @@ public class EmployeeController {
 	}
 
 	@PostMapping(NEW + "/confirm")
-	public String registConfirm(@ModelAttribute("form") EmployeeForm form,
+	public String registConfirm(@ModelAttribute("form") EmployeeForm form, Model model) {
-			Model model) {
 		List<String> errors = employeeService.validateRegist(form);
 		if (!errors.isEmpty())
 			return registView(form, errors, model);

book-rent/src/main/java/com/example/demo/form/EmployeeForm.java

@@ -1,7 +1,5 @@
 package com.example.demo.form;
 
-
-
 /** 社員登録・編集フォーム */
 public class EmployeeForm {
 	private Integer idEmployee;

book-rent/src/main/java/com/example/demo/repository/BookCollectionRepository.java

@@ -40,3 +40,42 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
 	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
 			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
 }
+//package com.example.demo.repository;
+//
+//import java.time.LocalDateTime;
+//import java.util.List;
+//
+//import org.springframework.data.jpa.repository.JpaRepository;
+//import org.springframework.data.jpa.repository.Modifying;
+//import org.springframework.data.jpa.repository.Query;
+//import org.springframework.data.repository.query.Param;
+//
+//import com.example.demo.entity.BookCollection;
+//
+//public interface BookCollectionRepository extends JpaRepository<BookCollection, Integer> {
+//
+//	/**
+//	 * 貸出可の蔵書を部分一致(AND)で検索する。
+//	 * 空文字の条件は「指定なし」。LIKE の特殊文字は呼び出し側で '!' を使ってエスケープ済み。
+//	 */
+//	@Query("select b from BookCollection b "
+//			+ "where b.flgLending = :lending "
+//			+ "and (:nm = '' or b.nmBook like concat('%', :nm, '%') escape '!') "
+//			+ "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
+//			+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
+//			+ "order by b.idBook")
+//	List<BookCollection> search(@Param("lending") String lending,
+//			@Param("nm") String nm,
+//			@Param("publisher") String publisher,
+//			@Param("note") String note);
+//
+//	/**
+//	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
+//	 * 戻り値が0なら、既に他の操作で状態が変わっている（状態不整合）。
+//	 */
+//	@Modifying(clearAutomatically = true, flushAutomatically = true)
+//	@Query("update BookCollection b set b.flgLending = :to, b.idUpdate = :uid, b.dateUpdate = :now "
+//			+ "where b.idBook = :id and b.flgLending = :from")
+//	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
+//			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
+//}

book-rent/src/main/java/com/example/demo/service/BookAdminService.java

@@ -28,20 +28,12 @@ public class BookAdminService {
     public List<String> validate(BookForm f) {
         f.trim();
         List<String> e = new ArrayList<>();
-		if (f.getIsbn().isEmpty())
+        if (f.getIsbn().isEmpty()) e.add("ISBNを入力してください。");
-			e.add("ISBNを入力してください。");
+        else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。");
-		else if (f.getIsbn().length() > 13)
+        if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。");
-			e.add("ISBNは13文字以内で入力してください。");
+        else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。");
-		if (f.getNmBook().isEmpty())
+        if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。");
-			e.add("書籍名を入力してください。");
+        if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。");
-		else if (f.getNmBook().length() > 50)
-			e.add("書籍名は50文字以内で入力してください。");
-		if (f.getKnBook().length() > 100)
-			e.add("書籍名よみは100文字以内で入力してください。");
-		else if (!f.getKnBook().matches("^[\\u3040-\\u309F]+$"))
-			e.add("書籍名よみはひらがなで入力してください");
-		if (f.getPublisher().length() > 50)
-			e.add("出版社は50文字以内で入力してください。");
         return e;
     }
 
@@ -86,10 +78,10 @@ public class BookAdminService {
 
     private void check(BookForm f) {
         List<String> errors = validate(f);
-		if (!errors.isEmpty())
+        if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
-			throw new BusinessException(String.join(" ", errors));
     }
 
+
     private static void apply(BookCollection b, BookForm f) {
         b.setIsbn(f.getIsbn());
         b.setNmBook(f.getNmBook());

book-rent/src/main/java/com/example/demo/service/BookService.java

@@ -20,16 +20,48 @@ public class BookService {
  
     /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
     @Transactional(readOnly = true)
-	public Page<BookCollection> searchLendable(String nmBook, String publisher, String note, int page, int size) {
+    public Page<BookCollection> searchLendable(String nmBook, String publisher, String note,int page, int size) {
-		return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),
+        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),PageRequest.of(page, size));
-				PageRequest.of(page, size));
     }
  
     /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
     static String normalize(String s) {
-		if (s == null)
+        if (s == null) return "";
-			return "";
         return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
     }
  
+ 
 }
+//package com.example.demo.service;
+//
+//import java.util.List;
+//
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import com.example.demo.common.Const;
+//import com.example.demo.entity.BookCollection;
+//import com.example.demo.repository.BookCollectionRepository;
+//
+///** BOOK-01：書籍検索 */
+//@Service
+//public class BookService {
+//    private final BookCollectionRepository bookRepository;
+//
+//    public BookService(BookCollectionRepository bookRepository) {
+//        this.bookRepository = bookRepository;
+//    }
+//
+//    /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
+//    @Transactional(readOnly = true)
+//    public List<BookCollection> searchLendable(String nmBook, String publisher, String note) {
+//        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note));
+//    }
+//
+//    /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
+//    static String normalize(String s) {
+//        if (s == null) return "";
+//        return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
+//    }
+//}
+//

book-rent/src/main/java/com/example/demo/service/EmployeeService.java

@@ -18,6 +18,9 @@ import com.example.demo.entity.Employee;
 import com.example.demo.form.EmployeeForm;
 import com.example.demo.repository.EmployeeRepository;
 
+
+
+
 /** EMP-01：社員登録、EMP-02：社員編集 */
 @Service
 public class EmployeeService {
@@ -107,8 +110,6 @@ public class EmployeeService {
 			e.add("社員名よみを入力してください。");
 		else if (f.getKnEmployee().length() > 100)
 			e.add("社員名よみは100文字以内で入力してください。");
-		else if (!f.getKnEmployee().matches("^[\\u3040-\\u309F]+$"))
-			e.add("社員名よみはひらがなで入力してください");
 	}
 
 	private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {

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

@@ -1,119 +1,92 @@
-body {
+body
-	font-family:
+{font-family:
-		"Meiryo", "Hiragino Sans", sans-serif;
+	"Meiryo","Hiragino Sans",sans-serif;
-	margin: 0;
+	margin:0;color:#222;
-	color: #222;
+	background:#f6f7f9}
-	background: #f6f7f9
+header.top
+{display:flex;
+	justify-content:space-between;
+	align-items:center;
+	background:#176a78;color:#fff;
+	padding:10px 20px
 }
-
+header.top form
-header.top {
+{display:inline;
-	display: flex;
+	margin:0}
-	justify-content: space-between;
+header.top .user
-	align-items: center;
+{margin-right:12px
-	background: #176a78;
-	color: #fff;
-	padding: 10px 20px
 }
-
+main
-header.top form {
+{max-width:960px;
-	display: inline;
+	margin:24px auto;
-	margin: 0
+	padding:0 16px
 }
-
+h1
-header.top .user {
+{font-size:20px
-	margin-right: 12px
 }
-
+.card
-main {
+{background:#fff;
-	max-width: 960px;
+	border:1px solid #dde;
-	margin: 24px auto;
+	border-radius:6px;
-	padding: 0 16px
+	padding:20px;
+	margin-bottom:16px
 }
-
+label
-h1 {
+{display:block;
-	font-size: 20px
+	margin:10px 0 4px;
+	font-weight:bold
 }
-
+input[type=text],input[type=password],input[type=email]
-.card {
+{width:100%;
-	background: #fff;
+	max-width:360px;
-	border: 1px solid #dde;
+	padding:6px;
-	border-radius: 6px;
+	box-sizing:border-box
-	padding: 20px;
-	margin-bottom: 16px
 }
-
+button,.btn
-label {
+{display:inline-block;
-	display: block;
+	background:#176a78;
-	margin: 10px 0 4px;
+	color:#fff;border:0;
-	font-weight: bold
+	border-radius:4px;
+	padding:7px 16px;
+	cursor:pointer;
+	text-decoration:none;
+	font-size:14px
 }
-
+button.sub,.btn.sub
-input[type=text],
+{background:#6b7b80
-input[type=password],
-input[type=email] {
-	width: 100%;
-	max-width: 360px;
-	padding: 6px;
-	box-sizing: border-box
 }
-
+.error
-button,
+{background:#fdecea;color:#b3261e;
-.btn {
+	border:1px solid #f5c2be;
-	display: inline-block;
+	padding:8px 12px;
-	background: #176a78;
+	border-radius:4px;
-	color: #fff;
+	margin-bottom:12px
-	border: 0;
-	border-radius: 4px;
-	padding: 7px 16px;
-	cursor: pointer;
-	text-decoration: none;
-	font-size: 14px
 }
-
+.info
-button.sub,
+{background:#e8f4ea;
-.btn.sub {
+	color:#1b5e20;
-	background: #6b7b80
+	border:1px solid #bfdcc3;
+	padding:8px 12px;
+	border-radius:4px;
+	margin-bottom:12px
 }
-
+table
-.error {
+{border-collapse:collapse;
-	background: #fdecea;
+	width:100%;
-	color: #b3261e;
+	background:#fff
-	border: 1px solid #f5c2be;
-	padding: 8px 12px;
-	border-radius: 4px;
-	margin-bottom: 12px
 }
-
+th,td
-.info {
+{border:1px solid #dde;
-	background: #e8f4ea;
+	padding:6px 8px;
-	color: #1b5e20;
+	text-align:left;
-	border: 1px solid #bfdcc3;
+	font-size:14px
-	padding: 8px 12px;
-	border-radius: 4px;
-	margin-bottom: 12px
 }
-
+th
-table {
+{background:#eaf4f6
-	border-collapse: collapse;
-	width: 100%;
-	background: #fff
 }
-
+.menu a
-th,
+{display:block;
-td {
+	margin:8px 0
-	border: 1px solid #dde;
-	padding: 6px 8px;
-	text-align: left;
-	font-size: 14px
-}
-
-th {
-	background: #eaf4f6
-}
-
-.menu a {
-	display: block;
-	margin: 8px 0
 }
 
 /* Responsive (ဖုန်းစခရင်သေးများတွင် အောက်သို့ ဆင်းသွားစေရန်) */
@@ -123,18 +96,13 @@ th {
         align-items: center;
         text-align: center;
     }
-
     .form-content-area {
         width: 100%;
     }
-
+    input[type=text], input[type=password], input[type=email] {
-	input[type=text],
-	input[type=password],
-	input[type=email] {
         max-width: 100% !important;
     }
 }
-
 /* ページネーション */
 .page-number {
     display: inline-block;

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

@@ -1,15 +1,13 @@
 <!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>
+<div th:replace="~{fragments/header :: header}"></div>
-	<main>
+<main>
   <h1>書籍情報入力</h1>
   <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
   <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
@@ -23,17 +21,14 @@
       <input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
       <label for="knBook">書籍名よみ（100文字以内）</label>
       <input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
-<!--				<span th:errors="${form.knBook}"></span>-->
       <label for="publisher">出版社（50文字以内）</label>
       <input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
       <label for="note">特記事項</label>
       <input type="text" id="note" name="note" th:value="${form.note}">
       <p><button type="submit" th:text="${title} + '確認'">確認</button>
-					<a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a>
+         <a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p>
-				</p>
     </form>
   </div>
-	</main>
+</main>
 </body>
-
 </html>

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

@@ -78,3 +78,70 @@
 </body>
  
 </html>
+<!--<!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="card">-->
+<!--			<form th:action="@{/books}" method="get">-->
+<!--				<label for="nmBook">書籍名</label>-->
+<!--				<input type="text" id="nmBook" name="nmBook" th:value="${nmBook}">-->
+<!--				<label for="publisher">出版社</label>-->
+<!--				<input type="text" id="publisher" name="publisher" th:value="${publisher}">-->
+<!--				<label for="note">特記事項</label>-->
+<!--				<input type="text" id="note" name="note" th:value="${note}">-->
+<!--				<p><button type="submit">検索</button>-->
+<!--					<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
+<!--					<a class="btn" th:if="${session.loginUser.admin}" th:href="@{/admin/books/new}">書籍新規登録</a>-->
+<!--				</p>-->
+<!--			</form>-->
+<!--		</div>-->
+
+<!--		<div class="card">-->
+<!--			<h2>検索結果</h2>-->
+<!--			<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>-->
+<!--			<table th:unless="${#lists.isEmpty(books)}">-->
+<!--				<thead>-->
+<!--					<tr>-->
+<!--						<th>蔵書ID</th>-->
+<!--						<th>ISBN</th>-->
+<!--						<th>書籍名</th>-->
+<!--						<th>書籍名よみ</th>-->
+<!--						<th>出版社</th>-->
+<!--						<th>特記事項</th>-->
+<!--						<th>操作</th>-->
+<!--					</tr>-->
+<!--				</thead>-->
+<!--				<tbody>-->
+<!--					<tr th:each="b : ${books}">-->
+<!--						<td th:text="${b.idBook}"></td>-->
+<!--						<td th:text="${b.isbn}"></td>-->
+<!--						<td th:text="${b.nmBook}"></td>-->
+<!--						<td th:text="${b.knBook}"></td>-->
+<!--						<td th:text="${b.publisher}"></td>-->
+<!--						<td th:text="${b.note}"></td>-->
+<!--						<td>-->
+<!--							 一般：貸出申請(LOAN-01) ／ 管理者：編集(BOOK-03) -->
+<!--							<a class="btn" th:unless="${session.loginUser.admin}"-->
+<!--								th:href="@{/loan/apply(idBook=${b.idBook})}">貸出申請</a>-->
+<!--							<a class="btn" th:if="${session.loginUser.admin}"-->
+<!--								th:href="@{/admin/books/edit(idBook=${b.idBook})}">編集</a>-->
+<!--						</td>-->
+<!--					</tr>-->
+<!--				</tbody>-->
+<!--			</table>-->
+<!--		</div>-->
+<!--	</main>-->
+<!--</body>-->
+
+<!--</html>-->

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

@@ -37,7 +37,6 @@
 				<div>
 					<label for="knEmployee">社員名よみ</label>
 					<input type="text" id="knEmployee" th:field="*{knEmployee}">
-					<span th:errors="*{knEmployee}"></span>
 				</div>
 
 				<!-- メールアドレス -->