Compare commits
4 Commits
ff1c43d80b
...
h-hein
| Author | SHA1 | Date | |
|---|---|---|---|
| dc5f6494cf | |||
| 67f88c89a1 | |||
| e238c6b223 | |||
| 63b7aba82a |
@@ -1,139 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>4.1.1</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>com.example</groupId>
|
||||
<artifactId>book-rent</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<packaging>war</packaging>
|
||||
<name>book-rent</name>
|
||||
<description/>
|
||||
<url/>
|
||||
<licenses>
|
||||
<license/>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer/>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection/>
|
||||
<developerConnection/>
|
||||
<tag/>
|
||||
<url/>
|
||||
</scm>
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webmvc</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-devtools</artifactId>
|
||||
<scope>runtime</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webmvc-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-compile</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>default-testCompile</id>
|
||||
<phase>test-compile</phase>
|
||||
<goals>
|
||||
<goal>testCompile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
package com.example.demo.common;
|
||||
|
||||
public class BusinessException extends RuntimeException {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class BusinessException {
|
||||
|
||||
public BusinessException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,31 +1,5 @@
|
||||
package com.example.demo.common;
|
||||
|
||||
public class Const {
|
||||
|
||||
|
||||
/** テーブル定義書のコード値（数値の直書きを避けるため一箇所に集約） */
|
||||
public final class Const {
|
||||
private Const() {}
|
||||
|
||||
public static final String SESSION_LOGIN_USER = "loginUser";
|
||||
|
||||
/** 管理者フラグ */
|
||||
public static final String ADMIN_NO = "0";
|
||||
public static final String ADMIN_YES = "1";
|
||||
|
||||
/** 初期パスワード（機能一覧 EMP-01） */
|
||||
public static final String DEFAULT_PASSWORD = "sakura2024";
|
||||
|
||||
/** 退職フラグ */
|
||||
public static final String RETIRE_NO = "0";
|
||||
public static final String RETIRE_YES = "1";
|
||||
|
||||
/** 貸出フラグ */
|
||||
public static final String LENDING_OK = "0"; // 貸出可
|
||||
public static final String LENDING_NG = "1"; // 貸出不可
|
||||
|
||||
/** 貸出ステータス */
|
||||
public static final String STATUS_RETURNED = "0"; // 返却済
|
||||
public static final String STATUS_WAITING = "1"; // 承認待
|
||||
public static final String STATUS_LENDING = "2"; // 貸出中
|
||||
public static final String STATUS_REJECTED = "9"; // 却下
|
||||
}
|
||||
|
||||
@@ -1,31 +1,5 @@
|
||||
package com.example.demo.common;
|
||||
|
||||
public class LoginUser {
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/** セッションに保持するログイン情報（社員ID・社員名・社員名よみ・メールアドレス・管理者フラグ） */
|
||||
public class LoginUser implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private final Integer idEmployee;
|
||||
private final String nmEmployee;
|
||||
private final String knEmployee;
|
||||
private final String mailAddress;
|
||||
private final String flgAdmin;
|
||||
|
||||
public LoginUser(Integer idEmployee, String nmEmployee, String knEmployee, String mailAddress, String flgAdmin) {
|
||||
this.idEmployee = idEmployee;
|
||||
this.nmEmployee = nmEmployee;
|
||||
this.knEmployee = knEmployee;
|
||||
this.mailAddress = mailAddress;
|
||||
this.flgAdmin = flgAdmin;
|
||||
}
|
||||
|
||||
public Integer getIdEmployee() { return idEmployee; }
|
||||
public String getNmEmployee() { return nmEmployee; }
|
||||
public String getKnEmployee() { return knEmployee; }
|
||||
public String getMailAddress() { return mailAddress; }
|
||||
public String getFlgAdmin() { return flgAdmin; }
|
||||
public boolean isAdmin() { return Const.ADMIN_YES.equals(flgAdmin); }
|
||||
}
|
||||
|
||||
@@ -1,37 +1,5 @@
|
||||
package com.example.demo.config;
|
||||
|
||||
public class LoginCheckInterceptor {
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
|
||||
import org.springframework.web.servlet.HandlerInterceptor;
|
||||
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
|
||||
/**
|
||||
* 全業務画面共通のアクセス制御（NFR-02）。
|
||||
* ・未ログイン → ログイン画面へ
|
||||
* ・/admin/** は管理者のみ（画面のボタン非表示だけでなくサーバー側でも確認）
|
||||
*/
|
||||
public class LoginCheckInterceptor implements HandlerInterceptor {
|
||||
@Override
|
||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
|
||||
// ブラウザの「戻る」でログアウト後の画面が見えないようにする
|
||||
response.setHeader("Cache-Control", "no-store");
|
||||
|
||||
HttpSession session = request.getSession(false);
|
||||
LoginUser user = session == null ? null : (LoginUser) session.getAttribute(Const.SESSION_LOGIN_USER);
|
||||
if (user == null) {
|
||||
response.sendRedirect(request.getContextPath() + "/login");
|
||||
return false;
|
||||
}
|
||||
String path = request.getRequestURI().substring(request.getContextPath().length());
|
||||
if (path.startsWith("/admin") && !user.isAdmin()) {
|
||||
response.sendRedirect(request.getContextPath() + "/menu");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,5 @@
|
||||
package com.example.demo.config;
|
||||
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
public class WebConfig {
|
||||
|
||||
|
||||
@Configuration
|
||||
public class WebConfig implements WebMvcConfigurer {
|
||||
@Override
|
||||
public void addInterceptors(InterceptorRegistry registry) {
|
||||
registry.addInterceptor(new LoginCheckInterceptor())
|
||||
.addPathPatterns("/**")
|
||||
.excludePathPatterns("/login", "/css/**", "/js/**", "/error");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,70 +1,5 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
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.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 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";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,72 +1,5 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
/** 貸出情報＋申請者名＋書籍情報（一覧・確認画面表示用） */
|
||||
public class BorrowView {
|
||||
private final Integer idRequest;
|
||||
private final String nmApplicant;
|
||||
private final String nmBook;
|
||||
private final LocalDate dateRequest;
|
||||
private final LocalDate dateBorrow;
|
||||
private final LocalDate dateScheduledReturn;
|
||||
private final String isbn;
|
||||
private final String publisher;
|
||||
private final String note;
|
||||
private final String status;
|
||||
|
||||
public BorrowView(Integer idRequest, String nmApplicant, String nmBook, LocalDate dateRequest,
|
||||
LocalDate dateBorrow, LocalDate dateScheduledReturn, String isbn,
|
||||
String publisher, String note, String status) {
|
||||
this.idRequest = idRequest;
|
||||
this.nmApplicant = nmApplicant;
|
||||
this.nmBook = nmBook;
|
||||
this.dateRequest = dateRequest;
|
||||
this.dateBorrow = dateBorrow;
|
||||
this.dateScheduledReturn = dateScheduledReturn;
|
||||
this.isbn = isbn;
|
||||
this.publisher = publisher;
|
||||
this.note = note;
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Integer getIdRequest() {
|
||||
return idRequest;
|
||||
}
|
||||
|
||||
public String getNmApplicant() {
|
||||
return nmApplicant;
|
||||
}
|
||||
|
||||
public String getNmBook() {
|
||||
return nmBook;
|
||||
}
|
||||
|
||||
public LocalDate getDateRequest() {
|
||||
return dateRequest;
|
||||
}
|
||||
|
||||
public LocalDate getDateBorrow() {
|
||||
return dateBorrow;
|
||||
}
|
||||
|
||||
public LocalDate getDateScheduledReturn() {
|
||||
return dateScheduledReturn;
|
||||
}
|
||||
|
||||
public String getIsbn() {
|
||||
return isbn;
|
||||
}
|
||||
|
||||
public String getPublisher() {
|
||||
return publisher;
|
||||
}
|
||||
|
||||
public String getNote() {
|
||||
return note;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,108 +1,5 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
/** 蔵書テーブル */
|
||||
@Entity
|
||||
@Table(name = "book_collection")
|
||||
public class BookCollection {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id_book")
|
||||
private Integer idBook;
|
||||
@Column(name = "isbn")
|
||||
private String isbn;
|
||||
@Column(name = "nm_book")
|
||||
private String nmBook;
|
||||
@Column(name = "kn_book")
|
||||
private String knBook;
|
||||
@Column(name = "publisher")
|
||||
private String publisher;
|
||||
@Column(name = "note", columnDefinition = "text")
|
||||
private String note;
|
||||
@Column(name = "flg_lending")
|
||||
private String flgLending;
|
||||
@Column(name = "id_update")
|
||||
private Integer idUpdate;
|
||||
@Column(name = "date_update")
|
||||
private LocalDateTime dateUpdate;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
public String getFlgLending() {
|
||||
return flgLending;
|
||||
}
|
||||
|
||||
public void setFlgLending(String v) {
|
||||
this.flgLending = v;
|
||||
}
|
||||
|
||||
public Integer getIdUpdate() {
|
||||
return idUpdate;
|
||||
}
|
||||
|
||||
public void setIdUpdate(Integer v) {
|
||||
this.idUpdate = v;
|
||||
}
|
||||
|
||||
public LocalDateTime getDateUpdate() {
|
||||
return dateUpdate;
|
||||
}
|
||||
|
||||
public void setDateUpdate(LocalDateTime v) {
|
||||
this.dateUpdate = v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,139 +1,5 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
/** 貸出テーブル（LOAN-01〜05 で使用） */
|
||||
@Entity
|
||||
@Table(name = "borrow_books")
|
||||
public class BorrowBook {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id_request")
|
||||
private Integer idRequest;
|
||||
@Column(name = "id_applicant")
|
||||
private Integer idApplicant;
|
||||
@Column(name = "id_book")
|
||||
private Integer idBook;
|
||||
@Column(name = "date_request")
|
||||
private LocalDate dateRequest;
|
||||
@Column(name = "status")
|
||||
private String status;
|
||||
@Column(name = "id_approval")
|
||||
private Integer idApproval;
|
||||
@Column(name = "date_approval")
|
||||
private LocalDate dateApproval;
|
||||
@Column(name = "date_borrow")
|
||||
private LocalDate dateBorrow;
|
||||
@Column(name = "date_scheduled_return")
|
||||
private LocalDate dateScheduledReturn;
|
||||
@Column(name = "date_return")
|
||||
private LocalDate dateReturn;
|
||||
@Column(name = "id_update")
|
||||
private Integer idUpdate;
|
||||
@Column(name = "date_update")
|
||||
private LocalDateTime dateUpdate;
|
||||
|
||||
public Integer getIdRequest() {
|
||||
return idRequest;
|
||||
}
|
||||
|
||||
public void setIdRequest(Integer v) {
|
||||
this.idRequest = v;
|
||||
}
|
||||
|
||||
public Integer getIdApplicant() {
|
||||
return idApplicant;
|
||||
}
|
||||
|
||||
public void setIdApplicant(Integer v) {
|
||||
this.idApplicant = v;
|
||||
}
|
||||
|
||||
public Integer getIdBook() {
|
||||
return idBook;
|
||||
}
|
||||
|
||||
public void setIdBook(Integer v) {
|
||||
this.idBook = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateRequest() {
|
||||
return dateRequest;
|
||||
}
|
||||
|
||||
public void setDateRequest(LocalDate v) {
|
||||
this.dateRequest = v;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String v) {
|
||||
this.status = v;
|
||||
}
|
||||
|
||||
public Integer getIdApproval() {
|
||||
return idApproval;
|
||||
}
|
||||
|
||||
public void setIdApproval(Integer v) {
|
||||
this.idApproval = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateApproval() {
|
||||
return dateApproval;
|
||||
}
|
||||
|
||||
public void setDateApproval(LocalDate v) {
|
||||
this.dateApproval = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateBorrow() {
|
||||
return dateBorrow;
|
||||
}
|
||||
|
||||
public void setDateBorrow(LocalDate v) {
|
||||
this.dateBorrow = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateScheduledReturn() {
|
||||
return dateScheduledReturn;
|
||||
}
|
||||
|
||||
public void setDateScheduledReturn(LocalDate v) {
|
||||
this.dateScheduledReturn = v;
|
||||
}
|
||||
|
||||
public LocalDate getDateReturn() {
|
||||
return dateReturn;
|
||||
}
|
||||
|
||||
public void setDateReturn(LocalDate v) {
|
||||
this.dateReturn = v;
|
||||
}
|
||||
|
||||
public Integer getIdUpdate() {
|
||||
return idUpdate;
|
||||
}
|
||||
|
||||
public void setIdUpdate(Integer v) {
|
||||
this.idUpdate = v;
|
||||
}
|
||||
|
||||
public LocalDateTime getDateUpdate() {
|
||||
return dateUpdate;
|
||||
}
|
||||
|
||||
public void setDateUpdate(LocalDateTime v) {
|
||||
this.dateUpdate = v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,108 +1,5 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
/** 社員マスタ */
|
||||
@Entity
|
||||
@Table(name = "employee")
|
||||
public class Employee {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "id_employee")
|
||||
private Integer idEmployee;
|
||||
@Column(name = "nm_employee")
|
||||
private String nmEmployee;
|
||||
@Column(name = "kn_employee")
|
||||
private String knEmployee;
|
||||
@Column(name = "mail_address")
|
||||
private String mailAddress;
|
||||
@Column(name = "password")
|
||||
private String password;
|
||||
@Column(name = "flg_admin")
|
||||
private String flgAdmin;
|
||||
@Column(name = "flg_retirement")
|
||||
private String flgRetirement;
|
||||
@Column(name = "id_update")
|
||||
private Integer idUpdate;
|
||||
@Column(name = "date_update")
|
||||
private LocalDateTime dateUpdate;
|
||||
|
||||
public Integer getIdEmployee() {
|
||||
return idEmployee;
|
||||
}
|
||||
|
||||
public void setIdEmployee(Integer v) {
|
||||
this.idEmployee = v;
|
||||
}
|
||||
|
||||
public String getNmEmployee() {
|
||||
return nmEmployee;
|
||||
}
|
||||
|
||||
public void setNmEmployee(String v) {
|
||||
this.nmEmployee = v;
|
||||
}
|
||||
|
||||
public String getKnEmployee() {
|
||||
return knEmployee;
|
||||
}
|
||||
|
||||
public void setKnEmployee(String v) {
|
||||
this.knEmployee = v;
|
||||
}
|
||||
|
||||
public String getMailAddress() {
|
||||
return mailAddress;
|
||||
}
|
||||
|
||||
public void setMailAddress(String v) {
|
||||
this.mailAddress = v;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String v) {
|
||||
this.password = v;
|
||||
}
|
||||
|
||||
public String getFlgAdmin() {
|
||||
return flgAdmin;
|
||||
}
|
||||
|
||||
public void setFlgAdmin(String v) {
|
||||
this.flgAdmin = v;
|
||||
}
|
||||
|
||||
public String getFlgRetirement() {
|
||||
return flgRetirement;
|
||||
}
|
||||
|
||||
public void setFlgRetirement(String v) {
|
||||
this.flgRetirement = v;
|
||||
}
|
||||
|
||||
public Integer getIdUpdate() {
|
||||
return idUpdate;
|
||||
}
|
||||
|
||||
public void setIdUpdate(Integer v) {
|
||||
this.idUpdate = v;
|
||||
}
|
||||
|
||||
public LocalDateTime getDateUpdate() {
|
||||
return dateUpdate;
|
||||
}
|
||||
|
||||
public void setDateUpdate(LocalDateTime v) {
|
||||
this.dateUpdate = v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,30 +1,5 @@
|
||||
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 = "";
|
||||
|
||||
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 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; }
|
||||
}
|
||||
|
||||
@@ -1,33 +1,5 @@
|
||||
package com.example.demo.form;
|
||||
/** 社員登録・編集フォーム */
|
||||
|
||||
public class EmployeeForm {
|
||||
private Integer idEmployee;
|
||||
private String nmEmployee = "";
|
||||
private String knEmployee = "";
|
||||
private String mailAddress = "";
|
||||
private String password = "";
|
||||
private String flgAdmin = "0";
|
||||
private String flgRetirement = "0";
|
||||
|
||||
public void trim() {
|
||||
nmEmployee = t(nmEmployee); knEmployee = t(knEmployee); mailAddress = t(mailAddress);
|
||||
flgAdmin = t(flgAdmin); flgRetirement = t(flgRetirement);
|
||||
if (password == null) password = "";
|
||||
}
|
||||
private static String t(String s) { return s == null ? "" : s.trim(); }
|
||||
|
||||
public Integer getIdEmployee() { return idEmployee; }
|
||||
public void setIdEmployee(Integer v) { this.idEmployee = v; }
|
||||
public String getNmEmployee() { return nmEmployee; }
|
||||
public void setNmEmployee(String v) { this.nmEmployee = v; }
|
||||
public String getKnEmployee() { return knEmployee; }
|
||||
public void setKnEmployee(String v) { this.knEmployee = v; }
|
||||
public String getMailAddress() { return mailAddress; }
|
||||
public void setMailAddress(String v) { this.mailAddress = v; }
|
||||
public String getPassword() { return password; }
|
||||
public void setPassword(String v) { this.password = v; }
|
||||
public String getFlgAdmin() { return flgAdmin; }
|
||||
public void setFlgAdmin(String v) { this.flgAdmin = v; }
|
||||
public String getFlgRetirement() { return flgRetirement; }
|
||||
public void setFlgRetirement(String v) { this.flgRetirement = v; }
|
||||
}
|
||||
|
||||
@@ -1,39 +1,5 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
public class BookCollectionRepository {
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -1,36 +1,5 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
public class BorrowBookRepository {
|
||||
|
||||
import jakarta.persistence.LockModeType;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Lock;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
import com.example.demo.dto.BorrowView;
|
||||
import com.example.demo.entity.BorrowBook;
|
||||
|
||||
public interface BorrowBookRepository extends JpaRepository<BorrowBook, Integer> {
|
||||
|
||||
String VIEW = "select new com.example.demo.dto.BorrowView("
|
||||
+ "r.idRequest, e.nmEmployee, b.nmBook, r.dateRequest, r.dateBorrow, r.dateScheduledReturn, "
|
||||
+ "b.isbn, b.publisher, b.note, r.status) "
|
||||
+ "from BorrowBook r, Employee e, BookCollection b "
|
||||
+ "where r.idApplicant = e.idEmployee and r.idBook = b.idBook ";
|
||||
|
||||
/** LOAN-02 / LOAN-04：ステータス指定の一覧 */
|
||||
@Query(VIEW + "and r.status = :status order by r.idRequest")
|
||||
List<BorrowView> findViewsByStatus(@Param("status") String status);
|
||||
|
||||
/** 確認画面用：申請IDで1件 */
|
||||
@Query(VIEW + "and r.idRequest = :id")
|
||||
List<BorrowView> findViewById(@Param("id") Integer id);
|
||||
|
||||
/** 承認・却下・返却：更新前に行ロックを取って同時操作を防ぐ */
|
||||
@Lock(LockModeType.PESSIMISTIC_WRITE)
|
||||
@Query("select r from BorrowBook r where r.idRequest = :id")
|
||||
Optional<BorrowBook> findForUpdate(@Param("id") Integer id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,5 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
import java.util.Optional;
|
||||
public class EmployeeRepository {
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import com.example.demo.entity.Employee;
|
||||
|
||||
public interface EmployeeRepository extends JpaRepository<Employee, Integer> {
|
||||
Optional<Employee> findByMailAddressAndFlgRetirement(String mailAddress, String flgRetirement);
|
||||
|
||||
Optional<Employee> findByMailAddress(String mailAddress);
|
||||
}
|
||||
|
||||
@@ -1,34 +1,5 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.entity.Employee;
|
||||
import com.example.demo.repository.EmployeeRepository;
|
||||
|
||||
/** AUTH-01：認証 */
|
||||
@Service
|
||||
public class AuthService {
|
||||
private final EmployeeRepository employeeRepository;
|
||||
|
||||
public AuthService(EmployeeRepository employeeRepository) {
|
||||
this.employeeRepository = employeeRepository;
|
||||
}
|
||||
|
||||
/** 在籍中の社員のうち、メールアドレスとパスワードが一致する者を返す。一致しなければ empty。 */
|
||||
public Optional<LoginUser> authenticate(String mailAddress, String password) {
|
||||
return employeeRepository
|
||||
.findByMailAddressAndFlgRetirement(mailAddress, Const.RETIRE_NO)
|
||||
.filter(e -> e.getPassword().equals(password))
|
||||
.map(AuthService::toLoginUser);
|
||||
}
|
||||
|
||||
private static LoginUser toLoginUser(Employee e) {
|
||||
return new LoginUser(e.getIdEmployee(), e.getNmEmployee(), e.getKnEmployee(),
|
||||
e.getMailAddress(), e.getFlgAdmin());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,93 +1,5 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.common.BusinessException;
|
||||
import com.example.demo.common.Const;
|
||||
import com.example.demo.common.LoginUser;
|
||||
import com.example.demo.entity.BookCollection;
|
||||
import com.example.demo.form.BookForm;
|
||||
import com.example.demo.repository.BookCollectionRepository;
|
||||
|
||||
/** BOOK-02：書籍登録、BOOK-03：書籍編集 */
|
||||
|
||||
@Service
|
||||
public class BookAdminService {
|
||||
private final BookCollectionRepository bookRepository;
|
||||
|
||||
public BookAdminService(BookCollectionRepository bookRepository) {
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
|
||||
/** 入力チェック（ISBN必須13文字以内、書籍名必須50、よみ100、出版社50）。※ISBNを数字13桁に限定するかは要確認 */
|
||||
public List<String> validate(BookForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
if (f.getIsbn().isEmpty()) e.add("ISBNを入力してください。");
|
||||
else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。");
|
||||
if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。");
|
||||
else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。");
|
||||
if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。");
|
||||
if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。");
|
||||
return e;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public BookCollection find(Integer idBook) {
|
||||
return bookRepository.findById(idBook)
|
||||
.orElseThrow(() -> new BusinessException("対象の書籍が見つかりません。"));
|
||||
}
|
||||
|
||||
public BookForm toForm(BookCollection b) {
|
||||
BookForm f = new BookForm();
|
||||
f.setIdBook(b.getIdBook());
|
||||
f.setIsbn(b.getIsbn());
|
||||
f.setNmBook(b.getNmBook());
|
||||
f.setKnBook(b.getKnBook() == null ? "" : b.getKnBook());
|
||||
f.setPublisher(b.getPublisher() == null ? "" : b.getPublisher());
|
||||
f.setNote(b.getNote() == null ? "" : b.getNote());
|
||||
return f;
|
||||
}
|
||||
|
||||
/** 新規登録：貸出可として登録する。 */
|
||||
@Transactional
|
||||
public Integer register(BookForm f, LoginUser admin) {
|
||||
check(f);
|
||||
BookCollection b = new BookCollection();
|
||||
apply(b, f);
|
||||
b.setFlgLending(Const.LENDING_OK);
|
||||
b.setIdUpdate(admin.getIdEmployee());
|
||||
b.setDateUpdate(LocalDateTime.now());
|
||||
return bookRepository.save(b).getIdBook();
|
||||
}
|
||||
|
||||
/** 編集：書籍情報のみ更新する（貸出フラグは変更しない）。 */
|
||||
@Transactional
|
||||
public void update(BookForm f, LoginUser admin) {
|
||||
check(f);
|
||||
BookCollection b = find(f.getIdBook());
|
||||
apply(b, f);
|
||||
b.setIdUpdate(admin.getIdEmployee());
|
||||
b.setDateUpdate(LocalDateTime.now());
|
||||
}
|
||||
|
||||
private void check(BookForm f) {
|
||||
List<String> errors = validate(f);
|
||||
if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
|
||||
}
|
||||
|
||||
|
||||
private static void apply(BookCollection b, BookForm f) {
|
||||
b.setIsbn(f.getIsbn());
|
||||
b.setNmBook(f.getNmBook());
|
||||
b.setKnBook(f.getKnBook().isEmpty() ? null : f.getKnBook());
|
||||
b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher());
|
||||
b.setNote(f.getNote().isEmpty() ? null : f.getNote());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,33 +1,5 @@
|
||||
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("_", "!_");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,164 +1,5 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.springframework.dao.DataIntegrityViolationException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
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.repository.EmployeeRepository;
|
||||
|
||||
/** EMP-01：社員登録、EMP-02：社員編集 */
|
||||
@Service
|
||||
public class EmployeeService {
|
||||
private static final Pattern MAIL = Pattern.compile("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");
|
||||
private static final String MSG_DUP = "このメールアドレスは既に登録されています。";
|
||||
|
||||
private final EmployeeRepository employeeRepository;
|
||||
|
||||
public EmployeeService(EmployeeRepository employeeRepository) {
|
||||
this.employeeRepository = employeeRepository;
|
||||
}
|
||||
|
||||
// ---------- 検索 ----------
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Optional<Employee> findByMail(String mail) {
|
||||
return employeeRepository.findByMailAddress(mail == null ? "" : mail.trim());
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Employee find(Integer id) {
|
||||
return employeeRepository.findById(id)
|
||||
.orElseThrow(() -> new BusinessException("対象の社員が見つかりません。"));
|
||||
}
|
||||
|
||||
/** 編集画面の初期値（パスワードは空：管理者は変更時のみ入力） */
|
||||
public EmployeeForm toForm(Employee e) {
|
||||
EmployeeForm f = new EmployeeForm();
|
||||
f.setIdEmployee(e.getIdEmployee());
|
||||
f.setNmEmployee(e.getNmEmployee());
|
||||
f.setKnEmployee(e.getKnEmployee());
|
||||
f.setMailAddress(e.getMailAddress());
|
||||
f.setFlgAdmin(e.getFlgAdmin());
|
||||
f.setFlgRetirement(e.getFlgRetirement());
|
||||
return f;
|
||||
}
|
||||
|
||||
// ---------- 入力チェック ----------
|
||||
|
||||
/** 社員登録：社員名・よみ・メール・管理者フラグ。パスワードは初期値で登録する。 */
|
||||
public List<String> validateRegist(EmployeeForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
checkBasic(f, e);
|
||||
checkMail(f, null, e);
|
||||
checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
|
||||
return e;
|
||||
}
|
||||
|
||||
/** 管理者による編集：全項目。パスワードは空なら変更しない。 */
|
||||
public List<String> validateUpdateByAdmin(EmployeeForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
checkBasic(f, e);
|
||||
checkMail(f, f.getIdEmployee(), e);
|
||||
checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
|
||||
checkFlag(f.getFlgRetirement(), "退職フラグ", e);
|
||||
if (f.getPassword().length() > 256) e.add("パスワードは256文字以内で入力してください。");
|
||||
return e;
|
||||
}
|
||||
|
||||
/** 一般ユーザーによる編集：パスワードのみ（必須）。 */
|
||||
public List<String> validateUpdateBySelf(EmployeeForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
if (f.getPassword().isEmpty()) e.add("パスワードを入力してください。");
|
||||
else if (f.getPassword().length() > 256) e.add("パスワードは256文字以内で入力してください。");
|
||||
return e;
|
||||
}
|
||||
|
||||
private void checkBasic(EmployeeForm f, List<String> e) {
|
||||
if (f.getNmEmployee().isEmpty()) e.add("社員名を入力してください。");
|
||||
else if (f.getNmEmployee().length() > 50) e.add("社員名は50文字以内で入力してください。");
|
||||
// ※社員名よみの文字種（ひらがなのみ等）は設計で確定する。現状は文字数のみチェック
|
||||
if (f.getKnEmployee().isEmpty()) e.add("社員名よみを入力してください。");
|
||||
else if (f.getKnEmployee().length() > 100) e.add("社員名よみは100文字以内で入力してください。");
|
||||
}
|
||||
|
||||
private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {
|
||||
String m = f.getMailAddress();
|
||||
if (m.isEmpty()) { e.add("メールアドレスを入力してください。"); return; }
|
||||
if (m.length() > 256) { e.add("メールアドレスは256文字以内で入力してください。"); return; }
|
||||
if (!MAIL.matcher(m).matches()) { e.add("メールアドレスの形式が正しくありません。"); return; }
|
||||
Optional<Employee> dup = employeeRepository.findByMailAddress(m);
|
||||
if (dup.isPresent() && !dup.get().getIdEmployee().equals(selfId)) e.add(MSG_DUP);
|
||||
}
|
||||
|
||||
private static void checkFlag(String v, String label, List<String> e) {
|
||||
if (!"0".equals(v) && !"1".equals(v)) e.add(label + "が正しくありません。");
|
||||
}
|
||||
|
||||
// ---------- 登録・更新 ----------
|
||||
|
||||
@Transactional
|
||||
public Integer register(EmployeeForm f, LoginUser admin) {
|
||||
raise(validateRegist(f));
|
||||
Employee e = new Employee();
|
||||
e.setNmEmployee(f.getNmEmployee());
|
||||
e.setKnEmployee(f.getKnEmployee());
|
||||
e.setMailAddress(f.getMailAddress());
|
||||
e.setPassword(Const.DEFAULT_PASSWORD);
|
||||
e.setFlgAdmin(f.getFlgAdmin());
|
||||
e.setFlgRetirement(Const.RETIRE_NO);
|
||||
e.setIdUpdate(admin.getIdEmployee());
|
||||
e.setDateUpdate(LocalDateTime.now());
|
||||
try {
|
||||
return employeeRepository.saveAndFlush(e).getIdEmployee();
|
||||
} catch (DataIntegrityViolationException ex) {
|
||||
throw new BusinessException(MSG_DUP); // 同時登録によるUNIQUE制約違反
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void updateByAdmin(EmployeeForm f, LoginUser admin) {
|
||||
raise(validateUpdateByAdmin(f));
|
||||
Employee e = find(f.getIdEmployee());
|
||||
e.setNmEmployee(f.getNmEmployee());
|
||||
e.setKnEmployee(f.getKnEmployee());
|
||||
e.setMailAddress(f.getMailAddress());
|
||||
if (!f.getPassword().isEmpty()) e.setPassword(f.getPassword());
|
||||
e.setFlgAdmin(f.getFlgAdmin());
|
||||
e.setFlgRetirement(f.getFlgRetirement());
|
||||
e.setIdUpdate(admin.getIdEmployee());
|
||||
e.setDateUpdate(LocalDateTime.now());
|
||||
try {
|
||||
employeeRepository.saveAndFlush(e);
|
||||
} catch (DataIntegrityViolationException ex) {
|
||||
throw new BusinessException(MSG_DUP);
|
||||
}
|
||||
}
|
||||
|
||||
/** 一般ユーザー：自分自身（セッションの社員ID）のパスワードのみ更新する。 */
|
||||
@Transactional
|
||||
public void updateBySelf(EmployeeForm f, LoginUser self) {
|
||||
raise(validateUpdateBySelf(f));
|
||||
Employee e = find(self.getIdEmployee());
|
||||
e.setPassword(f.getPassword());
|
||||
e.setIdUpdate(self.getIdEmployee());
|
||||
e.setDateUpdate(LocalDateTime.now());
|
||||
}
|
||||
|
||||
private static void raise(List<String> errors) {
|
||||
if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,159 +1,5 @@
|
||||
package com.example.demo.service;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeParseException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
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.entity.BookCollection;
|
||||
import com.example.demo.entity.BorrowBook;
|
||||
import com.example.demo.repository.BookCollectionRepository;
|
||||
import com.example.demo.repository.BorrowBookRepository;
|
||||
|
||||
/** LOAN-01〜05：貸出申請・承認/却下・返却。貸出ステータスと蔵書の貸出フラグは同一トランザクションで更新する。 */
|
||||
@Service
|
||||
public class LoanService {
|
||||
private static final String MSG_STATE = "他の操作で状態が変わっています。最新の状態を確認してください。";
|
||||
|
||||
private final BorrowBookRepository borrowRepository;
|
||||
private final BookCollectionRepository bookRepository;
|
||||
|
||||
public LoanService(BorrowBookRepository borrowRepository, BookCollectionRepository bookRepository) {
|
||||
this.borrowRepository = borrowRepository;
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
|
||||
// ---------- LOAN-01 貸出申請 ----------
|
||||
|
||||
/** 貸出可の蔵書を取得する。存在しない／貸出不可なら BusinessException。 */
|
||||
@Transactional(readOnly = true)
|
||||
public BookCollection getLendableBook(Integer idBook) {
|
||||
return bookRepository.findById(idBook)
|
||||
.filter(b -> Const.LENDING_OK.equals(b.getFlgLending()))
|
||||
.orElseThrow(() -> new BusinessException("この書籍は現在貸出できません。書籍一覧を確認してください。"));
|
||||
}
|
||||
|
||||
/** 貸出日・返却予定日の入力チェック。エラーがなければ空のリスト。 */
|
||||
public List<String> validateDates(String dateBorrow, String dateScheduledReturn) {
|
||||
List<String> errors = new ArrayList<>();
|
||||
LocalDate b = parse(dateBorrow);
|
||||
LocalDate r = parse(dateScheduledReturn);
|
||||
if (isBlank(dateBorrow)) errors.add("貸出日を入力してください。");
|
||||
else if (b == null) errors.add("貸出日の形式が正しくありません。");
|
||||
if (isBlank(dateScheduledReturn)) errors.add("返却予定日を入力してください。");
|
||||
else if (r == null) errors.add("返却予定日の形式が正しくありません。");
|
||||
if (b != null && r != null && r.isBefore(b)) errors.add("返却予定日は貸出日より前の日付にできません。");
|
||||
return errors;
|
||||
}
|
||||
|
||||
public static LocalDate parse(String s) {
|
||||
if (isBlank(s)) return null;
|
||||
try {
|
||||
return LocalDate.parse(s.trim());
|
||||
} catch (DateTimeParseException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isBlank(String s) {
|
||||
return s == null || s.trim().isEmpty();
|
||||
}
|
||||
|
||||
/** 申請を登録し、蔵書を貸出不可にする（全体で1トランザクション）。 */
|
||||
@Transactional
|
||||
public Integer apply(Integer idBook, String dateBorrow, String dateScheduledReturn, LoginUser user) {
|
||||
List<String> errors = validateDates(dateBorrow, dateScheduledReturn);
|
||||
if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
|
||||
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
// 貸出可 → 貸出不可。0件なら他の人が先に申請済み
|
||||
int updated = bookRepository.updateLending(idBook, Const.LENDING_OK, Const.LENDING_NG, user.getIdEmployee(), now);
|
||||
if (updated == 0) throw new BusinessException("この書籍は現在貸出できません。書籍一覧を確認してください。");
|
||||
|
||||
BorrowBook r = new BorrowBook();
|
||||
r.setIdApplicant(user.getIdEmployee());
|
||||
r.setIdBook(idBook);
|
||||
r.setDateRequest(LocalDate.now());
|
||||
r.setStatus(Const.STATUS_WAITING);
|
||||
r.setDateBorrow(parse(dateBorrow));
|
||||
r.setDateScheduledReturn(parse(dateScheduledReturn));
|
||||
r.setIdUpdate(user.getIdEmployee());
|
||||
r.setDateUpdate(now);
|
||||
return borrowRepository.save(r).getIdRequest();
|
||||
}
|
||||
|
||||
// ---------- 一覧・確認画面 ----------
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<BorrowView> listByStatus(String status) {
|
||||
return borrowRepository.findViewsByStatus(status);
|
||||
}
|
||||
|
||||
/** 申請IDで1件取得し、期待するステータスであることを確認する。 */
|
||||
@Transactional(readOnly = true)
|
||||
public BorrowView getView(Integer idRequest, String expectedStatus) {
|
||||
BorrowView v = borrowRepository.findViewById(idRequest).stream().findFirst()
|
||||
.orElseThrow(() -> new BusinessException("対象の申請が見つかりません。"));
|
||||
if (!expectedStatus.equals(v.getStatus())) throw new BusinessException(MSG_STATE);
|
||||
return v;
|
||||
}
|
||||
|
||||
// ---------- LOAN-03 承認／却下 ----------
|
||||
|
||||
@Transactional
|
||||
public void approve(Integer idRequest, LoginUser admin) {
|
||||
BorrowBook r = lockWithStatus(idRequest, Const.STATUS_WAITING);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
r.setStatus(Const.STATUS_LENDING);
|
||||
r.setIdApproval(admin.getIdEmployee());
|
||||
r.setDateApproval(LocalDate.now());
|
||||
r.setIdUpdate(admin.getIdEmployee());
|
||||
r.setDateUpdate(now);
|
||||
// 蔵書の貸出フラグは貸出不可のまま
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void reject(Integer idRequest, LoginUser admin) {
|
||||
BorrowBook r = lockWithStatus(idRequest, Const.STATUS_WAITING);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
r.setStatus(Const.STATUS_REJECTED);
|
||||
r.setIdUpdate(admin.getIdEmployee());
|
||||
r.setDateUpdate(now);
|
||||
borrowRepository.saveAndFlush(r);
|
||||
releaseBook(r.getIdBook(), admin, now);
|
||||
}
|
||||
|
||||
// ---------- LOAN-05 返却 ----------
|
||||
|
||||
@Transactional
|
||||
public void returnBook(Integer idRequest, LoginUser admin) {
|
||||
BorrowBook r = lockWithStatus(idRequest, Const.STATUS_LENDING);
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
r.setStatus(Const.STATUS_RETURNED);
|
||||
r.setDateReturn(LocalDate.now());
|
||||
r.setIdUpdate(admin.getIdEmployee());
|
||||
r.setDateUpdate(now);
|
||||
borrowRepository.saveAndFlush(r);
|
||||
releaseBook(r.getIdBook(), admin, now);
|
||||
}
|
||||
|
||||
private BorrowBook lockWithStatus(Integer idRequest, String expectedStatus) {
|
||||
BorrowBook r = borrowRepository.findForUpdate(idRequest)
|
||||
.orElseThrow(() -> new BusinessException("対象の申請が見つかりません。"));
|
||||
if (!expectedStatus.equals(r.getStatus())) throw new BusinessException(MSG_STATE);
|
||||
return r;
|
||||
}
|
||||
|
||||
/** 蔵書を貸出可に戻す。失敗時は例外でトランザクション全体がロールバックされる。 */
|
||||
private void releaseBook(Integer idBook, LoginUser admin, LocalDateTime now) {
|
||||
int updated = bookRepository.updateLending(idBook, Const.LENDING_NG, Const.LENDING_OK, admin.getIdEmployee(), now);
|
||||
if (updated == 0) throw new BusinessException(MSG_STATE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
spring.application.name=book-rent
|
||||
# --- MySQL (CREATE DATABASE.sql で作成した book_manage) ---
|
||||
spring.datasource.url=jdbc:mysql://localhost:3306/book_manage?serverTimezone=Asia/Tokyo&characterEncoding=UTF-8
|
||||
spring.datasource.username=bookuser
|
||||
spring.datasource.password=Book2026
|
||||
|
||||
# テーブルはSQLで作成済み。JPAでは変更しない
|
||||
spring.jpa.hibernate.ddl-auto=none
|
||||
spring.jpa.open-in-view=false
|
||||
spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
|
||||
|
||||
spring.thymeleaf.cache=false
|
||||
server.servlet.session.timeout=30m
|
||||
@@ -1,10 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Insert title here</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -2,27 +2,35 @@
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>メニュー</title>
|
||||
<!-- <link rel="stylesheet" th:href="@{/css/style.css}">-->
|
||||
<meta charset="UTF-8">
|
||||
<title>メニュー</title>
|
||||
|
||||
<link rel="stylesheet" th:href="@{/css/all.css}">
|
||||
<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 menu">
|
||||
<a class="btn" th:href="@{/books}">書籍一覧</a>
|
||||
<!-- 管理者のみ（サーバー側でも /admin/** は管理者以外を拒否している） -->
|
||||
<th:block th:if="${session.loginUser.admin}">
|
||||
<a class="btn" th:href="@{/admin/applications}">書籍貸出申請一覧</a>
|
||||
<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧</a>
|
||||
<a class="btn" th:href="@{/admin/employees/new}">社員登録</a>
|
||||
</th:block>
|
||||
<a class="btn" th:href="@{/employees/search}">社員編集</a>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
<h1>メニュー</h1>
|
||||
|
||||
<div class="userInfo">
|
||||
<span>ログインユーザー：</span>
|
||||
<span th:text="${loginUserName}">ユーザー名</span>
|
||||
|
||||
<form th:action="@{/logout}" method="post">
|
||||
<button type="submit">ログアウト</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="menuArea">
|
||||
<form th:action="@{/book/list}" method="get">
|
||||
<button type="submit">書籍一覧</button>
|
||||
</form>
|
||||
|
||||
<form th:action="@{/book/rent}" method="get">
|
||||
<button type="submit">書籍貸出申請一覧</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user