第2段階2-3の途中まで終了しました。池田

src/main/java/com/example/rhizome/aop/aspect/PermissionCheckAspect.java

@@ -1,17 +1,16 @@
 package com.example.rhizome.aop.aspect;
 
-import javax.servlet.http.HttpServletRequest;
+import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
-
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
+import com.example.rhizome.exception.InsufficientPermissionException;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
+import javax.servlet.http.HttpServletRequest;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
-import com.example.rhizome.exception.InsufficientPermissionException;
 
 /**
  * 権限チェック用のAOP
@@ -20,95 +19,96 @@ import com.example.rhizome.exception.InsufficientPermissionException;
 @Component
 public class PermissionCheckAspect {
 
-	HttpServletRequest request;
+    HttpServletRequest request;
 
-	@Autowired
+    @Autowired
-	public PermissionCheckAspect(HttpServletRequest request) {
+    public PermissionCheckAspect(HttpServletRequest request) {
-		this.request = request;
+        this.request = request;
-	}
+    }
 
-	// Aspectのフックを定義（今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング）
+    // Aspectのフックを定義（今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング）
-	@Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
+    @Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
-	public void permissionCheckMethod() {
+    public void permissionCheckMethod() {
-	}
+    }
 
-	/**
+    /**
-	 * 権限チェック
+     * 権限チェック
-	 */
+     */
-	@Before("permissionCheckMethod()")
+    @Before("permissionCheckMethod()")
-	public void checkPermission() {
+    public void checkPermission() {
-		// ログインユーザの取得
+        // ログインユーザの取得
-		LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
+        LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
 
-		// ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移
+        // ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移
-		if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
+        if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
-			throw new InsufficientPermissionException("不正な遷移です");
+            throw new InsufficientPermissionException("不正な遷移です");
-		}
+        }
 
-	}
+    }
 
-	/**
+    /**
-	 * 遷移先のURLとログインユーザの権限から、遷移可否を判定する
+     * 遷移先のURLとログインユーザの権限から、遷移可否を判定する
-	 *
+     *
-	 * @param targetURL     遷移したいURL
+     * @param targetURL     遷移したいURL
-	 * @param loginUserForm リクエスト元のユーザ
+     * @param loginUserForm リクエスト元のユーザ
-	 * @return true:遷移可 false:遷移不可
+     * @return true:遷移可 false:遷移不可
-	 */
+     */
-	private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
+    private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
 
-		// 管理者権限
+        // 管理者権限
-		if (isAdminTransition(targetURL, loginUserForm)) {
+        if (isAdminTransition(targetURL, loginUserForm)) {
-			return true;
+            return true;
-		}
+        }
 
-		// 一般権限
+        // 一般権限
-		if (isUserTransition(targetURL, loginUserForm)) {
+        if (isUserTransition(targetURL, loginUserForm)) {
-			return true;
+            return true;
-		}
+        }
 
-		// アクセス不許可の場合の処理（不正アクセス画面に遷移）
+        // アクセス不許可の場合の処理（不正アクセス画面に遷移）
-		return false;
+        return false;
 
-	}
+    }
 
-	/**
+    /**
-	 * 管理者用のアカウントで管理者向けのページアクセスか
+     * 管理者用のアカウントで管理者向けのページアクセスか
-	 *
+     *
-	 * @param targetURL     遷移したいURL
+     * @param targetURL     遷移したいURL
-	 * @param loginUserForm リクエスト元のユーザ
+     * @param loginUserForm リクエスト元のユーザ
-	 * @return true:遷移可 false:遷移不可
+     * @return true:遷移可 false:遷移不可
-	 */
+     */
-	private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
+    private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
 
-		// 管理者か
+        // 管理者か
-		if (!loginUserForm.isAdminUser()) {
+        if (!loginUserForm.isAdminUser()) {
-			return false;
+            return false;
-		}
+        }
 
-		// 管理者向けのページ遷移か
+        // 管理者向けのページ遷移か
-		if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
+        if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
-			return false;
+            return false;
-		}
+        }
 
-		return true;
+        return true;
-	}
+    }
 
-	/**
+    /**
-	 * 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか
+     * 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか
-	 *
+     *
-	 * @param targetURL     遷移したいURL
+     * @param targetURL     遷移したいURL
-	 * @param loginUserForm リクエスト元のユーザ
+     * @param loginUserForm リクエスト元のユーザ
-	 * @return true:遷移可 false:遷移不可
+     * @return true:遷移可 false:遷移不可
-	 */
+     */
-	private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
+    private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
 
-		// 管理者か
+        // 管理者か
-		if (loginUserForm.isAdminUser()) {
+        if (loginUserForm.isAdminUser()) {
-			return false;
+            return false;
-		}
+        }
 
-		// 一般ユーザ向けのページ遷移か
+        // 一般ユーザ向けのページ遷移か
-		return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
+        return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
 
-	}
+    }
 }
+

src/main/java/com/example/rhizome/app/domain/service/DeleteDepartment.java

@@ -1,6 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-public interface DeleteDepartment {
-	void deleteDepartment(Integer idDepartment);
-
-}

src/main/java/com/example/rhizome/app/domain/service/SearchDepartment.java

@@ -3,15 +3,23 @@ package com.example.rhizome.app.domain.service;
 import java.util.List;
 
 import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.Employee;
+import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
 public interface SearchDepartment {
+
+	List<Department> searchDepartmentBynmDepartment(String nmDepartment);
+
+	List<Department> searchDepartmentByIdDepartment(Integer idDepartment);
+
+	// これはなにをしている？　SearchEmployeeより
+	LoginUser searchLoginUser(String mailAddress);
+
+	Employee searchEmployeeByIdEmployee(Integer idEmployee);
+
 	List<Department> selectAll();
 
-	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
+	List<Department> searchByWithLike(SearchConditionDepartment condition);
-
-	List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-
-	Department searchDepartmentByIdDepartment(Integer idDepartment);
 
 }

src/main/java/com/example/rhizome/app/domain/service/UpdateDepartment.java

@@ -1,8 +0,0 @@
-package com.example.rhizome.app.domain.service;
-
-import com.example.rhizome.app.domain.model.Department;
-
-public interface UpdateDepartment {
-	void updateDepartment(Department beforeDepartment, Department updateDepartment);
-
-}

src/main/java/com/example/rhizome/app/domain/service/impl/DeleteDepartmentImpl.java

@@ -1,33 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.rhizome.app.domain.service.DeleteDepartment;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-/**
- * Department レコード削除関連の機能を持つサービス
- */
-@Service
-@Transactional
-public class DeleteDepartmentImpl implements DeleteDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	/**
-	 * idDepartment を元に department データを削除
-	 *
-	 * @param idDepartment 削除対象のidDepartment
-	 */
-	public void deleteDepartment(Integer idDepartment) {
-		departmentRepository.deleteById(idDepartment);
-	}
-
-}

src/main/java/com/example/rhizome/app/domain/service/impl/RegisterDepartmentImpl.java

@@ -1,37 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.service.RegisterDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-/**
- * department テーブルの登録系の機能を集約させるサービスクラスです。
- */
-@Service
-@Transactional
-public class RegisterDepartmentImpl implements RegisterDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	/**
-	 * department インスタンスの内容を登録する
-	 *
-	 * @param department 登録対象のデータ
-	 */
-
-	@Override
-	public void registerDepartment(Department department) {
-		// TODO 自動生成されたメソッド・スタブ
-		departmentRepository.save(DepartmentEntity.convertFrom(department));
-	}
-}

src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java

@@ -1,5 +1,6 @@
 package com.example.rhizome.app.domain.service.impl;
 
+
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,6 +9,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.Employee;
+import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
@@ -20,69 +23,87 @@ import com.example.rhizome.app.infra.repository.DepartmentRepository;
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
 
-	DepartmentRepository departmentRepository;
+    DepartmentRepository departmentRepository;
 
-	/**
+    /**
-	 * コンストラクタ
+     * コンストラクタ
-	 *
+     *
-	 * @param departmentRepository DI対象
+     * @param departmentRepository DI対象
-	 */
+     */
-	@Autowired
+    @Autowired
-	public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
+    public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
+        this.departmentRepository = departmentRepository;
+    }
+
+    /**
+     * 部署情報を全件取得する
+     *
+     * @return 取得した部署情報レコード全件
+     */
+    public List<Department> selectAll() {
+        return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
+    }
+
+    /**
+     * searchConditionDepartment の情報を元に Department のレコードを取得
+     *
+     * @param searchConditionDepartment 検索条件
+     * @return 検索結果のレコード
+     */
+    public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
+        // 動的に検索条件を絞り込む
+        // Specification は Criteria API の Predicate をラップしたもの
+        return DepartmentEntity
+                .createDepartmentList(
+                        departmentRepository.findAll(Specification
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
+                        )
+                );
+
+    }
+
+    /**
+     * searchConditionDepartment の情報を元に Department のレコードを取得
+     * 部分一致検索
+     *
+     * @param searchConditionDepartment 検索条件
+     * @return 検索結果のレコード
+     */
+    public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
+        // 動的に検索条件を絞り込む
+        // Specification は Criteria API の Predicate をラップしたもの
+        return DepartmentEntity
+                .createDepartmentList(
+                        departmentRepository.findAll(Specification
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
+                        )
+                );
+
+    }
+
+	@Override
+	public List<Department> searchDepartmentBynmDepartment(String nmDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
 	}
 
-	/**
+	@Override
-	 * 部署情報を全件取得する
+	public List<Department> searchDepartmentByIdDepartment(Integer idDepartment) {
-	 *
+		// TODO 自動生成されたメソッド・スタブ
-	 * @return 取得した部署情報レコード全件
+		return null;
-	 */
-	public List<Department> selectAll() {
-		return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
 	}
 
-	/**
+	@Override
-	 * searchConditionDepartment の情報を元に Department のレコードを取得
+	public LoginUser searchLoginUser(String mailAddress) {
-	 *
+		// TODO 自動生成されたメソッド・スタブ
-	 * @param searchConditionDepartment 検索条件
+		return null;
-	 * @return 検索結果のレコード
-	 */
-	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
-		// 動的に検索条件を絞り込む
-		// Specification は Criteria API の Predicate をラップしたもの
-		return DepartmentEntity
-				.createDepartmentList(
-						departmentRepository.findAll(Specification
-								.where(DepartmentRepository
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-								.and(DepartmentRepository
-										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
-
 	}
 
-	/**
+	@Override
-	 * searchConditionDepartment の情報を元に Department のレコードを取得
+	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-	 * 部分一致検索
+		// TODO 自動生成されたメソッド・スタブ
-	 *
+		return null;
-	 * @param searchConditionDepartment 検索条件
-	 * @return 検索結果のレコード
-	 */
-	public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
-		// 動的に検索条件を絞り込む
-		// Specification は Criteria API の Predicate をラップしたもの
-		return DepartmentEntity
-				.createDepartmentList(
-						departmentRepository.findAll(Specification
-								.where(DepartmentRepository
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-								.and(DepartmentRepository
-										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
-
-	}
-
-	//idDepartmentに合致するレコード取得
-	public Department searchDepartmentByIdDepartment(Integer idDepartment) {
-		return DepartmentEntity
-				.createDepartment(departmentRepository.findByIdDepartment(idDepartment).orElse(new DepartmentEntity()));
 	}
 }

src/main/java/com/example/rhizome/app/domain/service/impl/UpdateDepartmentImpl.java

@@ -1,53 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.service.UpdateDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-/**
- * department の更新系の機能を集約させるサービスクラスです。
- */
-@Service
-@Transactional
-public class UpdateDepartmentImpl implements UpdateDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	/**
-	 * department の情報を元に department table のレコードを更新する
-	 *
-	 * @param beforeDepartment 更新前のデータ
-	 * @param updateDepartment 更新後のデータ
-	 */
-	public void updateDepartment(Department beforeDepartment, Department updateDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment, updateDepartment)));
-
-	}
-
-	/**
-	 * 更新前のデータと更新対象のデータをマージする
-	 *
-	 * @param beforeDepartment 更新前のデータ
-	 * @param updateDepartment 更新対象のデータ
-	 * @return マージしたデータ
-	 */
-
-	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
-		return new Department(
-				updateDepartment.getIdDepartment(),
-				updateDepartment.getNmDepartment());
-
-	}
-
-}

src/main/java/com/example/rhizome/app/infra/entity/DepartmentEntity.java

@@ -6,22 +6,15 @@
  */
 package com.example.rhizome.app.infra.entity;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
 
 import com.example.rhizome.app.domain.model.Department;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.*;
+import java.util.List;
+
 /**
  * Department テーブルの Entity
  *
@@ -34,59 +27,46 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class DepartmentEntity {
 
-	/**
+    /**
-	 * 部署ID
+     * 部署ID
-	 */
+     */
-	@Id
+    @Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "id_department", nullable = false)
+    @Column(name = "id_department", nullable = false)
-	private Integer idDepartment;
+    private Integer idDepartment;
-	/**
+    /**
-	 * 部署名
+     * 部署名
-	 */
+     */
-	@Column(name = "nm_department", nullable = false)
+    @Column(name = "nm_department", nullable = false)
-	private String nmDepartment;
+    private String nmDepartment;
 
-	/**
+    /**
-	 * DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。
+     * DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。
-	 *
+     *
-	 * @param departmentEntityList department Table のリスト
+     * @param departmentEntityList department Table のリスト
-	 * @return List<Department> リスト
+     * @return List<Department> リスト
-	 */
+     */
-	public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
+    public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
 
-		// Stream API を利用するとこうなります。
+        // Stream API を利用するとこうなります。
-		return departmentEntityList
+        return departmentEntityList
-				.stream()
+                .stream()
-				.map(departmentEntity -> new Department(
+                .map(departmentEntity -> new Department(
-						departmentEntity.getIdDepartment(),
+                        departmentEntity.getIdDepartment(),
-						departmentEntity.getNmDepartment()))
+                        departmentEntity.getNmDepartment()
-				.toList();
+                )).toList();
-	}
+    }
-
-	/**
-	 * Department（BusinessLogic層依存型） から DepartmentEntity（DataAccess層依存）に変換します。
-	 *
-	 * @param department department モデルの値
-	 * @return DepartmentEntity に変換したインスタンス
-	 */
-	public static DepartmentEntity convertFrom(Department department) {
-		return new DepartmentEntity(
-				department.getIdDepartment(),
-				department.getNmDepartment());
-	}
-
-	public static Optional<Department> createDepartmentList(Optional<DepartmentEntity> departmentEntityList) {
-
-		return departmentEntityList.map(departmentEntity -> new Department(departmentEntity.getIdDepartment(),
-				departmentEntity.getNmDepartment()));
-	}
-
-	public static Department createDepartment(DepartmentEntity DepartmentEntity) {
-		// 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
-		return new Department(
-				DepartmentEntity.getIdDepartment(),
-				DepartmentEntity.getNmDepartment());
-	}
 
+    /**
+     * Department（BusinessLogic層依存型） から DepartmentEntity（DataAccess層依存）に変換します。
+     *
+     * @param department department モデルの値
+     * @return DepartmentEntity に変換したインスタンス
+     */
+    public static DepartmentEntity convertFrom(Department department) {
+        return new DepartmentEntity(
+                department.getIdDepartment(),
+                department.getNmDepartment()
+        );
+    }
 }

src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java

@@ -1,13 +1,11 @@
 package com.example.rhizome.app.infra.repository;
 
-import java.util.Optional;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
-
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
 
 /**
  * Specification:
@@ -22,35 +20,31 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
  * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
  */
 @Repository
-public interface DepartmentRepository
+public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
-		extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
 
-	static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-		return idDepartment == null ? null :
-		// 戻り値の型 Specification<DepartmentEntity> にキャスト
-				(Specification<DepartmentEntity>)
-				// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
-				// を作成している
-				(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
-	}
 
-	static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
+    static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+        return idDepartment == null ?
-				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+                null :
-						.like(root.get("nmDepartment"), nmDepartment);
+                // 戻り値の型 Specification<DepartmentEntity> にキャスト
-	}
+                (Specification<DepartmentEntity>)
+                        // ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
+                        // を作成している
+                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
+    }
 
-	static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
+    static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
+        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+                null :
-						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
+                (Specification<DepartmentEntity>)
-	}
+                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), nmDepartment);
+    }
 
-	static void deleteBy(Integer id) {
-
-	}
-
-	//idで検索
-	Optional<DepartmentEntity> findByIdDepartment(Integer idDepartment);
 
+    static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
+        return (nmDepartment == null || nmDepartment.isEmpty()) ?
+                null :
+                (Specification<DepartmentEntity>)
+                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
+    }
 }

src/main/java/com/example/rhizome/app/presentation/controller/DeleteDepartmentController.java

@@ -1,125 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.LoginUser;
-import com.example.rhizome.app.domain.service.DeleteDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployee;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-
-/**
- * 削除処理のコントローラ
- */
-@Controller
-public class DeleteDepartmentController {
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
-
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	DeleteDepartment deleteDepartment;
-	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee;
-
-	@Autowired
-	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
-			HttpSession httpSession, SearchEmployee searchEmployee) {
-		this.httpSession = httpSession;
-		this.deleteDepartment = deleteDepartment;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
-	}
-
-	/**
-	 * 削除処理のコントローラ
-	 *
-	 * @param idDepartment 削除対象のdepartmentId
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = DELETE_DEPARTMENT, method = RequestMethod.POST)
-	public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-			// 削除処理実施
-			deleteExec(
-					model,
-					idDepartment,
-					LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
-
-			// 検索画面に遷移
-			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	/**
-	 * 削除処理実施
-	 *
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @param idDepartment 削除対象のdepartmentId
-	 * @param loginUser  ログインユーザー情報
-	 */
-	private void deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
-
-		final String DELETE_COMPLETE = "削除しました。";
-		final String ID_TO_DELETED_IS_UNKNOWN = "削除対象のIDが不明です。";
-		final String YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT = "1名以上が所属している部署は削除出来ません。";
-
-		if (searchDepartment.searchDepartmentByIdDepartment(idDepartment) == null) {
-			// エラーメッセージをセット
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ID_TO_DELETED_IS_UNKNOWN));
-			return;
-		}
-
-		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-					new MessageForm(YOU_CANNOT_DELETE_A_DEPARTMENT_THAT_HAS_ONE_OR_MORE_MEMBERS_ASSIGNED_TO_IT));
-			return;
-		}
-		// 削除を実施
-		deleteDepartment.deleteDepartment(idDepartment);
-
-		// 削除完了したメッセージをセット
-		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-
-	}
-}

src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java

@@ -1,6 +1,21 @@
 package com.example.rhizome.app.presentation.controller;
 
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.LoginUser;
@@ -12,22 +27,9 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.servlet.http.HttpSession;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;
 
 /**
- * 削除処理のコントロータ
+ * 削除処理のコントローラ
  */
 @Controller
 public class DeleteEmployeeController {

src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentConfirmController.java

@@ -1,132 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployee;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-
-/**
- * 新規登録者情報チェック用のコントローラ
- */
-@Controller
-public class InsertDepartmentConfirmController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentConfirmController.class.getName());
-
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee;
-
-	@Autowired
-	public InsertDepartmentConfirmController(
-			HttpSession httpSession,
-			SearchDepartmentImpl searchDepartment,
-			SearchEmployeeImpl searchEmployee) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
-	}
-
-	@ModelAttribute
-	public InsertDepartmentForm insertDepartmentForm() {
-		return new InsertDepartmentForm();
-	}
-
-	/**
-	 * 登録情報のチェックを行う
-	 *
-	 * @param insertDepartmentForm 登録情報
-	 * @param model              ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = INSERT_DEPARTMENT_CONFIRM, method = RequestMethod.POST)
-	public String insertEmployeeConfirm(InsertDepartmentForm insertDepartmentForm, Model model) {
-
-		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.selectAll()));
-
-			// 登録用パラメータチェック
-			List<String> error = insertDepartmentForm.validateParameter();
-
-			// 入力内容に誤りがあるか
-			if (!error.isEmpty()) {
-				// 誤りがあった場合
-				// 誤りがあった箇所のエラーメッセージを表示
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(String.join(", ", error) + "が不正です。"));
-				// 画面に返す為の登録情報をセット
-				model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
-				// 登録画面に遷移
-				return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-			}
-
-			final String DUPLICATION = "既に登録済みのメールアドレスです。";
-
-			// 登録対象のメールアドレスを元に検索
-			List<Department> departmetList = searchDepartment
-					.searchBy(new SearchConditionDepartment(null, insertDepartmentForm.getNmDepartment()));
-
-			// 検索結果があるか
-			if (!departmetList.isEmpty()) {
-				// 検索した結果0件ではない場合
-				// 重複を許さないため、エラー処理
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-				// 画面に返す為の登録情報をセット
-				model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
-				// 登録画面に遷移
-				return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-			}
-
-			// 登録確認ページに遷移
-			model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
-			// 登録確認画面に遷移
-			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_CONFIRM_HTML;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-}

src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentController.java

@@ -1,146 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.RegisterDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.impl.RegisterDepartmentImpl;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-
-/**
- * 新規登録用のコントローラ
- */
-@Controller
-public class InsertDepartmentController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
-
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	RegisterDepartment registerDepartment;
-	SearchDepartment searchDepartment;
-
-	@Autowired
-	public InsertDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
-			SearchDepartmentImpl searchDepartment) {
-		this.httpSession = httpSession;
-		this.registerDepartment = registerDepartment;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@ModelAttribute
-	public InsertDepartmentForm insertDepartmentForm() {
-		return new InsertDepartmentForm();
-	}
-
-	/**
-	 * 新規登録画面表示処理
-	 *
-	 * @param insertEmployeeForm 登録情報
-	 * @param model              ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = INSERT_DEPARTMENT, method = RequestMethod.POST)
-	public String insertEmployee(InsertDepartmentForm insertDepartmentForm, Model model) {
-
-		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.selectAll()));
-
-			// Confirm画面から渡ってきた値をチェック
-			List<String> error = validateParameter(
-					insertDepartmentForm.getNmDepartment());
-
-			// エラーが1件以上有る場合
-			if (!error.isEmpty()) {
-				// エラー内容を画面に表示
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(String.join(", ", error) + "が不正です。"));
-				// 登録画面に遷移
-				return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-			}
-
-			// 登録処理
-			registerDepartment.registerDepartment(InsertDepartmentForm.convertTo(insertDepartmentForm));
-			// 登録結果画面に遷移
-			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_RESULT_HTML;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	/**
-	 * @param departmentName 登録対象の名前
-	 * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
-	 */
-	private List<String> validateParameter(
-			String departmentName) {
-
-		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
-
-		List<String> error = new ArrayList<>();
-
-		// null or 空文字判定
-		if (isNullOrBlank(departmentName)) {
-			// エラー内容を追加
-			error.add(DEPARTMENT_NAME_NULL_BLANK);
-		}
-
-		return error;
-
-	}
-
-	/**
-	 * 仮引数を null or 空 判定する
-	 *
-	 * @param str 判定対象の文字列
-	 * @return true:null or 空 false:null or 空 では無い
-	 */
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-
-		return str.isBlank();
-	}
-
-}

src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentInputController.java

@@ -1,90 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.RegisterEmployee;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.InsertDepartmentForm;;
-
-/**
- * 登録画面表示用コントローラ
- */
-@Controller
-public class InsertDepartmentInputController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentInputController.class.getName());
-
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	RegisterEmployee registerEmployee;
-	SearchDepartment searchDepartment;
-
-	@Autowired
-	public InsertDepartmentInputController(HttpSession httpSession, RegisterEmployee registerEmployee,
-			SearchDepartment searchDepartment) {
-		this.httpSession = httpSession;
-		this.registerEmployee = registerEmployee;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@ModelAttribute
-	public InsertDepartmentForm insertEmployeeForm() {
-		return new InsertDepartmentForm();
-	}
-
-	/**
-	 * 登録画面表示処理
-	 *
-	 * @param insertEmployeeForm 登録画面のフォーム
-	 * @param model              ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@SessionCheck
-	@PermissionCheck
-	@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
-	public String insertDepartmentInput(InsertDepartmentForm insertDepartmentForm, Model model) {
-
-		try {
-			// 部署コードリストを作成し、画面に返す値としてセット
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-			// パラメータをセット
-			model.addAttribute(PageReturnAttributeKeyword.INSERT_DEPARTMENT_FORM, insertDepartmentForm);
-
-			// 登録画面に遷移
-			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-}

src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java

@@ -1,133 +1,132 @@
-package com.example.rhizome.app.presentation.controller;
+//package com.example.rhizome.app.presentation.controller;
-
+//
-import com.example.rhizome.aop.aspect.PermissionCheck;
+//import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-import com.example.rhizome.aop.aspect.SessionCheck;
+//
-import com.example.rhizome.app.domain.model.Employee;
+//import java.util.List;
-import com.example.rhizome.app.domain.service.SearchDepartment;
+//import java.util.logging.Level;
-import com.example.rhizome.app.domain.service.SearchEmployee;
+//import java.util.logging.Logger;
-import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
+//
-import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
+//import javax.servlet.http.HttpSession;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+//
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+//import org.springframework.beans.factory.annotation.Autowired;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
+//import org.springframework.stereotype.Controller;
-import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
+//import org.springframework.ui.Model;
-import com.example.rhizome.app.presentation.form.MessageForm;
+//import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
+//import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.ui.Model;
+//
-import org.springframework.web.bind.annotation.ModelAttribute;
+//import com.example.rhizome.aop.aspect.PermissionCheck;
-import org.springframework.web.bind.annotation.RequestMapping;
+//import com.example.rhizome.aop.aspect.SessionCheck;
-import org.springframework.web.bind.annotation.RequestMethod;
+//import com.example.rhizome.app.domain.model.Employee;
-
+//import com.example.rhizome.app.domain.service.SearchDepartment;
-import javax.servlet.http.HttpSession;
+//import com.example.rhizome.app.domain.service.SearchEmployee;
-import java.util.List;
+//import com.example.rhizome.app.domain.service.impl.SearchDepartmentImpl;
-import java.util.logging.Level;
+//import com.example.rhizome.app.domain.service.impl.SearchEmployeeImpl;
-import java.util.logging.Logger;
+//import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-
+//import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM;
+//import com.example.rhizome.app.presentation.form.DepartmentForm;
-
+//import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
-/**
+//import com.example.rhizome.app.presentation.form.MessageForm;
- * 新規登録者情報チェック用のコントローラ
+//
- */
+///**
-@Controller
+// * 新規登録者情報チェック用のコントローラ
-public class InsertEmployeeConfirmController {
+// */
-
+//@Controller
-    // ログ出力用インスタンス
+//public class InsertEmployeeConfirmController {
-    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
+//
-
+//    // ログ出力用インスタンス
-    // エラーメッセージ用の定数フィールド
+//    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+//
-
+//    // エラーメッセージ用の定数フィールド
-    HttpSession httpSession;
+//    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    SearchDepartment searchDepartment;
+//
-    SearchEmployee searchEmployee;
+//    HttpSession httpSession;
-
+//    SearchDepartment searchDepartment;
-    @Autowired
+//    SearchEmployee searchEmployee;
-    public InsertEmployeeConfirmController(
+//
-            HttpSession httpSession,
+//    @Autowired
-            SearchDepartmentImpl searchDepartment,
+//    public InsertEmployeeConfirmController(
-            SearchEmployeeImpl searchEmployee
+//            HttpSession httpSession,
-    ) {
+//            SearchDepartmentImpl searchDepartment,
-        this.httpSession = httpSession;
+//            SearchEmployeeImpl searchEmployee
-        this.searchDepartment = searchDepartment;
+//    ) {
-        this.searchEmployee = searchEmployee;
+//        this.httpSession = httpSession;
-    }
+//        this.searchDepartment = searchDepartment;
-
+//        this.searchEmployee = searchEmployee;
-    @ModelAttribute
+//    }
-    public InsertEmployeeForm insertEmployeeForm() {
+//
-        return new InsertEmployeeForm();
+//    @ModelAttribute
-    }
+//    public InsertEmployeeForm insertEmployeeForm() {
-
+//        return new InsertEmployeeForm();
-    /**
+//    }
-     * 登録情報のチェックを行う
+//
-     *
+//    /**
-     * @param insertEmployeeForm 登録情報
+//     * 登録情報のチェックを行う
-     * @param model              ビューにデータを渡すためのコンテナ
+//     *
-     * @return 遷移先の画面
+//     * @param insertEmployeeForm 登録情報
-     */
+//     * @param model              ビューにデータを渡すためのコンテナ
-    @PermissionCheck
+//     * @return 遷移先の画面
-    @SessionCheck
+//     */
-    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
+//    @PermissionCheck
-    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
+//    @SessionCheck
-
+//    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
-        try {
+//    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+//
-            // 作成した部署一覧をセット
+//        try {
-            model.addAttribute(
+//            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+//            // 作成した部署一覧をセット
-                    DepartmentForm.convertFrom(
+//            model.addAttribute(
-                            searchDepartment.selectAll()
+//                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    ));
+//                    DepartmentForm.convertFrom(
-
+//                            searchDepartment.selectAll()
-            // 登録用パラメータチェック
+//                    ));
-            List<String> error = insertEmployeeForm.validateParameter();
+//
-
+//            // 登録用パラメータチェック
-            // 入力内容に誤りがあるか
+//            List<String> error = insertEmployeeForm.validateParameter();
-            if (!error.isEmpty()) {
+//
-                // 誤りがあった場合
+//            // 入力内容に誤りがあるか
-                // 誤りがあった箇所のエラーメッセージを表示
+//            if (!error.isEmpty()) {
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+//                // 誤りがあった場合
-                // 画面に返す為の登録情報をセット
+//                // 誤りがあった箇所のエラーメッセージを表示
-                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+//                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
-                // 登録画面に遷移
+//                // 画面に返す為の登録情報をセット
-                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+//                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-            }
+//                // 登録画面に遷移
-
+//                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-            final String DUPLICATION = "既に登録済みのメールアドレスです。";
+//            }
-
+//
-            // 登録対象のメールアドレスを元に検索
+//            final String DUPLICATION = "既に登録済みのメールアドレスです。";
-            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
+//
-
+//            // 登録対象のメールアドレスを元に検索
-            // 検索結果があるか
+//            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
-            if (!employeeList.isEmpty()) {
+//
-                // 検索した結果0件ではない場合
+//            // 検索結果があるか
-                // 重複を許さないため、エラー処理
+//            if (!employeeList.isEmpty()) {
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+//                // 検索した結果0件ではない場合
-                // 画面に返す為の登録情報をセット
+//                // 重複を許さないため、エラー処理
-                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+//                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-                // 登録画面に遷移
+//                // 画面に返す為の登録情報をセット
-                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+//                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-            }
+//                // 登録画面に遷移
-
+//                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-            // 登録確認ページに遷移
+//            }
-            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+//
-            // 登録確認画面に遷移
+//            // 登録確認ページに遷移
-            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
+//            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-
+//            // 登録確認画面に遷移
-
+//            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
-        } catch (Exception e) {
+//
-            // ログイン情報の破棄
+//
-            httpSession.invalidate();
+//        } catch (Exception e) {
-
+//            // ログイン情報の破棄
-            e.printStackTrace();
+//            httpSession.invalidate();
-
+//
-            // エラーログ出力
+//            e.printStackTrace();
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+//
-            // エラー画面遷移
+//            // エラーログ出力
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
+//            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-        }
+//            // エラー画面遷移
-    }
+//            return TransitionTargetPageNameKeyword.ERROR_HTML;
-}
+//        }
-
+//    }
-
+//}
-

src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java

@@ -1,5 +1,21 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
@@ -11,20 +27,6 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import javax.servlet.http.HttpSession;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE;
 
 /**
  * 新規登録用のコントローラ
@@ -193,6 +195,3 @@ public class InsertEmployeeController {
     }
 
 }
-
-
-

src/main/java/com/example/rhizome/app/presentation/controller/SelectDepartmentController.java

@@ -1,114 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
-
-/**
- * 部署画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
- */
-@Controller
-public class SelectDepartmentController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(SelectDepartmentController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-	SearchEmployeeInfo searchEmployeeInfo;
-
-	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
-			SearchEmployeeInfo searchEmployeeInfo) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployeeInfo = searchEmployeeInfo;
-	}
-
-	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
-	}
-
-	/**
-	 * 社員検索画面表示処理コントローラ
-	 *
-	 * @param searchConditionDepartmentForm 検索画面のフォーム
-	 * @param model                       ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-		try {
-
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-			// 検索条件を元に検索を実施
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(
-					searchDepartment
-							.searchByWithLike(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
-
-			// 検索ページに遷移
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-
-	}
-
-	/**
-	 * 部署検索画面表示処理コントローラ
-	 * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-	 *
-	 * @param model ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY, method = RequestMethod.POST)
-	public String select(Model model) {
-
-		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-		// 作成した部署一覧をセット
-		model.addAttribute(
-				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-		// 検索ページに遷移
-		return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-	}
-
-}

src/main/java/com/example/rhizome/app/presentation/controller/UpdateDepartmentController.java

@@ -1,85 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
-
-/**
- * 更新対象の Department が存在するか確認する為のコントローラ
- */
-@Controller
-public class UpdateDepartmentController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-	SearchEmployeeInfo searchEmployeeInfo;
-
-	@Autowired
-	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment,
-			SearchEmployeeInfo searchEmployeeInfo) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployeeInfo = searchEmployeeInfo;
-	}
-
-	@ModelAttribute
-	public SearchConditionEmployeeForm searchConditionEmployeeForm() {
-		return new SearchConditionEmployeeForm();
-	}
-
-	/**
-	 * 更新対象の department が存在するか確認する為のコントローラ
-	 *
-	 * @param idDepartment 更新対象の employee の id
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DAPERTMENT, method = RequestMethod.POST)
-	public String showUpdateDepatment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-		try {
-			// 部署一覧を取得し画面に返す値としてセット
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.searchDepartmentByIdDepartment(idDepartment)));
-
-			// Update画面に遷移
-			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-
-			e.printStackTrace();
-
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-
-		}
-	}
-}

src/main/java/com/example/rhizome/app/presentation/controller/UpdateDepartmentResultController.java

@@ -1,129 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.example.rhizome.aop.aspect.PermissionCheck;
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.domain.service.SearchEmployee;
-import com.example.rhizome.app.domain.service.UpdateDepartment;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
-
-/**
- * employee を更新して結果を返す為のコントローラ
- */
-@Controller
-public class UpdateDepartmentResultController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	SearchDepartment searchDepartment;
-	SearchEmployee searchEmployee;
-	UpdateDepartment updateDepartment;
-
-	@Autowired
-	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
-			SearchEmployee searchEmployee, UpdateDepartment updateDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
-		this.updateDepartment = updateDepartment;
-	}
-
-	/**
-	 * 更新結果画面表示処理
-	 *
-	 * @param updateDepartmentInfoForm 更新画面のフォーム
-	 * @param model                  ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
-	public String employeeUpdateResult(@ModelAttribute UpdateDepartmentInfoForm updateDepartmentInfoForm, Model model) {
-
-		final String DEPARTMENT_WITH_THE_SAME_NAME = "既に同名の部署が存在するか、値が変更されていません。";
-		final String NOTHING = "項目が空欄です。";
-		final String NO_TARGET = "更新対象のデータが見つかりません。";
-
-		final String UPDATE_COMPLETE = "更新が完了しました。";
-
-		try {
-
-			// 部署一覧取得
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-			// 既に登録済みの部署名が存在するか
-			if (searchDepartment.searchBy(
-					new SearchConditionDepartment(null, updateDepartmentInfoForm.getNmDepartment())).size() != 0) {
-				System.out.println("同一部署名");
-				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(DEPARTMENT_WITH_THE_SAME_NAME));
-				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
-
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			//　画面から渡ってきた値が必須を満たしているか(空白チェック)
-			if (!UpdateDepartmentInfoForm.hasErrorParameter(updateDepartmentInfoForm)) {
-				System.out.println("部署必須否");
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
-
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-
-			// 更新前のデータを取得
-			Department beforeDepartment = searchDepartment
-					.searchDepartmentByIdDepartment(updateDepartmentInfoForm.getIdDepartment());
-			if (beforeDepartment.getIdDepartment() == null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
-				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, updateDepartmentInfoForm);
-
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-
-			// 画面用の型からビジネスロジック用のモデルに変換し、Updateを実行
-			updateDepartment.updateDepartment(beforeDepartment,
-					updateDepartmentInfoForm.convertTo(updateDepartmentInfoForm));
-
-			// 更新結果のメッセージを画面にセットし一覧画面に遷移
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-
-			// forward 先で不用意な動作をしないために updateDepartmentInfoForm をクリア
-			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-			e.printStackTrace();
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-
-	}
-
-}

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java

@@ -5,17 +5,16 @@ package com.example.rhizome.app.presentation.controller.pageproperty;
  */
 public class PageReturnAttributeKeyword {
 
-	public static final String MESSAGE_ERROR = "messageError";
+    public static final String MESSAGE_ERROR = "messageError";
-	public static final String MESSAGE_INFO = "messageInfo";
+    public static final String MESSAGE_INFO = "messageInfo";
 
-	public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
+    public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
-	public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+    public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
-
+    public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
-	public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
+    public static final String LOGIN_INFO_FORM = "loginInfoForm";
-	public static final String LOGIN_INFO_FORM = "loginInfoForm";
+    public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
-	public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
+    public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
-	public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
+    
-	public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentInfoForm";
+	public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
-	public static final String INSERT_DEPARTMENT_FORM = "insertDepartmentForm";
 
 }

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java

@@ -7,107 +7,97 @@ import java.util.Set;
  */
 public class TransitionTargetPageNameKeyword {
 
-	// 共通
+    // 共通
-	public static final String LOGIN_HTML = "login";
+    public static final String LOGIN_HTML = "login";
 
-	// 一般向け
+    // 一般向け
-	public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
+    public static final String UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML = "updatePersonalEmployeeInput";
-	public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
+    public static final String UPDATE_PERSONAL_RESULT_HTML = "updatePersonalEmployeeResult";
 
-	// 管理者向け
+    // 管理者向け
-	public static final String MENU_HTML = "menu";
+    public static final String MENU_HTML = "menu";
-	public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
+    public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
-	public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
+    public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
-	public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+    public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
-	public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
+    public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
-	public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+    public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
 
-	public static final String ERROR_HTML = "error";
+    public static final String ERROR_HTML = "error";
 
-	// 共通(Controller)
+    // 共通(Controller)
-	public static final String INDEX_BLANK = "";
+    public static final String INDEX_BLANK = "";
-	public static final String INDEX_SLASH = "/";
+    public static final String INDEX_SLASH = "/";
-	public static final String INDEX_LOGIN = "/login";
+    public static final String INDEX_LOGIN = "/login";
-	public static final String LOGOUT = "/logout";
+    public static final String LOGOUT = "/logout";
-	public static final String DO_LOGIN = "/doLogin";
+    public static final String DO_LOGIN = "/doLogin";
 
-	// 一般向け(Controller)
+    // 一般向け(Controller)
-	public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
+    public static final String PERSONAL_UPDATE_RESULT = "/updatePersonalEmployeeResult";
 
-	// 管理者向け(Controller)
+    // 管理者向け(Controller)
-	public static final String DELETE_EMPLOYEE = "/deleteEmployee";
+    public static final String DELETE_EMPLOYEE = "/deleteEmployee";
-	public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
+    public static final String INSERT_EMPLOYEE_INPUT = "/insertEmployeeInput";
-	public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
+    public static final String INSERT_EMPLOYEE_CONFIRM = "/insertEmployeeConfirm";
-	public static final String INSERT_EMPLOYEE = "/insertEmployee";
+    public static final String INSERT_EMPLOYEE = "/insertEmployee";
-	public static final String SHOW_MENU = "/showMenu";
+    public static final String SHOW_MENU = "/showMenu";
-	public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
+    public static final String SELECT_EMPLOYEE_INFO = "/selectEmployeeInfo";
-	public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
+    public static final String SELECT_EMPLOYEE_INFO_FORM_EMPTY = "/selectAll";
-	public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
+    public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
-	public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
+    public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
-	// Department
+	public static final String SELECT_DEPARTMENT_INFO = "/selectEmployeeInfo";
-	// HTML
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
-	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-	public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
-	public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
-	public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
-	public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
 
-	// Controller
-	public static final String SELECT_DEPARTMENT_INFO = "/selectDepartmentInfo";
-	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/departmentAll";
 	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
-	public static final String INSERT_DEPARTMENT_CONFIRM = "/insertDepartmentConfirm";
-	public static final String INSERT_DEPARTMENT = "/insertDepartment";
-	public static final String SHOW_UPDATE_DAPERTMENT = "/showUpdateDepartment";
-	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
 
-	/**
-	 * 管理者向けのページリストを返す
-	 *
-	 * @return 管理者向けのページリスト
-	 */
-	public static Set<String> getAdminPageList() {
 
-		return Set.of(
+    // Department
-				INDEX_BLANK,
+    // HTML
-				INDEX_SLASH,
+	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
-				INDEX_LOGIN,
+	
-				LOGOUT,
+    // Controller
-				DO_LOGIN,
+	public static final String SELECT_DEPARTMENT = "/selectDepartment";
-				DELETE_EMPLOYEE,
+	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-				INSERT_EMPLOYEE_INPUT,
+	
-				INSERT_EMPLOYEE_CONFIRM,
+    /**
-				INSERT_EMPLOYEE,
+     * 管理者向けのページリストを返す
-				SHOW_MENU,
+     *
-				SELECT_EMPLOYEE_INFO,
+     * @return 管理者向けのページリスト
-				SELECT_EMPLOYEE_INFO_FORM_EMPTY,
+     */
-				SHOW_UPDATE_EMPLOYEE,
+    public static Set<String> getAdminPageList() {
-				UPDATE_EMPLOYEE_RESULT,
-				SELECT_DEPARTMENT_INFO,
-				SELECT_DEPARTMENT_INFO_FORM_EMPTY,
-				DELETE_DEPARTMENT,
-				SHOW_UPDATE_DAPERTMENT,
-				UPDATE_DEPARTMENT_RESULT,
-				INSERT_DEPARTMENT_INPUT,
-				INSERT_DEPARTMENT_CONFIRM,
-				INSERT_DEPARTMENT);
-	}
 
-	/**
+        return Set.of(
-	 * 一般向けのページリストを返す
+                INDEX_BLANK,
-	 *
+                INDEX_SLASH,
-	 * @return 一般向けのページリスト
+                INDEX_LOGIN,
-	 */
+                LOGOUT,
-	public static Set<String> getUserPageList() {
+                DO_LOGIN,
-		return Set.of(
+                DELETE_EMPLOYEE,
-				INDEX_BLANK,
+                INSERT_EMPLOYEE_INPUT,
-				INDEX_SLASH,
+                INSERT_EMPLOYEE_CONFIRM,
-				INDEX_LOGIN,
+                INSERT_EMPLOYEE,
-				LOGOUT,
+                SHOW_MENU,
-				DO_LOGIN,
+                SELECT_EMPLOYEE_INFO,
-				PERSONAL_UPDATE_RESULT);
+                SELECT_EMPLOYEE_INFO_FORM_EMPTY,
-	}
+                SHOW_UPDATE_EMPLOYEE,
+                UPDATE_EMPLOYEE_RESULT
+        );
+    }
+
+    /**
+     * 一般向けのページリストを返す
+     *
+     * @return 一般向けのページリスト
+     */
+    public static Set<String> getUserPageList() {
+        return Set.of(
+                INDEX_BLANK,
+                INDEX_SLASH,
+                INDEX_LOGIN,
+                LOGOUT,
+                DO_LOGIN,
+                PERSONAL_UPDATE_RESULT
+        );
+    }
 
 }

src/main/java/com/example/rhizome/app/presentation/form/InsertDepartmentForm.java

@@ -1,69 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 画面から渡ってきた登録内容をまとめ、再度画面に表示する為のクラス
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class InsertDepartmentForm {
-
-	/**
-	 * 部署名
-	 */
-	private String nmDepartment;
-
-	/**
-	 * 仮引数を null or 空 判定する
-	 *
-	 * @param str 判定対象の文字列
-	 * @return true:null or 空 false:null or 空 では無い
-	 */
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-
-		return str.isBlank();
-	}
-
-	/**
-	 * 画面から渡ってきた登録内容をまとめ、ビジネスモデルに変換
-	 *
-	 * @param insertEmployeeForm 画面から渡ってきた登録内容
-	 * @return ビジネスモデルのインスタンス
-	 */
-	public static Department convertTo(InsertDepartmentForm InsertDepartmentForm) {
-		return new Department(
-				null,
-				InsertDepartmentForm.getNmDepartment());
-	}
-
-	/**
-	 * 登録データのValidationを行う
-	 *
-	 * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
-	 */
-	public List<String> validateParameter() {
-		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
-
-		List<String> error = new ArrayList<>();
-
-		if (isNullOrBlank(nmDepartment)) {
-			error.add(DEPARTMENT_NAME_NULL_BLANK);
-		}
-
-		return error;
-
-	}
-
-}

src/main/java/com/example/rhizome/app/presentation/form/SearchConditionDepartmentForm.java

@@ -1,51 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SearchConditionDepartmentForm {
-
-	/**
-	 * 部署ID
-	 */
-	private Integer idDepartment;
-	/**
-	 * 部署名
-	 */
-	private String nmDepartment;
-
-	/**
-	 * business 層の SearchConditionDepartment クラスから画面用（presentation 層）の SearchConditionDepartmentForm に
-	 * 変換します。
-	 *
-	 * @param searchConditionDepartment business 層の SearchConditionDepartment インスタンス
-	 * @return 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
-	 */
-	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
-		return new SearchConditionDepartmentForm(
-				searchConditionDepartment.getIdDepartment(),
-				searchConditionDepartment.getNmDepartment());
-	}
-
-	/**
-	 * 画面用（presentation 層）の SearchConditionDepartmentForm クラスから business 層の SearchConditionDepartment クラスに
-	 * 変換します。
-	 *
-	 * @param searchConditionDepartmentForm 画面用（presentation 層）の SearchConditionDepartmentForm インスタンス
-	 * @return business 層の SearchConditionDepartment インスタンス
-	 */
-	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
-		return new SearchConditionDepartment(
-				searchConditionDepartmentForm.getIdDepartment(),
-				searchConditionDepartmentForm.getNmDepartment());
-	}
-}

src/main/java/com/example/rhizome/app/presentation/form/UpdateDepartmentInfoForm.java

@@ -1,91 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 画面から渡ってきた更新内容をまとめ、再度画面に表示する為のクラス
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateDepartmentInfoForm {
-
-	/**
-	 * 	部署ID
-	 */
-	private Integer idDepartment;
-	/**
-	 * 部署名
-	 */
-	private String nmDepartment;
-
-	/**
-	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentInfoForm に
-	 * 変換します。
-	 *
-	 * @param department business 層の Department インスタンス
-	 * @return 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンス
-	 */
-	public static UpdateDepartmentInfoForm convertFrom(Department department) {
-		return new UpdateDepartmentInfoForm(
-				department.getIdDepartment(),
-				department.getNmDepartment());
-	}
-
-	/**
-	 * business 層の Department クラスから画面用（presentation 層）の UpdateDepartmentInfoForm に
-	 * 変換します。（リスト版）
-	 *
-	 * @param departmentList business 層の Department インスタンスのリスト
-	 * @return 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンスのリスト
-	 */
-	public static List<UpdateDepartmentInfoForm> convertFrom(List<Department> departmentList) {
-		return departmentList.stream().map(UpdateDepartmentInfoForm::convertFrom).toList();
-	}
-
-	/**
-	 * 画面用（presentation 層）の UpdateDepartmentInfoForm クラスから business 層の Department クラスに
-	 * 変換します。
-	 *
-	 * @param updateDepartmentInfoForm 画面用（presentation 層）の UpdateDepartmentInfoForm インスタンス
-	 * @return business 層の Department インスタンス
-	 */
-	public static Department convertTo(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
-		return new Department(
-				updateDepartmentInfoForm.getIdDepartment(),
-				updateDepartmentInfoForm.getNmDepartment());
-	}
-
-	/**
-	 * 画面から渡ってきたパラメータのチェック
-	 *
-	 * @param updateDepartmentInfoForm 画面から渡ってきたパラメータ
-	 * @return true: エラー無し　false:エラーあり（必須を満たしていない）
-	 */
-	public static boolean hasErrorParameter(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
-
-		boolean errorFlag = !isNullOrBlank(updateDepartmentInfoForm.getNmDepartment());
-
-		return errorFlag;
-	}
-
-	/**
-	 * 仮引数を null or 空 判定する
-	 *
-	 * @param str 判定対象の文字列
-	 * @return true:null or 空 false:null or 空 では無い
-	 */
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-		return str.isBlank();
-	}
-
-}

src/main/resources/templates/insertDepartmentConfirm.html

@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <!-- 外部のスクリプトファイルを読み込む -->
-    <script th:src="@{/js/common.js}"></script>
-    <!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>登録内容確認</title>
-</head>
-
-<body>
-<h1>登録内容確認　　　
-    <div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-</h1>
-
-<form action="insertDepartment"
-      id="insertForm"
-      method="post"
-      th:object="${insertDepartmentForm}">
-
-    <div class="msgBox error" th:if="${messageError != null}">
-        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
-    </div>
-    <table>
-        <tr>
-            <th class="header">部署ID</th>
-            <td>
-                <label>
-                    <input class="readOnly"
-                           name="idDepartment"
-                           readonly="readonly"
-                           type="text"
-                           value="自動で設定されます"/>
-                </label>
-            </td>
-        </tr>
-        <tr>
-            <th class="header">部署名</th>
-            <td>
-                <label>
-                    <input class="readOnly"
-                           name="nmDepartment"
-                           readonly="readonly"
-                           th:value="*{nmDepartment}"
-                           type="text"/>
-                </label>
-            </td>
-        </tr>
-
-        <tr>
-            <td class="btnArea" colspan="2">
-                <input type="submit" value="登録"/>
-            </td>
-        </tr>
-    </table>
-    <a href="javascript:onClickEdit()">登録内容の編集</a>　|　<a href="showMenu">メニューに戻る</a>
-</form>
-
-<script type="text/javascript">
-    function onClickEdit() {
-        const form = document.getElementById('insertForm');
-        form.setAttribute('method', 'post');
-        form.setAttribute('action', 'insertDepartmentInput');
-
-        // 確認画面から編集画面に戻ってきたときのフラグ（未使用）
-        const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("name", "backFlg");
-        inputField.setAttribute("value", "edit");
-
-        form.appendChild(inputField);
-
-        // フォームをDOMに追加
-        document.body.appendChild(form);
-
-        form.submit();
-    }
-</script>
-
-</body>
-</html>

src/main/resources/templates/insertDepartmentInput.html

@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <!-- 外部のスクリプトファイルを読み込む -->
-    <script th:src="@{/js/common.js}"></script>
-    <!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>部署登録</title>
-</head>
-
-<body>
-<h1>
-    部署登録　　　
-    <div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-</h1>
-<form action="insertDepartmentConfirm"
-      method="post"
-      th:object="${insertDepartmentForm}">
-
-    <div class="msgBox error" th:if="${messageError} != null">
-        <span class="error" th:text="${messageError.message}"></span>
-    </div>
-
-    <table>
-        <tr>
-            <th class="header">部署ID</th>
-            <td>
-                <label>
-                    <input class="readOnly"
-                           readonly="readonly"
-                           type="text"
-                           value="自動で設定されます"
-                    />
-                </label>
-            </td>
-        </tr>
-        <tr>
-            <th class="header">部署名</th>
-            <td>
-                <label>
-                    <input maxlength="50"
-                           placeholder="部署名"
-                           required="required"
-                           th:field="*{nmDepartment}"
-                           type="text"
-                    />
-                </label>
-            </td>
-        </tr>
-
-        <tr>
-            <td class="btnArea" colspan="2">
-                <input type="submit" value="登録確認"/>
-            </td>
-        </tr>
-    </table>
-</form>
-<a href="showMenu">メニューに戻る</a>
-</body>
-</html>

src/main/resources/templates/insertDepartmentResult.html

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <!-- 外部のスクリプトファイルを読み込む -->
-    <script th:src="@{/js/common.js}"></script>
-    <!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>社員登録完了</title>
-</head>
-
-<body>
-<h2>社員登録が完了しました</h2>
-<br/>
-<a href="javascript:insertSubmit()">続けて登録する</a>　|　<a href="showMenu">メニューに戻る</a>
-</body>
-<script type="text/javascript">
-    function insertSubmit() {
-        const form = document.createElement('form');
-        form.setAttribute('method', 'post');
-        form.setAttribute('action', 'insertDepartmentInput');
-
-        // 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "select");
-
-        form.appendChild(inputField);
-
-        // フォームをDOMに追加
-        document.body.appendChild(form);
-
-        form.submit();
-    }
-</script>
-</html>

src/main/resources/templates/insertEmployeeInput.html

@@ -59,7 +59,7 @@
             <td>
                 <label>
                     <input maxlength="50"
-                           onchange="convertToKatakana(this)"
+                           oninput="convertToKatakana(this)"
                            placeholder="フリガナ"
                            required="required"
                            th:field="*{knEmployee}"

src/main/resources/templates/menu.html

@@ -32,16 +32,18 @@
         <td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
         <td class="description">新規でユーザ追加を行います。</td>
     </tr>
-    <tr>
+	
-        <td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+	<!-- 追記 -->
-        </td>
+	<tr>
-        <td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
+		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
-    </tr>
+		</td>
-
+		<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-    <tr>
+	</tr>
-        <td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+	<tr>
-        <td class="description">新規で部署追加を行います。</td>
+		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署登録 </a>
-    </tr>
+		</td>
+		<td class="description">新規で部署追加を行います。</td>
+	</tr>
 
 </table>
 </body>
@@ -69,7 +71,7 @@
     function selectDepartmentSubmit() {
         const form = document.createElement('form');
         form.setAttribute('method', 'post');
-        form.setAttribute('action', 'selectDepartmentInfo');
+        form.setAttribute('action', 'selectDepartment');
 
         // 動的送信用のHidden
         // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない

src/main/resources/templates/selectDepartment.html

@@ -2,116 +2,77 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <head>
-
+	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+	<script th:src="@{/js/common.js}"></script>
-    <!-- 外部のスクリプトファイルを読み込む -->
+	<link rel="stylesheet" th:href="@{/css/all.css}">
-    <script th:src="@{/js/common.js}"></script>
+	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <!-- CSSの読み込み -->
+	<title>部署検索</title>
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>検索</title>
-
 </head>
-<body>
-<h1>
-    検索条件入力　　　
-    <div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-</h1>
-<form action="selectDepartmentInfo"
-      method="post"
-      th:object="${searchConditionDepartmentForm}">
 
-    <div class="msgBox error" th:if="${messageError} != null">
+<body>
-        <span class="error" th:text="${messageError.message}"></span>
+	<h1>
-    </div>
+		部署検索条件入力　　　
-    <table>
+		<div class="rightSection">
-        <tr>
+			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-            <th class="header">部署ID</th>
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-            <td>
+		</div>
-                <input placeholder="部署ID"
+	</h1>
-                       th:field="*{idDepartment}"
+
-                       type="number"/>
+	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
-            </td>
+		<div class="msgBox error" th:if="${messageError} != null">
-        </tr>
+			<span class="error" th:text="${messageError.message}"></span>
-        <tr>
+		</div>
-            <th class="header">部署名</th>
+		<table>
-            <td>
+			<tr>
-                <input placeholder="部署名"
+				<th class="header">部署ID</th>
-                       th:field="*{nmDepartment}"
+				<td>
-                       type="text"/>
+					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
-            </td>
+				</td>
-        </tr>
+			</tr>
-        
+			<tr>
-        <tr>
+				<th class="header">部署名</th>
-            <td class="btnArea" colspan="2">
+				<!-- ★部署名の入力欄（type="text"）を作る -->
-                <input type="submit" value="検索"/>
+				<td>
-            </td>
+					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
-            <td class="btnArea" colspan="2">
+				</td>
-                <button onclick="clearInput()">クリア</button>
+			</tr>
-            </td>
+			<tr>
-        </tr>
+				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
-    </table>
+				<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
-</form>
+			</tr>
-<div class="header-spacing"></div>
+		</table>
-<a href="showMenu">メニューに戻る</a>
+	</form>
-<div class="header-spacing"></div>
+
-<h1><span>検索結果</span></h1>
+	<a href="showMenu">メニューに戻る</a>
-<div class="header-spacing"></div>
+	<h1><span>検索結果</span></h1>
-<th:block th:if="${messageInfo != null}">
+
-    <script th:inline="javascript">
+	<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
-        alert([[${messageInfo.message}]]);
+	<!-- departmentFormListから要素を順番に取り出す -->
-    </script>
+	<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}">
-</th:block>
+
-<div class="header-spacing"></div>
+		<table>
-<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+			<tr>
-    <!-- 検索結果が1件以上ある場合 -->
+<!--				<th>部署ID</th>-->
-    <table class="table-grid table-striped table-hover">
+				<th>部署名</th>
-        <thead>
+			</tr>
-        <tr>
+
-            <th style="width: 60px;">部署ID</th>
+			<!-- 検索結果を1件ずつ取り出して表示 -->
-            <th style="width: 100px;">部署名</th>
+			<tr th:each="departmentForm : ${departmentFormList}">
-            <th style="width: 150px;">操作</th>
+<!--				<td th:text="${departmentForm.idDepartment}"></td>-->
-        </tr>
+				<td th:text="${departmentForm.nmDepartment}"></td>
-        </thead>
+			</tr>
-        <tbody>
+		</table>
-        <tr th:each="departmentInfoForm : ${departmentFormList}">
+
-			
+	</div>
-            <td th:text="${departmentInfoForm.idDepartment}"></td>
-            <td th:text="${departmentInfoForm.nmDepartment}"></td>
-            <td>
-                <!-- 更新フォーム -->
-                <form action="showUpdateDepartment" method="post" style="display: inline;">
-                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
-                    <input type="submit" value="更新">
-                </form>
-                <!-- 削除フォーム -->
-                <form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
-                      style="display: inline;">
-                    <input name="idDepartment" th:value="${departmentInfoForm.idDepartment}">
-                    <input type="submit" value="削除">
-                </form>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-</th:block>
-<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
-    <!-- 検索結果が0件の場合 -->
-    検索結果はありません。
-</th:block>
 
 </body>
 <script type="text/javascript">
 
-    function clearInput() {
+	<!--  ★部署名の入力欄も空にする（id は th:field が自動で作る） -->
-        document.getElementById('idDepartment').value = '';
+	function clearInput() {
-        document.getElementById('nmDepartment').value = '';
+		document.getElementById('idDepartment').value = '';
-        document.getElementById('idDepartment').selectedIndex = 0;
+		document.getElementById('nmDepartment').value = '';
-    }
+	}
-
-
 </script>
+
 </html>

src/main/resources/templates/updateDepartmentInput.html

@@ -1,88 +1,12 @@
+// 実装手順書より
+
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html>
-
 <head>
-
+<meta charset="UTF-8">
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+<title>Insert title here</title>
-    <!-- 外部のスクリプトファイルを読み込む -->
-    <script th:src="@{/js/common.js}"></script>
-    <!-- CSSの読み込み -->
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-    <title>部署情報更新</title>
 </head>
-
 <body>
-<h1>
+
-    部署情報更新　　　
-    <div class="rightSection">
-        <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-        <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-    </div>
-</h1>
-<form action="/updateDepartmentResult"
-      method="post"
-      onsubmit="return confirm('本当によろしいですか？');"
-      th:object="${departmentFormList}"
- > 
-    <div class="msgBox error" th:if="${messageError != null}">
-        <span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
-    </div>
-    <table>
-        <tr>
-            <th class="header">部署ID</th>
-            <td>
-                <label>
-                    <input class="readOnly"
-                           readonly="readonly"
-                           th:field="*{idDepartment}"
-                           type="text"
-                    />
-                </label>
-            </td>
-        </tr>
-        <tr>
-            <th class="header">部署名</th>
-            <td>
-                <label>
-                    <input maxlength="50"
-                           placeholder="部署名"
-                           required="required"
-                           th:field="*{nmDepartment}"
-                           type="text"
-                    />
-                </label>
-            </td>
-        </tr>
-        <tr>
-            <td class="btnArea" colspan="2">
-                <input type="submit" value="更新"/>
-            </td>
-        </tr>
-    </table>
-</form>
-<a href="javascript:selectSubmit()">一覧に戻る</a>
 </body>
-
-<script>
-    function selectSubmit() {
-        const form = document.createElement('form');
-        form.setAttribute('method', 'post');
-        form.setAttribute('action', 'departmentAll');
-
-        // 動的送信用のHidden
-        // 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
-        const inputField = document.createElement("input");
-        inputField.setAttribute("type", "hidden");
-        inputField.setAttribute("value", "departmentAll");
-
-        form.appendChild(inputField);
-
-        // フォームをDOMに追加
-        document.body.appendChild(form);
-
-        form.submit();
-    }
-
-</script>
 </html>