第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 +0,0 @@
-/target/

.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/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

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

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

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

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

@@ -1,32 +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 削除対象のidDepartmnet
-	 */
-	public void deleteDepartment(Integer idDepartment) {
-		departmentRepository.deleteById(idDepartment);
-	}
-}

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

@@ -1,34 +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;
-	}
-
-	/**
-	 * employee インスタンスの内容を登録する
-	 *
-	 * @param employee 登録対象のデータ
-	 */
-	public void registerDepartment(Department department) {
-		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;
@@ -16,11 +17,12 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 /**
- * Department テーブル検索系の機能を集約させるサービスクラスです。
+ * 部署情報検索系の機能を集約させるサービスクラスです。
  */
 @Service
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
+
     DepartmentRepository departmentRepository;
 
     /**
@@ -54,10 +56,10 @@ public class SearchDepartmentImpl implements SearchDepartment {
         return DepartmentEntity
                 .createDepartmentList(
                         departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
+                );
 
     }
 
@@ -74,13 +76,25 @@ public class SearchDepartmentImpl implements SearchDepartment {
         return DepartmentEntity
                 .createDepartmentList(
                         departmentRepository.findAll(Specification
-								.where(DepartmentRepository
+                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
-								.and(DepartmentRepository
+                        )
-										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
+                );
 
     }
 
+	@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 自動生成されたメソッド・スタブ
@@ -92,5 +106,4 @@ public class SearchDepartmentImpl implements SearchDepartment {
 		// TODO 自動生成されたメソッド・スタブ
 		return null;
 	}
-
 }

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

@@ -1,26 +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.infra.entity.DepartmentEntity;
-import com.example.rhizome.app.infra.repository.DepartmentRepository;
-
-@Service
-@Transactional
-public class UpdateDepartmentImpl {
-	DepartmentRepository departmentRepository;
-
-	@Autowired
-	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
-		this.departmentRepository = departmentRepository;
-	}
-
-	public void updateDepartment(Department department) {
-		// ★考える：Model を Entity に変換（DepartmentEntity.convertFrom）して、Repository の save に渡す
-		departmentRepository.save(DepartmentEntity.convertFrom(department));
-	}
-
-}

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

@@ -1,120 +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.DepartmentForm;
-import com.example.rhizome.app.presentation.form.MessageForm;
-
-/**
- * 削除処理のコントロータ
- */
-@Controller
-public class DeleteDepartmentController {
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.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 遷移先の画面
-	 */
-
-	@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が不明です。";
-
-		try {
-			// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-			// 作成した部署一覧をセット
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-			if (idDepartment == null
-					|| searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) == null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UNKNOWN_ID));
-			}
-
-			// 削除処理実施
-			deleteExec(model, idDepartment);
-
-			// 検索画面に遷移
-			return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
-
-		} catch (Exception e) {
-			// ログイン情報の破棄
-			httpSession.invalidate();
-			e.printStackTrace();
-			// エラーログ出力
-			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-			// エラー画面遷移
-			return TransitionTargetPageNameKeyword.ERROR_HTML;
-		}
-	}
-
-	/**
-	 * 削除処理実施
-	 *
-	 * @param model      ビューにデータを渡すためのコンテナ
-	 * @param idEmployee 削除対象のDepartmentId
-	 */
-	private void deleteExec(Model model, Integer idDepartment) {
-
-		final String DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE = "1名以上が所属している部署は削除出来ません。";
-		final String DELETE_COMPLETE = "削除しました。";
-
-		// 削除対象部署が1名以上所属しているかチェック
-		if (!searchEmployee.searchEmployeeByIdDepartment(idDepartment).isEmpty()) {
-			// 削除対象だった場合
-			// エラーメッセージをセット
-			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-					new MessageForm(DELETE_DPARTMENT_TARGET_ID_CAN_NOT_DELETE));
-			// 検索画面に遷移
-			return;
-		}
-
-		// 削除を実施
-		deleteDepartment.deleteDepartment(idDepartment);
-
-		// 削除完了したメッセージをセット
-		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-
-	}
-}

src/main/java/com/example/rhizome/app/presentation/controller/InsertDepartmentController.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.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.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(InsertEmployeeController.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();
-	}
-
-	@RequestMapping(value = INSERT_DEPARTMENT_INPUT, method = RequestMethod.POST)
-	public String insertDepartment(InsertDepartmentForm insertDepartmentForm, Model model) {
-		try {
-			model.addAttribute(
-					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-					DepartmentForm.convertFrom(
-							searchDepartment.selectAll()));
-			List<String> error2 = validateParameter2(
-					insertDepartmentForm.getIdDepartment(),
-					insertDepartmentForm.getNmDepartment());
-
-			// エラーが1件以上有る場合
-			if (!error2.isEmpty()) {
-				// エラー内容を画面に表示
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(String.join(", ", error2) + "が不正です。"));
-				// 登録画面に遷移
-				return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-			}
-
-			// 登録処理
-			registerDepartment.registerDepartment(InsertDepartmentForm.convertToo(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;
-		}
-	}
-
-	private List<String> validateParameter2(
-
-			Integer departmentId,
-			String departmentNm) {
-
-		final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
-		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
-
-		List<String> error2 = new ArrayList<>();
-
-		// null or 空文字判定
-		if (departmentId == null) {
-			// エラー内容を追加
-			error2.add(DEPARTMENT_ID_NULL_BLANK);
-		}
-
-		// null or 空文字判定
-		if (isNullOrBlank(departmentNm)) {
-			// エラー内容を追加
-			error2.add(DEPARTMENT_NAME_NULL_BLANK);
-		}
-		
-		return error2;
-	}
-
-	private static boolean isNullOrBlank(String str) {
-		if (null == str) {
-			return true;
-		}
-
-		return str.isBlank();
-	}
-}

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,123 +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.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;
-
-	@Autowired
-	public SelectDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@ModelAttribute
-	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
-		return new SearchConditionDepartmentForm();
-	}
-
-	/**
-	 * 部署検索画面表示処理コントローラ
-	 *
-	 * @param searchConditionEmployeeForm 検索画面のフォーム
-	 * @param model                       ビューにデータを渡すためのコンテナ
-	 * @return 遷移先の画面
-	 */
-	@PermissionCheck
-	@SessionCheck
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_DEPARTMENT, 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.searchBy(SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm))));
-			//部分一致検索
-			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_FORM_EMPTY, method = RequestMethod.POST)
-	public String select(Model model) {
-
-		// 部署一覧を取得し、画面に返す用のクラスに詰め替える
-		// 作成した部署一覧をセット
-		model.addAttribute(
-				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(searchDepartment.selectAll()));
-
-		// 検索条件を元に検索を実施
-		//		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-		//				DepartmentForm.convertFrom(
-		//						searchDepartment.searchBy(
-		//								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
-
-		//部分一致検索
-		model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-				DepartmentForm.convertFrom(
-						searchDepartment.searchByWithLike(
-								SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm()))));
-		// 検索ページに遷移
-		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.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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.model.SearchConditionDepartment;
-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.MessageForm;
-import com.example.rhizome.app.presentation.form.UpdateDepartmentForm;
-
-@Controller
-public class UpdateDepartmentController {
-
-	// ログ出力用インスタンス
-	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-	// エラーメッセージ用の定数フィールド
-	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-
-	HttpSession httpSession;
-	RegisterDepartment registerDepartment;
-	SearchDepartment searchDepartment;
-
-	@Autowired
-	public UpdateDepartmentController(HttpSession httpSession, RegisterDepartmentImpl registerDepartment,
-			SearchDepartmentImpl searchDepartment) {
-		this.httpSession = httpSession;
-		this.registerDepartment = registerDepartment;
-		this.searchDepartment = searchDepartment;
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_DEPARTMENT, method = RequestMethod.POST)
-	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
-		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-		try {
-			// ★① searchDepartment.searchBy(new SearchConditionDepartment(idDepartment, null)) で対象を検索
-			// ★② 結果が空なら MESSAGE_ERROR を載せて "forward:" + SELECT_DEPARTMENT_FORM_EMPTY
-			// ★③ あれば UpdateDepartmentForm.convertFrom(結果の先頭) を
-			//     UPDATE_DEPARTMENT_FORM という名前で model に載せ、UPDATE_DEPARTMENT_INPUT_HTML を返す
-			List<Department> DepartmentList = searchDepartment.searchBy(
-					new SearchConditionDepartment(idDepartment, null));
-
-			// DBに更新対象のデータがあるか
-			if (DepartmentList.isEmpty()) {
-				// ない場合はエラーメッセージをセットして検索画面に戻る
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_FORM_EMPTY;
-			}
-			// 更新画面に遷移
-			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
-					UpdateDepartmentForm.convertFrom(DepartmentList.get(0)));
-
-			// 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,97 +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.app.domain.service.SearchDepartment;
-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.UpdateDepartmentForm;
-
-@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;
-	UpdateDepartment updateDepartment;
-
-	@Autowired
-	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
-			UpdateDepartment updateDepartment) {
-		this.httpSession = httpSession;
-		this.searchDepartment = searchDepartment;
-		this.updateDepartment = updateDepartment;
-	}
-
-	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_RESULT, method = RequestMethod.POST)
-	public String departmentUpdateResult(@ModelAttribute UpdateDepartmentForm updateDepartmentForm, Model model) {
-
-		final String NOTHING = "項目が空欄です。";
-		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
-		final String NO_TARGET = "更新対象のデータが見つかりません。";
-		final String UPDATE_COMPLETE = "更新が完了しました。";
-
-		try {
-			
-			// 部署一覧取得
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
-			
-            
-           updateDepartmentForm.hasRequiredValue();
-           
-			if(updateDepartmentForm.hasRequiredValue() == false) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			
-			if(searchDepartment.searchBy(null) != null){
-				// 存在する場合はエラーメッセージを設定して更新入力画面に遷移
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-			
-			
-			if(searchDepartment.searchBy(null) != null) {
-				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
-				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM, updateDepartmentForm);
-				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
-			}
-
-			 // 更新結果のメッセージを画面にセットし一覧画面に遷移
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-
-            // forward 先で不用意な動作をしないために UpdateEmployeeInfoForm をクリア
-            return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_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

@@ -9,11 +9,12 @@ public class PageReturnAttributeKeyword {
     public static final String MESSAGE_INFO = "messageInfo";
 
     public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
-    public static final String UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
     public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
     public static final String INSERT_EMPLOYEE_FORM = "insertEmployeeForm";
     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,21 +45,19 @@ 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";
-	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 = "/selectDepartment";
-	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectAll2";
+	public static final String SELECT_DEPARTMENT_FORM_EMPTY = "/selectDepartmentAll";
-	public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
-	public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
-	public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
-	public static final String DELETE_DEPARTMENT = "/deleteDepartment";
 	
     /**
      * 管理者向けのページリストを返す
@@ -82,13 +80,8 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
-				UPDATE_EMPLOYEE_RESULT,
+                UPDATE_EMPLOYEE_RESULT
-				SELECT_DEPARTMENT,
+        );
-				SELECT_DEPARTMENT_FORM_EMPTY,
-				INSERT_DEPARTMENT_INPUT,
-				SHOW_UPDATE_DEPARTMENT,
-				SHOW_UPDATE_DEPARTMENT);
-
     }
 
     /**
@@ -103,7 +96,8 @@ public class TransitionTargetPageNameKeyword {
                 INDEX_LOGIN,
                 LOGOUT,
                 DO_LOGIN,
-				PERSONAL_UPDATE_RESULT);
+                PERSONAL_UPDATE_RESULT
+        );
     }
 
 }

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

@@ -1,24 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-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 nmEmployee;
-
-	private Integer idDepartment;
-
-	private String nmDepartment;
-
-	public static Department convertToo(InsertDepartmentForm insertDepartmentForm) {
-		return new Department(
-				insertDepartmentForm.getIdDepartment(),
-				insertDepartmentForm.getNmDepartment());
-	}
-}

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

@@ -1,43 +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;
-
-	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
-	        return new SearchConditionDepartmentForm(
-	                searchConditionDepartment.getIdDepartment(),
-	                searchConditionDepartment.getNmDepartment()
-	        );
-	    }
-
-	/**
-	     * 画面用（presentation 層）の SearchConditionEmployeeForm クラスから business 層の SearchConditionEmployee クラスに
-	     * 変換します。
-	     *
-	     * @param searchConditionEmployeeForm 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
-	     * @return business 層の SearchConditionEmployee インスタンス
-	     */
-	    public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
-	        return new SearchConditionDepartment(
-	        		 searchConditionDepartmentForm.getIdDepartment(),
-		             searchConditionDepartmentForm.getNmDepartment()
-	        );
-	    }
-}

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

@@ -1,32 +0,0 @@
-package com.example.rhizome.app.presentation.form;
-
-import com.example.rhizome.app.domain.model.Department;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpdateDepartmentForm {
-	private Integer idDepartment;
-	private String nmDepartment;
-
-	/** Model(Department) → Form */
-	public static UpdateDepartmentForm convertFrom(Department department) {
-		return new UpdateDepartmentForm(department.getIdDepartment(), department.getNmDepartment());
-	}
-
-	/** Form → Model(Department) */
-	public static Department convertTo(UpdateDepartmentForm form) {
-		return new Department(form.getIdDepartment(), form.getNmDepartment());
-	}
-
-	/** 必須チェック。true：OK／false：部署ID か部署名が空 */
-	public boolean hasRequiredValue() {
-		// ★考える：idDepartment が null でなく、nmDepartment が null でも空白だけでもない
-		if(idDepartment != null && nmDepartment.isBlank() && nmDepartment.isEmpty());
-		return false;
-	}
-}

src/main/resources/templates/insertDepartmentConfirm.html

@@ -1,18 +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>
-
-</body>
-
-</html>

src/main/resources/templates/insertDepartmentInput.html

@@ -1,56 +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="insertDepatmentConfirm" 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,18 +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>
-
-</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,18 +33,19 @@
         <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:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
+		<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">

src/main/resources/templates/selectDepartment.html

@@ -3,9 +3,7 @@
 
 <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>
@@ -13,14 +11,14 @@
 
 <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="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
 
+	<form action="selectDepartment" method="post" th:object="${searchConditionDepartmentForm}">
 		<div class="msgBox error" th:if="${messageError} != null">
 			<span class="error" th:text="${messageError.message}"></span>
 		</div>
@@ -33,77 +31,48 @@
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
+				<!-- ★部署名の入力欄（type="text"）を作る -->
 				<td>
 					<input placeholder="部署名" th:field="*{nmDepartment}" type="text" />
 				</td>
 			</tr>
 			<tr>
-				<td class="btnArea" colspan="2">
+				<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
-					<input type="submit" value="検索" />
+				<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
-				</td>
-				<td class="btnArea" colspan="2">
-					<button onclick="clearInput()">クリア</button>
-				</td>
 			</tr>
 		</table>
 	</form>
-	<div class="header-spacing"></div>
-	<a href="showMenu">メニューに戻る</a>
-	<div class="header-spacing"></div>
-	<h1><span>検索結果</span></h1>
-	<div class="header-spacing"></div>
-	<th:block th:if="${messageInfo != null}">
-		<script th:inline="javascript">
-			alert([[${messageInfo.message}]]);
-		</script>
-	</th:block>
 
-	<div class="header-spacing"></div>
+	<a href="showMenu">メニューに戻る</a>
-	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+	<h1><span>検索結果</span></h1>
-		<!-- 検索結果が1件以上ある場合 -->
+
-		<table class="table-grid table-striped table-hover">
+	<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
-			<thead>
+	<!-- departmentFormListから要素を順番に取り出す -->
+	<div th:if="${departmentFormList !=null and departmentFormList.size()> 0}">
+
+		<table>
 			<tr>
-					<th style="width: 150px;">部署ID</th>
+<!--				<th>部署ID</th>-->
-					<th style="width: 280px;">部署名</th>
+				<th>部署名</th>
-					<th style="width: 500px;">操作</th>
 			</tr>
-			</thead>
+
-			<tbody>
+			<!-- 検索結果を1件ずつ取り出して表示 -->
 			<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="showUpdateDepartment" 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>
-	</th:block>
+
-	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+	</div>
-		<!-- 検索結果が0件の場合 -->
-		検索結果はありません。
-	</th:block>
 
 </body>
 <script type="text/javascript">
 
+	<!--  ★部署名の入力欄も空にする（id は th:field が自動で作る） -->
 	function clearInput() {
-		document.getElementById('idDepartment').selectedIndex = 0;
+		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';
 	}
-
-
 </script>
 
 </html>

src/main/resources/templates/updateDepartmentInput.html

@@ -1,59 +1,12 @@
+// 実装手順書より
+
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html>
-
 <head>
-	<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+<meta charset="UTF-8">
-	<!-- 外部のスクリプトファイルを読み込む -->
+<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="${updateDepartmentForm}">
 
-		<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>
-					<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
-				</td>
-			</tr>
-			<tr>
-				<th class="header">部署名</th>
-				<td>
-					<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
-						type="text" />
-				</td>
-			</tr>
-			<tr>
-				<td class="btnArea" colspan="2"><input type="submit" value="更新" /></td>
-			</tr>
-		</table>
-	</form>
-	<a href="javascript:selectDepartmentSubmit()">一覧に戻る</a>
-	<script type="text/javascript">
-		function selectDepartmentSubmit() {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'selectDepartment');
-			document.body.appendChild(form);
-			form.submit();
-		}
-	</script>
 </body>
-
 </html>