1段階目終了

.classpath

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

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

.project

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

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

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

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

@@ -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>

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

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

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

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

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

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

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

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

@@ -0,0 +1,26 @@
+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.infra.entity.DepartmentEntity;
+import com.example.rhizome.app.infra.repository.DepartmentRepository;
+
+@Service
+@Transactional
+public class RegisterDepartmentImpl implements RegisterDepartment {
+	
+	DepartmentRepository departmentRepository;
+	
+	@Autowired
+	public RegisterDepartmentImpl(DepartmentRepository departmentRepository) {
+		this.departmentRepository = departmentRepository;
+	}
+	
+	public void registerDepartment(Department department) {
+		departmentRepository.save(DepartmentEntity.convertFrom(department));
+	}
+
+}

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/presentation/controller/InsertDepartmentController.java

@@ -0,0 +1,95 @@
+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.service.RegisterDepartment;
+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
+public class InsertDepartmentController {
+
+	private final static Logger LOGGER = Logger.getLogger(InsertDepartmentController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+	private final HttpSession httpSession;
+	private final RegisterDepartment registerDepartment;
+	private final SearchDepartment searchDepartment;
+
+	@Autowired
+	public InsertDepartmentController(HttpSession httpSession, RegisterDepartment registerDepartment,
+			SearchDepartment searchDepartment) {
+		this.httpSession = httpSession;
+		this.registerDepartment = registerDepartment;
+		this.searchDepartment = searchDepartment;
+	}
+
+	@ModelAttribute
+	public InsertDepartmentForm insertDepartmentForm() {
+		return new InsertDepartmentForm();
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/insertDepartmentInput", method = RequestMethod.POST)
+	public String showInsertInput(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm) {
+		return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_INPUT_HTML;
+	}
+
+	@PermissionCheck
+	@SessionCheck
+	@RequestMapping(value = "/insertDepartmentConfirm", method = RequestMethod.POST)
+	public String confirmDepartment(@ModelAttribute("insertDepartmentForm") InsertDepartmentForm insertDepartmentForm,
+			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 {
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
+
+			registerDepartment.registerDepartment(InsertDepartmentForm.convertTo(insertDepartmentForm));
+
+			return TransitionTargetPageNameKeyword.INSERT_DEPARTMENT_RESULT_HTML;
+
+		} catch (Exception e) {
+			httpSession.invalidate();
+			e.printStackTrace();
+
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
+	}
+}

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

@@ -0,0 +1,73 @@
+//package com.example.rhizome.app.presentation.controller;
+//
+//import java.util.List;
+//import java.util.logging.Logger;
+//
+//import javax.servlet.http.HttpSession;
+//
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.ModelAttribute;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import com.example.rhizome.aop.aspect.PermissionCheck;
+//import com.example.rhizome.aop.aspect.SessionCheck;
+//import com.example.rhizome.app.domain.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.SearchDepartmentInfo;
+//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.UpdateEmployeeInfoForm;
+//
+//@Controller
+//public class UpdateDepartmentController {
+//
+//	// ログ出力用インスタンス
+//    private final static Logger LOGGER = Logger.getLogger(UpdateDepartmentController.class.getName());
+//    // エラーメッセージ用の定数フィールド
+//    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+//
+//    HttpSession httpSession;
+//    SearchDepartment searchDepartment;
+//    
+//    @Autowired
+//    public UpdateDepartmentController(HttpSession httpSession, SearchDepartment searchDepartment) {
+//    	this.httpSession = httpSession;
+//    	this.searchDepartment = searchDepartment;
+//    }
+//    
+//    @ModelAttribute
+//    public SearchConditionDepartmentForm searchConditionDepartmentForm() {
+//    	return new SearchConditionDepartmentForm();
+//    }
+//    
+//    @PermissionCheck
+//    @SessionCheck
+//    @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 {
+//			
+//			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+//			
+//			List<Department> departmentInfoList = SearchDepartmentInfo.seachBy(
+//					new SearchConditionDepartment(idDepartment,
+//							null)); 
+//			
+//			if (departmentInfoList.isEmpty()) {
+//				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+//				return "forward:" + TransitionTargetPageNameKeyword.SELECT_DEPARTMENT_INFO; 
+//				
+//				model.addAttribute(PageReturnAttributeKeyword.UPDATE_DEPARTMENT_INFO_FORM, UpdateDepartmentInfoForm.convertFrom(departmentInfoList.get(0)));
+//			}
+//		}
+//	}
+//}

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

@@ -10,6 +10,7 @@ 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";

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

@@ -17,9 +17,13 @@ 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 ERROR_HTML = "error";
@@ -46,6 +50,15 @@ 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 SELECT_DEPARTMENT_INFO_FORM_EMPTY = "/selectAll";
+    public static final String SHOW_UPDATE_DEPARTMENT = "/showUpdateDepartment";
+    public static final String UPDATE_DEPARTMENT_RESULT = "/updateDepartmentResult";
+
     // HTML
     // Controller
 
@@ -70,7 +83,15 @@ 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,
+                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

@@ -0,0 +1,30 @@
+// 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
+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 {
+
+	private Integer idDepartment;
+
+	private String nmDepartment;
+
+	public static SearchConditionDepartmentForm convertFrom(SearchConditionDepartment searchConditionDepartment) {
+		return new SearchConditionDepartmentForm(
+				searchConditionDepartment.getIdDepartment(),
+				searchConditionDepartment.getNmDepartment());
+	}
+
+	public static SearchConditionDepartment convertTo(SearchConditionDepartmentForm searchConditionDepartmentForm) {
+		return new SearchConditionDepartment(
+				searchConditionDepartmentForm.getIdDepartment(),
+				searchConditionDepartmentForm.getNmDepartment());
+	}
+}

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

@@ -0,0 +1,54 @@
+//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::convertFrom).toList();
+//	}
+//
+//	public static Department convertTo(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+//		return new Department(
+//				updateDepartmentInfoForm.getIdDepartment(),
+//				updateDepartmentInfoForm.getNmDepartment());
+//	}
+//
+//	public static boolean hasErrorParameter(UpdateDepartmentInfoForm updateDepartmentInfoForm) {
+//
+//		boolean errorFlag = !isNullOrBlank(updateDepartmentInfoForm.getNmDepartment());
+//
+//		if (!isNullOrBlank(updateDepartmentInfoForm.getNmDepartment())) {
+//			errorFlag = true;
+//		}
+//
+//		return errorFlag;
+//	}
+//
+//	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

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

src/main/resources/templates/menu.html

@@ -26,11 +26,19 @@
         <td><a class="menuClass" href="javascript:selectEmployeeSubmit()"><i class="fas fa-search"></i> 社員検索 </a>
         </td>
         <td class="description">登録済みのユーザ一覧表示と</br>更新、削除を行います。</td>
-    </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:insertEmployeeSubmit()"><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>

src/main/resources/templates/selectDepartment.html

@@ -0,0 +1,112 @@
+<!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="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>
+			<tr>
+				<td class="btnArea" colspan="2">
+					<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: 60px;">部署ID</th>
+					<th style="width: 100px;">部署名</th>
+					<th style="width: 150px;">操作</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr th:each="departmentForm : ${departmentFormList}">
+					<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}">
+		<!-- 検索結果が0件の場合 -->
+		検索結果はありません。
+	</th:block>
+</body>
+<script type="text/javascript">
+
+	function clearInput() {
+		document.getElementById('idDepartment').value = '';
+		document.getElementById('nmDepartment').value = '';
+	}
+
+</script>
+
+</html>

src/main/resources/templates/updateDepartmentInput.html

@@ -0,0 +1,76 @@
+<!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.nmDepartment}"></span></span>
+			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+		</div>
+	</h1>
+	<form action="/updateDepartmentResult" method="post" onsubmit="return confirm('本当によろしいですか？');"
+		th:object="${updateDepartmentInfoForm}">
+		<div class="msgBox error" th:if="${messageError != null}">
+			<span class="error" th:each="message : ${messageError.message}" th:text="${message}"></span>
+		</div>
+		<table>
+			<tr>
+				<th class="header">部署ID</th>
+				<td>
+					<label>
+						<input class="readOnly" readonly="readonly" th:field="*{idDepartment}" type="text" />
+					</label>
+				</td>
+			</tr>
+			<tr>
+				<th class="header">部署名</th>
+				<td>
+					<label>
+						<input maxlength="50" placeholder="部署名" required="required" th:field="*{nmDepartment}"
+							type="text" />
+					</label>
+				</td>
+			</tr>
+			<tr>
+				<td class="btnArea" colspan="2">
+					<input type="submit" value="更新" />
+				</td>
+			</tr>
+		</table>
+	</form>
+</body>
+
+<script>
+	function selectSubmit() {
+		const form = document.createElement('form');
+		form.setAttribute('method', 'post');
+		form.setAttribute('action', 'selectAll');
+
+		// 動的送信用のHidden
+		// 動的にFormを作成する場合は何かしら送信しないと、正しく動作しない
+		const inputField = document.createElement("input");
+		inputField.setAttribute("type", "hidden");
+		inputField.setAttribute("value", "selectAll");
+
+		form.appendChild(inputField);
+
+		// フォームをDOMに追加
+		document.body.appendChild(form);
+
+		form.submit();
+	}
+
+</script>
+
+</html>