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

.classpath

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

.gitignore

@@ -1,2 +0,0 @@
-/target/
-/bin/

.project

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>em-spring</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>

.settings/.jsdtscope

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry excluding="**/node_modules/*|**/*.min.js|**/bower_components/*" kind="src" path="target/m2e-wtp/web-resources"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

.settings/org.eclipse.core.resources.prefs

@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17

.settings/org.eclipse.wst.common.component

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="EM-Spring-0.0.1-SNAPSHOT">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="context-root" value="EM-Spring"/>
-        <property name="java-output-path" value="/em-spring/target/classes"/>
-    </wb-module>
-</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="17"/>
-  <installed facet="jst.web" version="4.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -1 +0,0 @@
-Window

.settings/org.eclipse.wst.validation.prefs

@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1

src/main/java/com/example/rhizome/app/domain/model/DepartmentInfo.java

@@ -1,25 +0,0 @@
-package com.example.rhizome.app.domain.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-//コピペのみ、部署用に修正必要
-
-/**
- * 部署情報の概念を表現するモデルクラスです。
- */
-
-@Getter
-@AllArgsConstructor
-
-public class DepartmentInfo {
-	/**
-     * 社員情報
-     */
-    private final Employee employee;
-    /**
-     * 部署名
-     */
-    private final Department department;
-
-}

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

@@ -1,5 +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

@@ -1,14 +1,25 @@
 package com.example.rhizome.app.domain.service;
 
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
 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);
 }

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

@@ -1,27 +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;
-
-//@Srviceをつけ忘れるとControllerで使うときに起動時エラーになってしまう
-@Service
-@Transactional
-public class DeleteDepartmentImpl implements DeleteDepartment {
-
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	public void deleteDepartment(Integer idDepartment) {
-		// ★考える：Repository のどのメソッドで「IDを指定して削除」できる？
-		//          （お手本の DeleteEmployeeImpl を見る）
-		departmentRepository.deleteById(idDepartment);
-	}
-}

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

@@ -1,17 +1,20 @@
 package com.example.rhizome.app.domain.service.impl;
 
 
-import com.example.rhizome.app.domain.model.Department;
+import java.util.List;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-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;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -79,4 +82,28 @@ public class SearchDepartmentImpl implements SearchDepartment {
                 );
 
     }
+
+	@Override
+	public List<Department> searchDepartmentBynmDepartment(String nmDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public List<Department> searchDepartmentByIdDepartment(Integer idDepartment) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public LoginUser searchLoginUser(String mailAddress) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
+
+	@Override
+	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
+		// TODO 自動生成されたメソッド・スタブ
+		return null;
+	}
 }

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

@@ -1,12 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import java.util.List;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-
-public interface SearchDepartmentInfo {
-	List<Department> selectAll();
-
-	List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
-}

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

@@ -1,59 +0,0 @@
-package com.example.rhizome.app.domain.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-import com.example.rhizome.app.infra.repository.DepartmentInfoRepository;
-
-/**
- * SearchDepartmentInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです
- */
-@Service
-@Transactional
-public class SearchDepartmentInfoImpl implements SearchDepartmentInfo {
-
-	DepartmentInfoRepository departmentInfoRepository;
-
-	@Autowired
-	public SearchDepartmentInfoImpl(DepartmentInfoRepository departmentInfoRepository) {
-		this.departmentInfoRepository = departmentInfoRepository;
-	}
-
-	/**
-	 * DepartmentInfo (employee join department) のレコードを全件取得
-	 *
-	 * @return 取得したレコード全件
-	 */
-	public List<Department> selectAll() {
-
-		return null;//EmployeeDepartmentEntity.createDepartmentInfoList(departmentInfoRepository.findAll());
-
-	}
-
-	/**
-	 * SearchConditionDepartment の情報を元に DepartmentInfo (employee join department) のレコードを取得
-	 *
-	 * @param searchConditionDepartment 検索条件
-	 * @return 検索結果のレコードリスト
-	 */
-	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
-		// 動的に検索条件を絞り込む
-		// Specification は Criteria API の Predicate をラップしたもの
-		return null;
-//				EmployeeDepartmentEntity
-//				.createDepartmentInfoList(
-//						departmentInfoRepository.findAll(Specification
-//								.where(EmployeeInfoRepository
-//										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-//								.and(EmployeeInfoRepository
-//										.idDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-//
-//						));
-
-	}
-}

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

@@ -1,17 +1,16 @@
 package com.example.rhizome.app.domain.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.example.rhizome.app.domain.model.EmployeeInfo;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * SearchEmployeeInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです

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

@@ -1,28 +1,16 @@
 package com.example.rhizome.app.infra.entity;
 
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
 import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.DepartmentInfo;
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * Employee + Department の Join 情報を保持するEntity
@@ -126,10 +114,5 @@ public class EmployeeDepartmentEntity {
 
     }
 
-	public static List<DepartmentInfo> createDepartmentInfoList(List<EmployeeDepartmentEntity> all) {
-		// TODO 自動生成されたメソッド・スタブ
-		return null;
-	}
-
 
 }

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

@@ -1,28 +0,0 @@
-package com.example.rhizome.app.infra.repository;
-
-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.EmployeeDepartmentEntity;
-
-@Repository
-public interface DepartmentInfoRepository
-		extends JpaRepository<EmployeeDepartmentEntity, Integer>, JpaSpecificationExecutor<EmployeeDepartmentEntity> {
-	static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-		return idDepartment == null ? null :
-		// 戻り値の型 Specification<EmployeeDepartmentEntity> にキャスト
-				(Specification<EmployeeDepartmentEntity>)
-				// ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
-				// を作成している
-				(root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
-	}
-
-	static Specification<EmployeeDepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
-				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
-	}
-
-}

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

@@ -1,12 +1,11 @@
 package com.example.rhizome.app.infra.repository;
 
+import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 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.EmployeeDepartmentEntity;
-
 /**
  * ワンポイント情報（ここで登場する関数型インターフェース Specification について解説します）
  * Specification:
@@ -54,9 +53,9 @@ public interface EmployeeInfoRepository extends JpaRepository<EmployeeDepartment
                         (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("mailAddress"), "%" + mailAddress + "%");
     }
 
-    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer integer) {
+    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
         return (root, query, criteriaBuilder) ->
-                integer == null ? null :
+                idDepartment == null ? null :
-                        criteriaBuilder.equal(root.join("department").get("idDepartment"), integer);
+                        criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
     }
 }

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

@@ -1,79 +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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-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.TransitionTargetPageNameKeyword;
-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(HttpSession httpSession, DeleteDepartment deleteDepartment,
-			SearchDepartment searchDepartment, SearchEmployee searchEmployee) {
-		this.httpSession = httpSession;
-		this.deleteDepartment = deleteDepartment;
-		this.searchDepartment = searchDepartment;
-		this.searchEmployee = searchEmployee;
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.DELETE_DEPARTMENT, method = RequestMethod.POST)
-	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
-			Model model) {
-
-		final String UNKNOWN_ID = "削除対象のIDが不明です。";
-		final String HAS_EMPLOYEE = "1名以上が所属している部署は削除出来ません。";
-		final String DELETE_COMPLETE = "削除しました。";
-
-		try {
-			// ★① idDepartment が null、または searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) が空
-			//     → MESSAGE_ERROR に UNKNOWN_ID を載せて一覧へ
-			if (idDepartment == null
-					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)).isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			}
-			// ★② searchEmployee.searchEmployeeByIdDepartment(idDepartment) が空でない
-			//     → MESSAGE_ERROR に HAS_EMPLOYEE を載せて一覧へ
-			if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-			}
-			// ★③ deleteDepartment.deleteDepartment(idDepartment) → MESSAGE_INFO に DELETE_COMPLETE を載せて一覧へ
-			deleteDepartment.deleteDepartment(idDepartment);
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-
-			//以下がメッセージの載せ方
-			//model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-			return "一覧へ戻る（ステップ 2-5 で決める）";
-		} 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/DeleteEmployeeController.java

@@ -9,7 +9,7 @@ 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.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-import com.example.rhizome.app.presentation.form.DepartmentInfoForm;
+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;
@@ -66,7 +66,7 @@ public class DeleteEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 削除処理実施

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.DepartmentInfoForm;
+//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,
+//            // 作成した部署一覧をセット
-                    DepartmentInfoForm.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;
@@ -8,23 +24,9 @@ import com.example.rhizome.app.domain.service.impl.RegisterEmployeeImpl;
 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.DepartmentInfoForm;
+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;
 
 /**
  * 新規登録用のコントローラ
@@ -71,7 +73,7 @@ public class InsertEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(
+                    DepartmentForm.convertFrom(
                             searchDepartment.selectAll()
                     ));
 
@@ -193,6 +195,3 @@ public class InsertEmployeeController {
     }
 
 }
-
-
-

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

@@ -6,7 +6,7 @@ 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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,7 +64,7 @@ public class InsertEmployeeInputController {
 
         try {
             // 部署コードリストを作成し、画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // パラメータをセット
             model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);

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

@@ -1,79 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-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.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.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
-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;
-
-	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-	}
-
-	/** 空の検索条件Formを、この Controller の画面用に用意する */
-	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, method = RequestMethod.POST)
-	public String select(SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-		try {
-			// ★考える：①検索サービスを呼ぶ（Form→Model変換 → 部分一致のメソッド）
-			//          ②結果(List<Department>)を DepartmentForm.convertFrom(...) で画面用に変換
-			//          ③ model に PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST という名前で載せる
-			SearchConditionDepartment searchCondition = new SearchConditionDepartment(
-					searchConditionDepartmentForm.getIdDepartment(),
-					searchConditionDepartmentForm.getNmDepartment());
-			List<Department> departmentList = searchDepartment.searchByWithLike(searchCondition);
-			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, departmentList);
-
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
-
-		} catch (Exception e) {
-			httpSession.invalidate();
-			e.printStackTrace();
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY, method = RequestMethod.POST)
-	public String select(Model model) {
-		try {
-			// ★全件取得 → DepartmentForm に変換 → DEPARTMENT_FORM_LIST で model へ
-			return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_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/SelectEmployeeController.java

@@ -1,27 +1,24 @@
 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.PostMapping;
-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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
+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.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
@@ -59,7 +56,7 @@ public class SelectEmployeeController {
      */
     @PermissionCheck
     @SessionCheck
-    @PostMapping(TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO)
+    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO, method = RequestMethod.POST)
     public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
 
         try {
@@ -68,7 +65,7 @@ public class SelectEmployeeController {
             // 作成した部署一覧をセット
             model.addAttribute(
                     PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                    DepartmentForm.convertFrom(searchDepartment.selectAll())
             );
 
             // 検索条件を元に検索を実施
@@ -108,7 +105,7 @@ public class SelectEmployeeController {
         // 作成した部署一覧をセット
         model.addAttribute(
                 PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentInfoForm.convertFrom(searchDepartment.selectAll())
+                DepartmentForm.convertFrom(searchDepartment.selectAll())
         );
 
         // 検索条件を元に検索を実施

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

@@ -8,7 +8,7 @@ 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.DepartmentInfoForm;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -67,7 +67,7 @@ public class UpdateEmployeeController {
 
         try {
             // 部署一覧を取得し画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // id を条件に更新対象のレコードを検索、取得する
             List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(

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

@@ -11,7 +11,7 @@ import com.example.rhizome.app.domain.service.UpdateEmployee;
 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.DepartmentInfoForm;
+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 com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
@@ -91,7 +91,7 @@ public class UpdateEmployeeResultController {
         try {
 
             // 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentInfoForm.convertFrom(searchDepartment.selectAll()));
+            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
             // パスワードが仕様を満たしているか確認
             String error = UpdateEmployeeInfoForm.validatePassword(

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

@@ -14,6 +14,7 @@ public class PageReturnAttributeKeyword {
     public static final String LOGIN_INFO_FORM = "loginInfoForm";
     public static final String UPDATE_PERSONAL_EMPLOYEE_USER_FORM = "updatePersonalEmployeeUserForm";
     public static final String EMPLOYEE_INFO_FORM_LIST = "employeeInfoFormList";
-	//追加
+    
 	public static final String DEPARTMENT_INFO_FORM_LIST = "departmentInfoFormList";
+
 }

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

@@ -45,13 +45,18 @@ public class TransitionTargetPageNameKeyword {
     public static final String SHOW_UPDATE_EMPLOYEE = "/showUpdateEmployee";
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
+	public static final String SELECT_DEPARTMENT_INFO = "/selectEmployeeInfo";
+	public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
+
+	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
+
+
     // Department
     // HTML
 	public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
+	
     // Controller
 	public static final String SELECT_DEPARTMENT = "/selectDepartment";
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
 
     /**
      * 管理者向けのページリストを返す
@@ -74,7 +79,8 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
-				UPDATE_EMPLOYEE_RESULT);
+                UPDATE_EMPLOYEE_RESULT
+        );
     }
 
     /**
@@ -89,7 +95,8 @@ public class TransitionTargetPageNameKeyword {
                 INDEX_LOGIN,
                 LOGOUT,
                 DO_LOGIN,
-				PERSONAL_UPDATE_RESULT);
+                PERSONAL_UPDATE_RESULT
+        );
     }
 
 }

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

@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DepartmentInfoForm {
+public class DepartmentForm {
     /**
      * 部署ID
      */
@@ -30,8 +30,8 @@ public class DepartmentInfoForm {
      * @param department business 層の Department インスタンス
      * @return 画面用（presentation 層）の DepartmentForm インスタンス
      */
-    public static DepartmentInfoForm convertFrom(Department department) {
+    public static DepartmentForm convertFrom(Department department) {
-        return new DepartmentInfoForm(department.getIdDepartment(), department.getNmDepartment());
+        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
     }
 
     /**
@@ -41,7 +41,7 @@ public class DepartmentInfoForm {
      * @param departmentList business 層の Department インスタンスのリスト
      * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
      */
-    public static List<DepartmentInfoForm> convertFrom(List<Department> departmentList) {
+    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentInfoForm::convertFrom).toList();
+        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
     }
 }

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

@@ -1,40 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-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 convertTo(SearchConditionDepartmentForm form) {
-		return new SearchConditionDepartmentForm(
-				//getterで取得した部署IDを渡す
-				form.getIdDepartment(),
-				//getterで取得した部署名を渡す
-				form.getNmDepartment());
-	}
-
-}

src/main/resources/templates/insertDpartmentInput.html

@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-	<meta charset="UTF-8">
-	<title>Insert title here</title>
-</head>
-
-<body>
-	<!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>
-					<th class="header">所属部署</th>
-					<td>
-						<label>
-							<select required="required" th:field="*{idDepartment}">
-								<option th:each="department : ${departmentFormList}"
-									th:selected="${insertDepartmentForm.idDepartment != null && department.idDepartment == insertDepartmentForm.idDepartment}"
-									th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
-								</option>
-							</select>
-						</label>
-					</td>
-				</tr>
-				<tr>
-					<td class="btnArea" colspan="2">
-						<input type="submit" value="登録確認" />
-					</td>
-				</tr>
-			</table>
-		</form>
-		<a href="showMenu">メニューに戻る</a>
-	</body>
-
-	</html>
-</body>
-
-</html>

src/main/resources/templates/menu.html

@@ -14,14 +14,14 @@
 </head>
 
 <body>
-	<h1>
+<h1>
     メインメニュー　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
     </div>
-	</h1>
+</h1>
-	<table class="menuClass">
+<table class="menuClass">
     <tr>
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
@@ -33,19 +33,22 @@
         <td class="description">新規でユーザ追加を行います。</td>
     </tr>
 	
-		<!--部署検索機能表示-->
+	<!-- 追記 -->
 	<tr>
 		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
 		</td>
 		<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
 	</tr>
+	<tr>
+		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署登録 </a>
+		</td>
+		<td class="description">新規で部署追加を行います。</td>
+	</tr>
 
-	</table>
+</table>
+</body>
 
-
+<script type="text/javascript">
-
-
-	<script type="text/javascript">
     function selectEmployeeSubmit() {
         const form = document.createElement('form');
         form.setAttribute('method', 'post');
@@ -121,6 +124,6 @@
 
         form.submit();
     }
-	</script>
+</script>
 
 </html>

src/main/resources/templates/selectDepartment.html

@@ -25,11 +25,16 @@
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
-				<td><input placeholder="部署ID" th:field="*{idDepartment}" type="number" /></td>
+				<td>
+					<input placeholder="部署ID" th:field="*{idDepartment}" type="number" />
+				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
-				<td><input placeholder="部署名" th:field="*{nmDepartment}" type="text" /></td>
+				<!-- ★部署名の入力欄（type="text"）を作る -->
+				<td>
+					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
+				</td>
 			</tr>
 			<tr>
 				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
@@ -41,46 +46,29 @@
 	<a href="showMenu">メニューに戻る</a>
 	<h1><span>検索結果</span></h1>
 
-	<!-- 【修正】th:ifのリスト名を controller と一致させる -->
+	<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
-	<table class="table-grid table-striped table-hover"
+	<!-- departmentFormListから要素を順番に取り出す -->
-		th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+	<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}">
-		<thead>
+
+		<table>
 			<tr>
-				<th style="width: 60px;">部署ID</th>
+<!--				<th>部署ID</th>-->
-				<th style="width: 100px;">部署名</th>
+				<th>部署名</th>
-				<th style="width: 150px;">操作</th>
 			</tr>
-		</thead>
+
-		<tbody>
+			<!-- 検索結果を1件ずつ取り出して表示 -->
-			<!-- 【修正】ループ内で使う変数名を departmentForm に統一 -->
 			<tr th:each="departmentForm : ${departmentFormList}">
-				<td th:text="${departmentForm.idDepartment}"></td>
+<!--				<td th:text="${departmentForm.idDepartment}"></td>-->
 				<td th:text="${departmentForm.nmDepartment}"></td>
-				<td>
-					<!-- 更新フォーム -->
-					<form action="showUpdate" method="post" style="display: inline;">
-						<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-						<input type="submit" value="更新">
-					</form>
-					<!-- 削除フォーム -->
-					<form action="deleteDepartment" method="post" onsubmit="return confirm('本当に削除しますか？');"
-						style="display: inline;">
-						<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-						<input type="submit" value="削除">
-					</form>
-				</td>
 			</tr>
-		</tbody>
 		</table>
 
-	<!-- 0件の時にメッセージを表示 -->
+	</div>
-	<th:block th:if="${departmentFormList != null and departmentFormList.size() == 0}">
-		<p>検索結果はありません</p>
-	</th:block>
 
 </body>
-
 <script type="text/javascript">
+
+	<!--  ★部署名の入力欄も空にする（id は th:field が自動で作る） -->
 	function clearInput() {
 		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';

src/main/resources/templates/selectEmployee.html

@@ -12,16 +12,17 @@
     <title>検索</title>
 
 </head>
-
 <body>
-	<h1>
+<h1>
     検索条件入力　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
     </div>
-	</h1>
+</h1>
-	<form action="selectEmployeeInfo" method="post" th:object="${searchConditionEmployeeForm}">
+<form action="selectEmployeeInfo"
+      method="post"
+      th:object="${searchConditionEmployeeForm}">
 
     <div class="msgBox error" th:if="${messageError} != null">
         <span class="error" th:text="${messageError.message}"></span>
@@ -30,25 +31,34 @@
         <tr>
             <th class="header">社員ID</th>
             <td>
-					<input placeholder="社員ID" th:field="*{idEmployee}" type="number" />
+                <input placeholder="社員ID"
+                       th:field="*{idEmployee}"
+                       type="number"/>
             </td>
         </tr>
         <tr>
             <th class="header">社員名</th>
             <td>
-					<input placeholder="社員名" th:field="*{nmEmployee}" type="text" />
+                <input placeholder="社員名"
+                       th:field="*{nmEmployee}"
+                       type="text"/>
             </td>
         </tr>
         <tr>
             <th class="header">社員名フリガナ</th>
             <td>
-					<input oninput="convertToKatakana(this)" placeholder="フリガナ" th:field="*{knEmployee}" type="text" />
+                <input oninput="convertToKatakana(this)"
+                       placeholder="フリガナ"
+                       th:field="*{knEmployee}"
+                       type="text"/>
             </td>
         </tr>
         <tr>
             <th class="header">メールアドレス</th>
             <td>
-					<input placeholder="メールアドレス" th:field="*{mailAddress}" type="email" />
+                <input placeholder="メールアドレス"
+                       th:field="*{mailAddress}"
+                       type="email"/>
             </td>
         </tr>
         <tr>
@@ -58,34 +68,34 @@
                     <option value=""></option>
                     <option th:each="department : ${departmentFormList}"
                             th:selected="${searchConditionEmployeeForm.idDepartment != null && department.idDepartment == searchConditionEmployeeForm.idDepartment}"
-							th:text="${department.nmDepartment}" th:value="${department.idDepartment}">
+                            th:text="${department.nmDepartment}"
+                            th:value="${department.idDepartment}">
                     </option>
                 </select>
             </td>
         </tr>
         <tr>
             <td class="btnArea" colspan="2">
-					<input type="submit" value="検索" />
+                <input type="submit" value="検索"/>
             </td>
             <td class="btnArea" colspan="2">
                 <button onclick="clearInput()">クリア</button>
             </td>
         </tr>
     </table>
-	</form>
+</form>
-
+<div class="header-spacing"></div>
-	<div class="header-spacing"></div>
+<a href="showMenu">メニューに戻る</a>
-	<a href="showMenu">メニューに戻る</a>
+<div class="header-spacing"></div>
-	<div class="header-spacing"></div>
+<h1><span>検索結果</span></h1>
-	<h1><span>検索結果</span></h1>
+<div class="header-spacing"></div>
-	<div class="header-spacing"></div>
+<th:block th:if="${messageInfo != null}">
-	<th:block th:if="${messageInfo != null}">
     <script th:inline="javascript">
         alert([[${messageInfo.message}]]);
     </script>
-	</th:block>
+</th:block>
-	<div class="header-spacing"></div>
+<div class="header-spacing"></div>
-	<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
+<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
     <!-- 検索結果が1件以上ある場合 -->
     <table class="table-grid table-striped table-hover">
         <thead>
@@ -125,22 +135,23 @@
         </tr>
         </tbody>
     </table>
-	</th:block>
+</th:block>
-	<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
+<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
     <!-- 検索結果が0件の場合 -->
     検索結果はありません。
-	</th:block>
+</th:block>
 
 </body>
-
 <script type="text/javascript">
 
     function clearInput() {
-		document.getElementById('idDepartment').value = '';
+        document.getElementById('idEmployee').value = '';
-		document.getElementById('nmDepartment').value = '';
+        document.getElementById('nmEmployee').value = '';
+        document.getElementById('knEmployee').value = '';
+        document.getElementById('mailAddress').value = '';
+        document.getElementById('idDepartment').selectedIndex = 0;
     }
 
 
 </script>
-
 </html>

src/main/resources/templates/updateDepartmentInput.html

@@ -0,0 +1,12 @@
+// 実装手順書より
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>