Merge branch 'h-seya'

src/main/java/com/example/demo/controller/BookLendController.java

@@ -1,12 +1,15 @@
 package com.example.demo.controller;
 
+import java.time.LocalDate;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
-import com.example.demo.repository.EmployeeRepository;
+import com.example.demo.service.BookLendService;
 import com.example.demo.service.BookServiceImpl;
 
 import lombok.RequiredArgsConstructor;
@@ -19,7 +22,7 @@ public class BookLendController {
 	private final BookServiceImpl bookServiceImpl;
 	
 	@Autowired
-	private EmployeeRepository employeeRepository;
+	private final BookLendService bookLendService;
 
 	@PostMapping("/bookLend")
 	public String bookLend(Model model) {
@@ -28,11 +31,22 @@ public class BookLendController {
 
 	@PostMapping("/bookLend/{id}")
 	public String bookLend(@PathVariable int id, Model model) {
-		System.out.println(id);
 		model.addAttribute("book", bookServiceImpl.findById(id));
 		return "bookLend";
 	}
 
+	// 貸出処理
+	@PostMapping("/bookLend/confirm")
+	public String bookLendConfirm(
+			@RequestParam(name = "bookId") int bookId,
+			@RequestParam(name = "bookManageId") String bookManageId,
+			@RequestParam(name = "employeeId") int employeeId,
+			@RequestParam(name = "returnDate") LocalDate bookReturnDate,
+			Model model) {
 
+		bookLendService.save(bookId,bookManageId,employeeId,bookReturnDate);
+		
+		return "redirect:/book";
+	}
 
 }

src/main/java/com/example/demo/entity/BookLend.java

@@ -1,6 +1,6 @@
 package com.example.demo.entity;
 
-import java.sql.Date;
+import java.time.LocalDate;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -35,11 +35,11 @@ public class BookLend {
 
 	// 貸出日
 	@Column(name = "book_lend_date", nullable = false)
-	private Date bookLendDate;
+	private LocalDate bookLendDate;
 
 	// 返却日
 	@Column(name = "book_return_date", nullable = false)
-	private Date bookReturnDate;
+	private LocalDate bookReturnDate;
 
 	// 貸出状態
 	@Column(name = "book_status", nullable = false)

src/main/java/com/example/demo/form/BookLendForm.java

@@ -1,7 +1,27 @@
 package com.example.demo.form;
 
+import java.sql.Date;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+import com.example.demo.entity.Book;
+import com.example.demo.entity.Employee;
+
 // 図書の貸出処理に使用予定
 
 public class BookLendForm {
 	
+	private Book book;
+
+	@NotBlank(message = "社員IDの入力は必須です")
+	private Employee employeeBooklend;
+	
+	private Date bookLendDate;
+
+	@NotNull(message = "返却日の入力は必須です")
+	private Date bookReturnDate;
+	
+	private Integer bookStatus;
+
 }

src/main/java/com/example/demo/service/BookLendService.java

@@ -1,13 +1,18 @@
 package com.example.demo.service;
 
+import java.time.LocalDate;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.example.demo.entity.Book;
 import com.example.demo.entity.BookLend;
+import com.example.demo.entity.Employee;
 import com.example.demo.repository.BookLendRepository;
+import com.example.demo.repository.BookRepository;
+import com.example.demo.repository.EmployeeRepository;
 
 @Service
 public class BookLendService {
@@ -15,6 +20,12 @@ public class BookLendService {
 	@Autowired
 	private BookLendRepository bookLendRepository;
 	
+	@Autowired
+	private BookRepository bookRepository;
+	
+	@Autowired
+	private EmployeeRepository employeeRepository;
+
 	public List<BookLend> findAll() {
 		return bookLendRepository.findAll();
 		
@@ -31,4 +42,27 @@ public class BookLendService {
 		bookLendRepository.save(booklend);
 	}
 
+	public void save(int bookId, String bookManageId, int employeeId,
+			LocalDate bookReturnDate) {
+
+		BookLend bookLend = new BookLend();
+		
+		
+		Book book = bookRepository.findById(bookId)
+		        .orElseThrow(
+		                () -> new IllegalArgumentException("対象の本が見つかりません"));
+		
+		Employee employee = employeeRepository.findById(employeeId)
+		        .orElseThrow(
+		                () -> new IllegalArgumentException("対象のが見つかりません"));
+
+		bookLend.setBook(book);
+		bookLend.setEmployeeBooklend(employee);
+		bookLend.setBookLendDate(LocalDate.now());
+		bookLend.setBookReturnDate(bookReturnDate);
+		bookLend.setBookStatus(1);
+
+		bookLendRepository.save(bookLend);
+	}
+
 }

src/main/resources/templates/bookLend.html

@@ -20,7 +20,8 @@
 		図書情報
 	</h2>
 
-	<form id="lendForm" action="bookLendConfirm" method="post">
+	<form th:action="@{/bookLend/confirm}" method="POST"
+			id="lendForm">
 
 		<div class="card-body">
 			<table class="info-table">
@@ -34,8 +35,8 @@
 				</thead>
 
 				<tbody>
-					<tr th:each="book : ${book}">
+					<tr>
-						<td th:hidden="*{book.bookId}"></td>
+<!--						<td th:hidden="*{book.bookId}"></td>-->
 						<td th:text="*{book.bookManageId}"></td>
 						<td th:text="*{book.title}"></td>
 						<td th:text="*{book.author}"></td>
@@ -59,7 +60,7 @@
 					社員ID
 				</label>
 
-				<input type="text" id="employeeId" placeholder="社員IDを入力してください">
+				<input type="text" name="employeeId" placeholder="社員IDを入力してください">
 
 				</select>
 			</div>
@@ -112,8 +113,10 @@
 			貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。
 		</p>
 		
+		<input type="hidden" name="bookManageId" th:value="${book.bookManageId}">
+		<input type="hidden" name="bookId" th:value="${book.bookId}">
+
 		<input type="submit" name="submit" onclick="submitLend()" value="貸出する">
-<!--		<button type="button" class="btn btn-primary" onclick="submitLend()">-->
 
 		<input type="reset" name="reset" value="入力内容をクリア">