3段階目終了

.gitignore

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

.project

@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

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

@@ -7,5 +7,5 @@ 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=disabled
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17

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

@@ -0,0 +1,10 @@
+<?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>

pom.xml

@@ -20,12 +20,6 @@
         <lombok.version>1.18.34</lombok.version>
     </properties>
     <dependencies>
-    	<dependency>
-	    	<groupId>org.projectlombok</groupId>
-    		<artifactId>lombok</artifactId>
-    		<version>1.18.30</version>
-    		<scope>provided</scope>
-		</dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

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

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

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

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

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

@@ -2,6 +2,7 @@ package com.example.rhizome.app.domain.service;
 
 import com.example.rhizome.app.domain.model.Department;
 
+
 public interface RegisterDepartment {
     void registerDepartment(Department department);
 }

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

@@ -1,29 +1,26 @@
-package com.example.rhizome.app.domain.service.impl;
+package com.example.rhizome.app.domain.service;
 
 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.InsertDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 @Service
 @Transactional
-public class InsertDepartmentImpl implements InsertDepartment {
+public class RegisterDepartmentImpl implements RegisterDepartment {
 	
 	DepartmentRepository departmentRepository;
 	
 	@Autowired
-	public InsertDepartmentImpl(DepartmentRepository departmentRepository) {
+	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
 		this.departmentRepository = departmentRepository;
 	}
 	
-	@Override
+	public void registerDepartment(Department department) {
-	public void insert(Department department) {
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
-		DepartmentEntity entity = new DepartmentEntity();
-		entity.setNmDepartment(department.getNmDepartment());
-		departmentRepository.save(entity);
 	}
+
 }

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

@@ -1,16 +1,14 @@
 package com.example.rhizome.app.domain.service;
 
-import java.util.List;
-
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 
+import java.util.List;
+
 public interface SearchDepartment {
     List<Department> selectAll();
 
     List<Department> searchBy(SearchConditionDepartment searchConditionDepartment);
 
     List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment);
-
-	Department searchById(Integer idDepartment);
 }

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

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

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

@@ -3,5 +3,6 @@ package com.example.rhizome.app.domain.service;
 import com.example.rhizome.app.domain.model.Department;
 
 public interface UpdateDepartment {
-    void update(Department department);
+	void updateDepartment(Department beforeDepartment, Department updateDepertment);
+
 }

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

@@ -2,19 +2,25 @@ 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;
 
 @Service
+@Transactional
 public class DeleteDepartmentImpl implements DeleteDepartment {
 
+	DepartmentRepository departmentRepository;
 	@Autowired
-    private DepartmentRepository departmentRepository;
+	public DeleteDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
 	
-    @Override
+	
-    public void delete(Integer idDepartment) {
+	public void deleteDepartment(Integer idDepartment) {
-        // JpaRepository တွင်ပါရှိသော deleteById ကို အသုံးပြု၍ ဖယ်ရှားရန်
 		departmentRepository.deleteById(idDepartment);
+
 	}
+
 }

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

@@ -1,18 +1,17 @@
 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.Department;
 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;
 
 /**
  * 部署情報検索系の機能を集約させるサービスクラスです。
@@ -79,22 +78,5 @@ public class SearchDepartmentImpl implements SearchDepartment {
                         )
                 );
 
-    }
-
-	@Override
-	public Department searchById(Integer idDepartment) {
-		// TODO 自動生成されたメソッド・スタブ
-		if (idDepartment == null) {
-            return null;
-        }
-        
-        return departmentRepository.findById(idDepartment)
-                .map(entity -> {
-                    List<Department> list = DepartmentEntity.createDepartmentList(List.of(entity));
-                    return list.isEmpty() ? null : list.get(0);
-                })
-                .orElse(null);
-    
-		
     }
 }

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

@@ -2,6 +2,7 @@ package com.example.rhizome.app.domain.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.service.UpdateDepartment;
@@ -9,18 +10,23 @@ import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
 
 @Service
+@Transactional
 public class UpdateDepartmentImpl implements UpdateDepartment {
 
+	DepartmentRepository departmentRepository;
+	
 	@Autowired
-    private DepartmentRepository departmentRepository;
+	public UpdateDepartmentImpl(DepartmentRepository departmentRepository) {
-
+		this.departmentRepository = departmentRepository;
-    @Override
-    public void update(Department department) {
-        // Model မှ Entity သို့ ပြောင်းလဲခြင်း သို့မဟုတ် သက်ဆိုင်ရာ update ကို save ဖြင့် လုပ်ဆောင်ရန်
-        DepartmentEntity entity = new DepartmentEntity();
-        entity.setIdDepartment(department.getIdDepartment());
-        entity.setNmDepartment(department.getNmDepartment());
-        
-        departmentRepository.save(entity);
 	}
+	
+	public void updateDepartment(Department beforeDepartment, Department updateDepertment) {
+		departmentRepository.save(DepartmentEntity.convertFrom(mergeDepartment(beforeDepartment,updateDepertment)));
+
+	}
+	
+	private Department mergeDepartment(Department beforeDepartment, Department updateDepartment) {
+		return new Department(updateDepartment.getIdDepartment(),updateDepartment.getNmDepartment());
+	}
+
 }

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

@@ -1,47 +1,127 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.EmployeeInfo;
+import com.example.rhizome.app.domain.model.LoginUser;
+import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 import com.example.rhizome.app.domain.service.DeleteDepartment;
+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.SessionKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
 
 @Controller
 public class DeleteDepartmentController {
 
-    HttpSession httpSession;
+	private final static Logger LOGGER = Logger.getLogger(DeleteDepartmentController.class.getName());
-    DeleteDepartment deleteDepartment;
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	private final HttpSession httpSession;
+	private final DeleteDepartment deleteDepartment;
+	private final SearchDepartment searchDepartment;
+	private final SearchEmployeeInfo searchEmployeeInfo;
 
 	@Autowired
-    public DeleteDepartmentController(HttpSession httpSession, DeleteDepartment deleteDepartment) {
+	public DeleteDepartmentController(DeleteDepartment deleteDepartment, SearchDepartment searchDepartment,
+			SearchEmployeeInfo searchEmployeeInfo, HttpSession httpSession) {
 		this.httpSession = httpSession;
 		this.deleteDepartment = deleteDepartment;
+		this.searchDepartment = searchDepartment;
+		this.searchEmployeeInfo = searchEmployeeInfo;
 	}
 
+	@PermissionCheck
 	@SessionCheck
-    @PostMapping("/deleteDepartmentInput")
+	@RequestMapping(value = "/deleteDepartment", method = RequestMethod.POST)
-    public String deleteDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
+	public String deleteDepartment(@RequestParam(value = "idDepartment", required = false) Integer idDepartment,
-        final String DELETE_COMPLETE = "削除しました。";
+			Model model) {
 
 		try {
-            // ဌာန ဖယ်ရှားခြင်း လုပ်ဆောင်ချက်
+			// 削除対象の部署IDが存在しない場合
-            deleteDepartment.delete(idDepartment);
+			if (idDepartment == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm("削除対象のIDが不明です。"));
+				model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+						DepartmentForm.convertFrom(searchDepartment.selectAll()));
+				return TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_HTML;
+			}
 
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+			// ログインユーザー情報を取得
-            return "forward:/selectDepartment";
+			LoginUser loginUser = LoginUserForm
+					.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER));
+
+			// 削除バリデーションと削除の実行
+			deleteExec(model, idDepartment, loginUser);
+
+			// 最新の部署一覧を再取得してセット
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+			
+			model.addAttribute("searchConditionDepartmentForm", new 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;
 		}
 	}
+
+	private boolean deleteExec(Model model, Integer idDepartment, LoginUser loginUser) {
+		final String DELETE_TARGET_ID_CAN_NOT_DELETE = "ログイン者自身は削除出来ません。";
+		final String BELONG_EMPLOYEE_EXIST_ERROR = "1名以上が所属している部署は削除出来ません。";
+		final String DELETE_COMPLETE = "削除しました。";
+
+		// ログイン者自身の部署削除ブロック
+		if (loginUser != null && Objects.equals(loginUser.getIdDepartment(), idDepartment)) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
+			return false;
+		}
+
+		SearchConditionEmployee searchCondition = new SearchConditionEmployee(
+				null,
+				null,
+				null,
+				null,
+				idDepartment);
+
+		// 社員検索サービスを呼び出す
+		List<EmployeeInfo> employeeList = searchEmployeeInfo.searchBy(searchCondition);
+
+		// 1件以上レコードが返ってきた（所属社員がいた）場合は削除を中断
+		if (employeeList != null && !employeeList.isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(BELONG_EMPLOYEE_EXIST_ERROR));
+			return false;
+		}
+
+		// すべてのバリデーションチェックを通過したら削除を実施
+		deleteDepartment.deleteDepartment(idDepartment);
+
+		// 削除完了メッセージをセット（画面側のアラートボックスと連動）
+		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
+		return true;
+	}
 }

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

@@ -1,5 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -9,16 +10,17 @@ 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.model.Department;
+import com.example.rhizome.app.domain.service.RegisterDepartment;
-import com.example.rhizome.app.domain.service.InsertDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.DepartmentForm;
+import com.example.rhizome.app.presentation.form.InsertDepartmentForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 
 @Controller
@@ -27,50 +29,65 @@ public class InsertDepartmentController {
 	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	private final HttpSession httpSession;
-    InsertDepartment insertDepartment;
+	private final RegisterDepartment registerDepartment;
+	private final SearchDepartment searchDepartment;
 
 	@Autowired
-    public InsertDepartmentController(HttpSession httpSession, InsertDepartment insertDepartment) {
+	public InsertDepartmentController(HttpSession httpSession, RegisterDepartment registerDepartment,
+			SearchDepartment searchDepartment) {
 		this.httpSession = httpSession;
-        this.insertDepartment = insertDepartment;
+		this.registerDepartment = registerDepartment;
+		this.searchDepartment = searchDepartment;
 	}
 
-    /**
+	@ModelAttribute
-     * 部署登録入力画面を表示する
+	public InsertDepartmentForm insertDepartmentForm() {
-     */
+		return new InsertDepartmentForm();
+	}
+
+	@PermissionCheck
 	@SessionCheck
-    @RequestMapping(value = "/insertDepartmentInput", method = {RequestMethod.GET, RequestMethod.POST})
+	@RequestMapping(value = "/insertDepartmentInput", method = RequestMethod.POST)
-    public String showInsertDepartment(Model model) {
+	public String showInsertInput(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm) {
-        try {
+		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
-            model.addAttribute("departmentForm", new DepartmentForm());
-            return "insertDepartmentInput";
-        } catch (Exception e) {
-            httpSession.invalidate();
-            e.printStackTrace();
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
 	}
 
-    /**
+	@PermissionCheck
-     * 部署情報の登録を実行する
-     */
 	@SessionCheck
-    @PostMapping("/insertDepartmentResult")
+	@RequestMapping(value = "/insertDepartmentConfirm", method = RequestMethod.POST)
-    public String insertDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
+	public String confirmDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
-        final String INSERT_COMPLETE = "登録しました。";
+			Model model) {
 
+		List<String> error = insertDepartmentForm.validateParameter();
+
+		if (!error.isEmpty()) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+					new MessageForm(String.join(", ", error) + "が不正です。"));
+			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+		}
+
+		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_CONFIRM_HTML;
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/insertDepartment", method = RequestMethod.POST)
+	public String insertDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
+			Model model) {
 		try {
-            Department department = new Department(null, departmentForm.getNmDepartment());
+			model.addAttribute(
-            insertDepartment.insert(department);
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(INSERT_COMPLETE));
+			registerDepartment.registerDepartment(InsertDepartmentForm.convertTo(insertDepartmentForm));
-            return "forward:/selectDepartment";
+
+			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;
 		}

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;
 
 /**
  * 新規登録用のコントローラ
@@ -43,7 +45,8 @@ public class InsertEmployeeController {
 	SearchDepartment searchDepartment;
 
 	@Autowired
-    public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee, SearchDepartmentImpl searchDepartment) {
+	public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee,
+			SearchDepartmentImpl searchDepartment) {
 		this.httpSession = httpSession;
 		this.registerEmployee = registerEmployee;
 		this.searchDepartment = searchDepartment;
@@ -72,8 +75,7 @@ public class InsertEmployeeController {
 			model.addAttribute(
 					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
 					DepartmentForm.convertFrom(
-                            searchDepartment.selectAll()
+							searchDepartment.selectAll()));
-                    ));
 
 			// Confirm画面から渡ってきた値をチェック
 			List<String> error = validateParameter(
@@ -82,13 +84,13 @@ public class InsertEmployeeController {
 					insertEmployeeForm.getMailAddress(),
 					insertEmployeeForm.getPassword(),
 					insertEmployeeForm.getAdminAuth(),
-                    insertEmployeeForm.getIdDepartment()
+					insertEmployeeForm.getIdDepartment());
-            );
 
 			// エラーが1件以上有る場合
 			if (!error.isEmpty()) {
 				// エラー内容を画面に表示
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(String.join(", ", error) + "が不正です。"));
 				// 登録画面に遷移
 				return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
 			}
@@ -126,8 +128,7 @@ public class InsertEmployeeController {
 			String mailAddress,
 			String password,
 			Integer management,
-            Integer departmentId
+			Integer departmentId) {
-    ) {
 
 		final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
 		final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
@@ -193,6 +194,3 @@ public class InsertEmployeeController {
 	}
 
 }
-
-
-

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

@@ -1,41 +0,0 @@
-package com.example.rhizome.app.presentation.controller;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import com.example.rhizome.aop.aspect.SessionCheck;
-import com.example.rhizome.app.domain.model.Department;
-import com.example.rhizome.app.domain.service.SearchDepartment;
-import com.example.rhizome.app.presentation.form.DepartmentForm;
-import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
-
-@Controller
-public class SelectDepartmentController {
-
-    @Autowired
-    private SearchDepartment searchDepartment;
-
-    /** 部署検索画面の初期表示 */
-    @SessionCheck
-    @GetMapping("/showSelectDepartment")
-    public String showSelectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm) {
-        return "selectDepartment";
-    }
-
-    /** 部署検索処理 */
-    @PostMapping("/selectDepartment")
-    public String selectDepartment(@ModelAttribute SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
-        List<Department> departmentList = searchDepartment.searchByWithLike(
-                SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm)
-        );
-
-        model.addAttribute("departmentFormList", DepartmentForm.convertFrom(departmentList));
-        return "selectDepartment";
-    }
-}

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

@@ -0,0 +1,81 @@
+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.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.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 SelectDepatmentController {
+	
+	// ログ出力用インスタンス
+    private final static Logger LOGGER = Logger.getLogger(SelectDepatmentController.class.getName());
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    HttpSession httpSession;
+    SearchDepartment searchDepartment;
+    
+    @Autowired
+    public SelectDepatmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+    	this.httpSession = httpSession;
+    	this.searchDepartment = searchDepartment;
+    }
+    
+    @ModelAttribute
+    public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+    	return new SearchConditionDepartmentForm();
+    }
+    
+    @PermissionCheck
+    @SessionCheck
+    @RequestMapping(value = "/selectDepartment", method = RequestMethod.POST)
+    public String select(@ModelAttribute("searchConditionDepartmentForm") SearchConditionDepartmentForm searchConditionDepartmentForm, Model model) {
+    	
+    	try {
+           
+            SearchConditionDepartment searchCondition = SearchConditionDepartmentForm.convertTo(searchConditionDepartmentForm);
+
+            
+            List<Department> departmentList = searchDepartment.searchBy(searchCondition);
+
+            
+            model.addAttribute(
+                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+                    DepartmentForm.convertFrom(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;
+        }
+    } 
+} 

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

@@ -1,5 +1,6 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -9,52 +10,66 @@ 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 org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 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.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
 
 @Controller
 public class UpdateDepartmentController {
 
+	// ログ出力用インスタンス
 	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
 	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	private final HttpSession httpSession;
-    SearchDepartment searchDepartment;
+	private final SearchDepartment searchDepartment;
-    UpdateDepartment updateDepartment; // 追加
 
 	@Autowired
-    public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment, UpdateDepartment updateDepartment) {
+	public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
 		this.httpSession = httpSession;
 		this.searchDepartment = searchDepartment;
-        this.updateDepartment = updateDepartment; // 追加
+
 	}
 
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	@PermissionCheck
 	@SessionCheck
-    @PostMapping("/updateDepartmentInput")
+	@RequestMapping(value = "/showUpdateDepartment", method = RequestMethod.POST)
 	public String showUpdateDepartment(@RequestParam("idDepartment") Integer idDepartment, Model model) {
 		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
 
 		try {
-            Department department = searchDepartment.searchById(idDepartment);
 
-            if (department == null) {
+			List<Department> departmentInfoList = searchDepartment.searchBy(
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+					new SearchConditionDepartment(idDepartment, null));
-                return "forward:/selectDepartment";
+
+			if (departmentInfoList == null || departmentInfoList.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
+						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO_FORM_EMPTY;
 			}
 
-            model.addAttribute("departmentForm", DepartmentForm.convertFrom(department));
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_FORM,
-            return "updateDepartmentInput";
+					UpdateDepartmentInfoForm.convertForm(departmentInfoList.get(0)));
+
+			return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
 
 		} catch (Exception e) {
 			httpSession.invalidate();
@@ -64,26 +79,4 @@ public class UpdateDepartmentController {
 		}
 	}
 
-    /**
-     * 部署情報の更新を実行する
-     */
-    @SessionCheck
-    @RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
-    public String updateDepartmentResult(@ModelAttribute("departmentForm") DepartmentForm departmentForm, Model model) {
-        final String UPDATE_COMPLETE = "更新しました。";
-
-        try {
-            Department department = new Department(departmentForm.getIdDepartment(), departmentForm.getNmDepartment());
-            updateDepartment.update(department);
-
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-            return "forward:/selectDepartment";
-
-        } 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

@@ -0,0 +1,116 @@
+package com.example.rhizome.app.presentation.controller;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.example.rhizome.aop.aspect.PermissionCheck;
+import com.example.rhizome.aop.aspect.SessionCheck;
+import com.example.rhizome.app.domain.model.Department;
+import com.example.rhizome.app.domain.model.SearchConditionDepartment;
+import com.example.rhizome.app.domain.service.SearchDepartment;
+import com.example.rhizome.app.domain.service.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.MessageForm;
+import com.example.rhizome.app.presentation.form.SearchConditionDepartmentForm;
+import com.example.rhizome.app.presentation.form.UpdateDepartmentInfoForm;
+
+@Controller
+public class UpdateDepartmentResultController {
+
+	// ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+	// エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	private final HttpSession httpSession;
+	private final SearchDepartment searchDepartment;
+	private final UpdateDepartment updateDepartment;
+
+	@Autowired
+	public UpdateDepartmentResultController(HttpSession httpSession, SearchDepartment searchDepartment,
+			UpdateDepartment updateDepartment) {
+		this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
+		this.updateDepartment = updateDepartment;
+	}
+
+	@ModelAttribute
+	public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+		return new SearchConditionDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/updateDepartmentResult", method = RequestMethod.POST)
+	public String departmentUpdateResult(
+			@ModelAttribute("updateDepartmentInfoForm") UpdateDepartmentInfoForm updateDepartmentInfoForm,
+			Model model) {
+
+		final String NOTHING = "項目が空欄です。";
+		final String DUPLICATION = "既に同名の部署が存在するか、値が変更されていません。";
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
+		final String UPDATE_COMPLETE = "更新が完了しました。";
+
+		try {
+
+			// 必須入力チェック
+			if (UpdateDepartmentInfoForm.hasErrorParameter(updateDepartmentInfoForm)) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			List<Department> beforeList = searchDepartment.searchBy(
+					new SearchConditionDepartment(updateDepartmentInfoForm.getIdDepartment(), null));
+
+			if (beforeList == null || beforeList.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				return "forward:/selectDepartment";
+			}
+			Department beforeDepartment = beforeList.get(0);
+			Department updateDepartmentData = UpdateDepartmentInfoForm.convertTo(updateDepartmentInfoForm);
+
+			if (Objects.equals(beforeDepartment.getNmDepartment(), updateDepartmentData.getNmDepartment())) {
+
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+			}
+
+			List<Department> duplicationList = searchDepartment.searchBy(
+					new SearchConditionDepartment(null, updateDepartmentData.getNmDepartment()));
+
+			if (duplicationList != null && !duplicationList.isEmpty()) {
+
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM, updateDepartmentInfoForm);
+				return TransitionTargetPageNameKeyword.UPDATE_DEPARTMENT_INPUT_HTML;
+
+			}
+
+			// 更新を実行 ➔ forward
+			updateDepartment.updateDepartment(beforeDepartment, updateDepartmentData);
+
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
+			return "forward:/selectDepartment";
+
+		} 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

@@ -10,9 +10,11 @@ public class PageReturnAttributeKeyword {
 
     public static final String DEPARTMENT_FORM_LIST = "departmentFormList";
     public static final String UPDATE_EMPLOYEE_INFO_FORM = "updateEmployeeInfoForm";
+    public static final String UPDATE_DEPARTMENT_INFO_FORM = "updateDepartmentInfoForm";
     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 UPDATE_DEPARTMENT_FORM = "updateDepartmentForm";
 
 }

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

@@ -17,10 +17,15 @@ public class TransitionTargetPageNameKeyword {
     // 管理者向け
     public static final String MENU_HTML = "menu";
     public static final String SELECT_EMPLOYEE_HTML = "selectEmployee";
+    public static final String SELECT_DEPARTMENT_HTML = "selectDepartment";
     public static final String INSERT_EMPLOYEE_INPUT_HTML = "insertEmployeeInput";
+    public static final String INSERT_DEPARTMENT_INPUT_HTML = "insertDepartmentInput";
     public static final String INSERT_EMPLOYEE_CONFIRM_HTML = "insertEmployeeConfirm";
+    public static final String INSERT_DEPARTMENT_CONFIRM_HTML = "insertDepartmentConfirm";
     public static final String INSERT_EMPLOYEE_RESULT_HTML = "insertEmployeeResult";
+    public static final String INSERT_DEPARTMENT_RESULT_HTML = "insertDepartmentResult";
     public static final String UPDATE_EMPLOYEE_INPUT_HTML = "updateEmployeeInput";
+    public static final String UPDATE_DEPARTMENT_INPUT_HTML = "updateDepartmentInput";
 
     public static final String ERROR_HTML = "error";
 
@@ -46,6 +51,16 @@ public class TransitionTargetPageNameKeyword {
     public static final String UPDATE_EMPLOYEE_RESULT = "/updateEmployeeResult";
 
     // Department
+    public static final String DELETE_DEPARTMENT = "/deleteDepartment";
+    public static final String INSERT_DEPARTMENT_INPUT = "/insertDepartmentInput";
+    public static final String INSERT_DEPARTMENT_CONFIRM = "/insertDepartmentConfirm";
+    public static final String INSERT_DEPARTMENT = "/insertDepartment";
+    public static final String SELECT_DEPARTMENT_INFO = "/selectDepartment";
+    public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+    public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
+    public static final String SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectDepartmentAll";
+   
+    
     // HTML
     // Controller
 
@@ -70,7 +85,16 @@ public class TransitionTargetPageNameKeyword {
                 SELECT_EMPLOYEE_INFO,
                 SELECT_EMPLOYEE_INFO_FORM_EMPTY,
                 SHOW_UPDATE_EMPLOYEE,
-                UPDATE_EMPLOYEE_RESULT
+                UPDATE_EMPLOYEE_RESULT,
+                
+                DELETE_DEPARTMENT,
+                INSERT_DEPARTMENT_INPUT,
+                INSERT_DEPARTMENT,
+                INSERT_DEPARTMENT_CONFIRM,
+                SELECT_DEPARTMENT_INFO,
+                SELECT_DEPARTMENT_INFO_FORM_EMPTY,
+                SHOW_UPDATE_DEPARTMENT,
+                UPDATE_DEPARTMENT_RESULT
         );
     }
 

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

@@ -0,0 +1,42 @@
+package com.example.rhizome.app.presentation.form;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.example.rhizome.app.domain.model.Department;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class InsertDepartmentForm {
+
+	private String nmDepartment;
+
+	public static Department convertTo(InsertDepartmentForm insertDepartmentForm) {
+		return new Department(
+				null,
+				insertDepartmentForm.getNmDepartment());
+	}
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+
+		return str.isBlank();
+	}
+
+	public List<String> validateParameter() {
+		final String DEPARTMENT_NAME_NULL_BLANK = "部署名";
+
+		List<String> error = new ArrayList<>();
+		if (isNullOrBlank(nmDepartment)) {
+			error.add(DEPARTMENT_NAME_NULL_BLANK);
+		}
+		return error;
+	}
+}

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

@@ -1,3 +1,4 @@
+// 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
 package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
@@ -6,31 +7,24 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 部署検索条件用のFormクラス
- */
 @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()
+				searchConditionDepartment.getNmDepartment());
-        );
 	}
 
-    public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm form) {
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
 		return new SearchConditionDepartment(
-                form.getIdDepartment(),
+				searchConditionDepartmentForm.getIdDepartment(),
-                form.getNmDepartment()
+				searchConditionDepartmentForm.getNmDepartment());
-        );
 	}
 }

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

@@ -0,0 +1,48 @@
+package com.example.rhizome.app.presentation.form;
+
+import java.util.List;
+
+import com.example.rhizome.app.domain.model.Department;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateDepartmentInfoForm {
+
+	private Integer idDepartment;
+
+	private String nmDepartment;
+
+	public static UpdateDepartmentInfoForm convertForm(Department department) {
+		return new UpdateDepartmentInfoForm(
+				department.getIdDepartment(),
+				department.getNmDepartment());
+
+	}
+
+	public static List<UpdateDepartmentInfoForm> convertForm(List<Department> departmentList) {
+		return departmentList.stream().map(UpdateDepartmentInfoForm::convertForm).toList();
+	}
+
+	public static Department convertTo(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+		return new Department(
+				updateDepartmentInfoForm.getIdDepartment(),
+				updateDepartmentInfoForm.getNmDepartment());
+	}
+
+	public static boolean hasErrorParameter(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+
+		return isNullOrBlank(updateDepartmentInfoForm.getNmDepartment());
+	}
+
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+		return str.isBlank();
+	}
+}

src/main/resources/templates/insertDepartmentConfilm.html

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

src/main/resources/templates/insertDepartmentInput.html

@@ -8,22 +8,23 @@
 	<!-- CSSの読み込み -->
 	<link rel="stylesheet" th:href="@{/css/all.css}">
 	<link rel=stylesheet th:href="@{/css/style.css}" type="text/css">
-	<title>部署情報登録</title>
+	<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="/insertDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
+	<form action="/insertDepartmentConfirm" method="post" th:object="${insertDepartmentForm}">
-		th:object="${departmentForm}">
+
-		<div class="msgBox error" th:if="${messageError != null}">
+		<div class="msgBox error" th:if="${messageError} != null">
-			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+			<span class="error" th:text="${messageError.message}"></span>
 		</div>
+
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
@@ -37,7 +38,6 @@
 				<th class="header">部署名</th>
 				<td>
 					<label>
-
 						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
 							type="text" />
 					</label>
@@ -45,32 +45,12 @@
 			</tr>
 			<tr>
 				<td class="btnArea" colspan="2">
-					<input type="submit" value="登録" />
+					<input type="submit" value="登録確認" />
 				</td>
 			</tr>
 		</table>
+		<a href="showMenu">メニューに戻る</a>
 	</form>
-	<a href="javascript:selectSubmit()">一覧に戻る</a>
 </body>
 
-<script>
-	function selectSubmit() {
-		const form = document.createElement('form');
-		form.setAttribute('method', 'post');
-		form.setAttribute('action', 'selectDepartment');
-
-		// 動的送信用のHidden
-		const inputField = document.createElement("input");
-		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
-
-		form.appendChild(inputField);
-
-		// フォームをDOMに追加
-		document.body.appendChild(form);
-
-		form.submit();
-	}
-</script>
-
 </html>

src/main/resources/templates/menu.html

@@ -26,23 +26,21 @@
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
         <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-			<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a>
+		
-			</td>
+		<td><a class="menuClass" href="javascript:selectDepartmentSubmit()"><i class="fas fa-search"></i> 部署検索 </a></td>
-			<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。
+				<td class="description">登録済みの部署一覧表示と</br>更新、削除を行います。</td>
-			</td>
+		
+		
     </tr>
-		<!-- ဒီနေရာမှာ ဌာနရှာဖွေခြင်း (部署検索) ကို ထည့်ပါ -->
 	<tr>
-			<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a>
+		<td><a class="menuClass" href="javascript:insertEmployeeSubmit()"><i class="fas fa-plus"></i> 社員登録 </a></td>
-			</td>
+				        <td class="description">新規でユーザ追加を行います。</td>
-			<td class="description">新規でユーザ追加を行います。
+		
-			</td>
+		<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a></td>
-			<!-- ဒီနေရာမှာ ဌာနအသစ်ထည့်သွင်းခြင်း (部署登録) ကို ထည့်ပါ -->
+				<td class="description">新規で部署を追加します。</td>
-			<td><a class="menuClass" href="javascript:insertDepartmentSubmit()"><i class="fas fa-plus"></i> 部署登録 </a>
+        
-			</td>
-			<td class="description">新規で部署追加を行います。
-			</td>
     </tr>
+
 </table>
 </body>
 

src/main/resources/templates/selectDepartment.html

@@ -3,31 +3,39 @@
 
 <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>
+	<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>
-
 	<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>
 		<table>
 			<tr>
 				<th class="header">部署ID</th>
 				<td>
+
 					<input id="idDepartment" placeholder="部署ID" th:field="*{idDepartment}" type="number" />
 				</td>
 			</tr>
 			<tr>
 				<th class="header">部署名</th>
 				<td>
+
 					<input id="nmDepartment" placeholder="部署名" th:field="*{nmDepartment}" type="text" />
 				</td>
 			</tr>
@@ -36,25 +44,32 @@
 					<input type="submit" value="検索" />
 				</td>
 				<td class="btnArea" colspan="2">
+
 					<button type="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>
 
 	<th:block th:if="${departmentFormList != null and departmentFormList.size() > 0}">
+		<!-- 検索結果が1件以上ある場合 -->
 		<table class="table-grid table-striped table-hover">
 			<thead>
 				<tr>
-					<th style="width: 100px;">部署ID</th>
+					<th style="width: 60px;">部署ID</th>
-					<th style="width: 200px;">部署名</th>
+					<th style="width: 100px;">部署名</th>
-					<th style="width: 200px;">操作</th>
+					<th style="width: 150px;">操作</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -62,10 +77,18 @@
 					<td th:text="${departmentForm.idDepartment}"></td>
 					<td th:text="${departmentForm.nmDepartment}"></td>
 					<td>
-						<button type="button"
+						<!-- 更新フォーム -->
-							th:onclick="'updateDepartment(' + ${departmentForm.idDepartment} + ')'">更新</button>
+						<form action="/updateDepartmentResult" method="post" style="display: inline;">
-						<button type="button"
+							<input name="idDepartment" th:value="${departmentForm.idDepartment}" type="hidden">
-							th:onclick="'deleteDepartment(' + ${departmentForm.idDepartment} + ')'">削除</button>
+							<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>
@@ -73,47 +96,17 @@
 	</th:block>
 
 	<th:block th:if="${departmentFormList == null or departmentFormList.size() == 0}">
+		<!-- 検索結果が0件の場合 -->
 		検索結果はありません。
 	</th:block>
-
+</body>
 <script type="text/javascript">
+
 	function clearInput() {
 		document.getElementById('idDepartment').value = '';
 		document.getElementById('nmDepartment').value = '';
 	}
-		// 部署更新用のJavaScript
-		function updateDepartment(idDepartment) {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'updateDepartmentInput'); // Update Controller ၏ URL သို့မဟုတ် Path
 
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "idDepartment");
-			inputField.setAttribute("value", idDepartment);
-
-			form.appendChild(inputField);
-			document.body.appendChild(form);
-			form.submit();
-		}
-		
-
-		// 部署削除用のJavaScript
-		function deleteDepartment(idDepartment) {
-			const form = document.createElement('form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('action', 'deleteDepartmentInput'); // Delete Controller ၏ URL သို့မဟုတ် Path
-
-			const inputField = document.createElement("input");
-			inputField.setAttribute("type", "hidden");
-			inputField.setAttribute("name", "idDepartment");
-			inputField.setAttribute("value", idDepartment);
-
-			form.appendChild(inputField);
-			document.body.appendChild(form);
-			form.submit();
-		}
 </script>
-</body>
 
 </html>

src/main/resources/templates/selectEmployee.html

@@ -14,7 +14,7 @@
 </head>
 <body>
 <h1>
-    検索条件入力</h1>
+    検索条件入力　　　
     <div class="rightSection">
         <span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
         <button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>

src/main/resources/templates/updateDepartmentInput.html

@@ -7,20 +7,20 @@
 	<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">
+	<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="${departmentForm}">
+		th:object="${updateDepartmentInfoForm}">
 		<div class="msgBox error" th:if="${messageError != null}">
 			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
 		</div>
@@ -59,9 +59,10 @@
 		form.setAttribute('action', 'selectDepartment');
 
 		// 動的送信用のHidden
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
 		const inputField = document.createElement("input");
 		inputField.setAttribute("type", "hidden");
-		inputField.setAttribute("value", "selectDepartment");
+		inputField.setAttribute("value", "selectAll");
 
 		form.appendChild(inputField);
 
@@ -70,6 +71,7 @@
 
 		form.submit();
 	}
+
 </script>
 
 </html>