Add skill select to new page

Author: windybirth

skill/src/main/java/jp/wicresoft/controller/NewController.java

@@ -1,5 +1,8 @@
 package jp.wicresoft.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.validation.Valid;
 
 import org.slf4j.Logger;
@@ -12,33 +15,59 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import jp.wicresoft.impl.NewImpl;
+import jp.wicresoft.impl.SkillSelectImpl;
 import jp.wicresoft.info.IndexViewInfo;
+import jp.wicresoft.info.SkillSelectInfo;
 
 @Controller
 public class NewController {
 
 	@Autowired
 	NewImpl newImpl;
 
+	@Autowired
+	SkillSelectImpl skillSelectImpl;
+	
 	Logger logger = LoggerFactory.getLogger(NewController.class);
 
 	@RequestMapping(value={"/new"})
 	public String loadPage(Model model) {
 		IndexViewInfo indexViewInfo = new IndexViewInfo();
 		model.addAttribute("indexViewInfo", indexViewInfo);
 		model.addAttribute("page", "new");
+		// add skill select
+		SkillSelectInfo skill = new SkillSelectInfo();
+		skill.setLsSkill(new ArrayList<String>());
+		skill.getLsSkill().add("0");
+		model.addAttribute("skillSelectInfo", skill);
+		model.addAttribute("skillOptions", skillSelectImpl.getSkillNameList());
 		return "new";
 	}
 
 	@RequestMapping(value = {"/new_add"}, method = RequestMethod.POST)
-	public String addInfo(@Valid IndexViewInfo indexViewInfo, BindingResult bindingResult, Model model) {
-		if (bindingResult.hasErrors()) {
-			model.addAttribute("indexViewInfo", indexViewInfo);
-			model.addAttribute("page", "new");
-            return "new";
+	public String addInfo(@Valid IndexViewInfo indexViewInfo, BindingResult bindingResult, @Valid SkillSelectInfo skillSelectInfo, Model model) {
+		if (!bindingResult.hasErrors()) {
+			logger.info("Add skill : " + skillSelectInfo.getLsSkill());
+			try {
+				// convert skill id to integer
+				List<Integer> skillIdList = new ArrayList<Integer>();
+				for (String skillIdStr : skillSelectInfo.getLsSkill()) {
+					skillIdList.add(Integer.parseInt(skillIdStr));
+				}
+				logger.info("Add stuff: " + indexViewInfo.getName());
+				newImpl.addOneStuff(indexViewInfo, skillIdList);
+				return "redirect:all_stuff";
+			} catch (Exception e) {
+				logger.info(e.getLocalizedMessage());
+			}
+			
         }
-		logger.info("Add stuff: " + indexViewInfo.getName());
-		newImpl.addOneStuff(indexViewInfo);
-		return "redirect:all_stuff";
+		
+		model.addAttribute("indexViewInfo", indexViewInfo);
+		model.addAttribute("page", "new");
+		// add skill select
+		model.addAttribute("skillSelectInfo", skillSelectInfo);
+		model.addAttribute("skillOptions", skillSelectImpl.getSkillNameList());
+		return "new";
 	}
 }

skill/src/main/java/jp/wicresoft/controller/SearchController.java

@@ -14,42 +14,46 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import jp.wicresoft.impl.SearchImpl;
+import jp.wicresoft.impl.SkillSelectImpl;
 import jp.wicresoft.info.IndexViewInfo;
-import jp.wicresoft.info.SkillSearchInfo;
+import jp.wicresoft.info.SkillSelectInfo;
 
 @Controller
 public class SearchController {
 
 	@Autowired
 	SearchImpl searchImpl;
 
+	@Autowired
+	SkillSelectImpl skillSelectImpl;
+	
 	Logger logger = LoggerFactory.getLogger(NewController.class);
 
 	@RequestMapping(value={"/search"}, method=RequestMethod.GET)
 	public String loadPage(Model model) {
 		model.addAttribute("page", "search");
-		SkillSearchInfo skill = new SkillSearchInfo();
+		SkillSelectInfo skill = new SkillSelectInfo();
 		skill.setLsSkill(new ArrayList<String>());
 		skill.getLsSkill().add("0");
-		model.addAttribute("skillSearchInfo", skill);
-		model.addAttribute("skillOptions", searchImpl.getSkillNameList());
+		model.addAttribute("skillSelectInfo", skill);
+		model.addAttribute("skillOptions", skillSelectImpl.getSkillNameList());
 		return "search";
 	}
 
 	@RequestMapping(value={"/search"}, method=RequestMethod.POST)
-	public String loadPage(@Valid SkillSearchInfo skillSearchInfo, Model model) {
-		logger.info("Search for: " + skillSearchInfo.getLsSkill());
+	public String loadPage(@Valid SkillSelectInfo skillSelectInfo, Model model) {
+		logger.info("Search for: " + skillSelectInfo.getLsSkill());
 		model.addAttribute("page", "search");
-		if (skillSearchInfo.getLsSkill().isEmpty()) {
+		if (skillSelectInfo.getLsSkill().isEmpty()) {
 			// 検索条件がない場合
-			model.addAttribute("skillSearchInfo", skillSearchInfo);
-			model.addAttribute("skillOptions", searchImpl.getSkillNameList());
+			model.addAttribute("skillSelectInfo", skillSelectInfo);
+			model.addAttribute("skillOptions", skillSelectImpl.getSkillNameList());
 			return "search";
 		}
 
 		try {
 			List<Integer> conditionList = new ArrayList<Integer>();
-			for (String skillIdStr : skillSearchInfo.getLsSkill()) {
+			for (String skillIdStr : skillSelectInfo.getLsSkill()) {
 				conditionList.add(Integer.parseInt(skillIdStr));
 			}
 			List<IndexViewInfo> indexViewInfos = searchImpl.getSearchResultBySkill(conditionList);
@@ -60,23 +64,23 @@ public String loadPage(@Valid SkillSearchInfo skillSearchInfo, Model model) {
 		} catch (Exception e) {
 			logger.info(e.getLocalizedMessage());
 		}
-		model.addAttribute("skillSearchInfo", skillSearchInfo);
-		model.addAttribute("skillOptions", searchImpl.getSkillNameList());
+		model.addAttribute("skillSelectInfo", skillSelectInfo);
+		model.addAttribute("skillOptions", skillSelectImpl.getSkillNameList());
 
 		return "search";
 	}
 
 	@RequestMapping(value={"/search_addSelect"}, method=RequestMethod.POST)
 	public String addSelect(@RequestParam(value = "index", required = false) int index, Model model) {
 		logger.info("Selector have now: " + String.valueOf(index));
-		SkillSearchInfo skill = new SkillSearchInfo();
+		SkillSelectInfo skill = new SkillSelectInfo();
 
 		skill.setLsSkill(new ArrayList<String>());
 		skill.getLsSkill().add("0");
-		model.addAttribute("skillSearchInfo", skill);
+		model.addAttribute("skillSelectInfo", skill);
 		// set dynamic index
 		model.addAttribute("index", index);
-		model.addAttribute("skillOptions", searchImpl.getSkillNameList());
-		return "search_subrow";
+		model.addAttribute("skillOptions", skillSelectImpl.getSkillNameList());
+		return "skill_select";
 	}
 }

skill/src/main/java/jp/wicresoft/impl/NewImpl.java

@@ -1,20 +1,34 @@
 package jp.wicresoft.impl;
 
+import java.util.List;
+
+import javax.transaction.Transactional;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import jp.wicresoft.domain.StuffMeta;
+import jp.wicresoft.domain.StuffSkill;
 import jp.wicresoft.info.IndexViewInfo;
 import jp.wicresoft.repository.StuffMetaRepository;
+import jp.wicresoft.repository.StuffSkillRepository;
 
 @Component
 public class NewImpl {
 
 	@Autowired
 	StuffMetaRepository stuffMetaRepository;
 
-	public void addOneStuff(IndexViewInfo indexViewInfo) {
+	@Autowired
+	StuffSkillRepository stuffSkillRepository;
+	
+	@Transactional
+	public void addOneStuff(IndexViewInfo indexViewInfo, List<Integer> skillIdList) {
 		StuffMeta stuffMeta = indexViewInfo.toStuffMeta();
-		stuffMetaRepository.saveAndFlush(stuffMeta);
+		StuffMeta result = stuffMetaRepository.saveAndFlush(stuffMeta);
+		int stuffId = result.getId();
+		for (Integer skillId : skillIdList) {
+			stuffSkillRepository.saveAndFlush(new StuffSkill(stuffId, skillId));
+		}
 	}
 }

skill/src/main/java/jp/wicresoft/impl/SearchImpl.java

@@ -6,29 +6,20 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import jp.wicresoft.domain.SkillTitleMst;
 import jp.wicresoft.domain.StuffMeta;
 import jp.wicresoft.info.IndexViewInfo;
 import jp.wicresoft.jdbc.SkillSearchJdbcTemplate;
-import jp.wicresoft.repository.SkillTitleMstRepository;
 import jp.wicresoft.repository.StuffMetaRepository;
 
 @Component
 public class SearchImpl {
 
-	@Autowired
-	SkillTitleMstRepository skillTitleMstRepository;
-	
 	@Autowired
 	StuffMetaRepository stuffMetaRepository;
 
 	@Autowired
 	SkillSearchJdbcTemplate skillSearchJdbcTemplate;
 
-	public List<SkillTitleMst> getSkillNameList() {
-		return skillTitleMstRepository.findAll();
-	}
-	
 	public List<IndexViewInfo> getSearchResultBySkill(List<Integer> titleIds) {
 		List<StuffMeta> stuffMetas  = skillSearchJdbcTemplate.findByIds(titleIds);
 		List<IndexViewInfo> indexViewInfos = new ArrayList<>();

skill/src/main/java/jp/wicresoft/impl/SkillSelectImpl.java

@@ -0,0 +1,20 @@
+package jp.wicresoft.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import jp.wicresoft.domain.SkillTitleMst;
+import jp.wicresoft.repository.SkillTitleMstRepository;
+
+@Component
+public class SkillSelectImpl {
+
+	@Autowired
+	SkillTitleMstRepository skillTitleMstRepository;
+	
+	public List<SkillTitleMst> getSkillNameList() {
+		return skillTitleMstRepository.findAll();
+	}
+}

…a/jp/wicresoft/info/SkillSearchInfo.java …a/jp/wicresoft/info/SkillSelectInfo.javaskill/src/main/java/jp/wicresoft/info/SkillSearchInfo.java renamed to skill/src/main/java/jp/wicresoft/info/SkillSelectInfo.java skill/src/main/java/jp/wicresoft/info/SkillSearchInfo.java renamed to skill/src/main/java/jp/wicresoft/info/SkillSelectInfo.java

@@ -5,7 +5,7 @@
 import lombok.Data;
 
 @Data
-public class SkillSearchInfo {
+public class SkillSelectInfo {
 
 	List<String> lsSkill;
 }

skill/src/main/resources/templates/new.html

@@ -73,6 +73,35 @@ <h2 class="col-sm-offset-4 col-sm-8">スキル情報新規</h2>
 			      </div>
 			    </div>
 			  </div>
+			  <div class="selectList">
+				  <div class="form-group" th:each="row,rowStat : ${skillSelectInfo.lsSkill}">
+					<label for="inputName" class="col-sm-4 control-label">スキル</label>
+					<select id="" th:field="${skillSelectInfo.lsSkill[__${rowStat.index}__]}"
+						class="selectpicker dynamic-select" data-live-search="true"
+						title="下記のスキルを選択してください">
+						<optgroup label="資格">
+							<option th:each="skill : ${skillOptions}"
+								th:if="${skill.skillCategory==1}"
+								th:value="${skill.skillTitleId}" th:text="${skill.titleName}"></option>
+						</optgroup>
+						<optgroup label="環境(OS)">
+							<option th:each="skill : ${skillOptions}"
+								th:if="${skill.skillCategory==2}"
+								th:value="${skill.skillTitleId}" th:text="${skill.titleName}"></option>
+						</optgroup>
+						<optgroup label="DB">
+							<option th:each="skill : ${skillOptions}"
+								th:if="${skill.skillCategory==3}"
+								th:value="${skill.skillTitleId}" th:text="${skill.titleName}"></option>
+						</optgroup>
+						<optgroup label="言語">
+							<option th:each="skill : ${skillOptions}"
+								th:if="${skill.skillCategory==4}"
+								th:value="${skill.skillTitleId}" th:text="${skill.titleName}"></option>
+						</optgroup>
+					</select>
+				  </div>
+				</div>
 			  <div class="form-group">
 			    <div class="col-sm-offset-4 col-sm-4">
 			      <button type="submit" class="btn btn-success">新規</button>

skill/src/main/resources/templates/search.html

@@ -24,11 +24,11 @@
 		<div class="container">
 			<h2 class="col-sm-offset-4 col-sm-8">スキル情報検索</h2>
 
-			<form class="form-horizontal" method="post" action="/search" th:object="${skillSearchInfo}">
+			<form class="form-horizontal" method="post" action="/search" th:object="${skillSelectInfo}">
 				<div class="selectList">
-				  <div class="form-group" th:each="row,rowStat : ${skillSearchInfo.lsSkill}">
+				  <div class="form-group" th:each="row,rowStat : ${skillSelectInfo.lsSkill}">
 					<label for="inputName" class="col-sm-4 control-label">スキル</label>
-					<select id="" th:field="${skillSearchInfo.lsSkill[__${rowStat.index}__]}"
+					<select id="" th:field="${skillSelectInfo.lsSkill[__${rowStat.index}__]}"
 						class="selectpicker dynamic-select" data-live-search="true"
 						title="下記のスキルを選択してください">
 						<optgroup label="資格">

…n/resources/templates/search_subrow.html …in/resources/templates/skill_select.htmlskill/src/main/resources/templates/search_subrow.html renamed to skill/src/main/resources/templates/skill_select.html skill/src/main/resources/templates/search_subrow.html renamed to skill/src/main/resources/templates/skill_select.html

@@ -6,9 +6,9 @@
 <body>
 	<div class="selectList">
 		<div class="form-group"
-			th:each="row,rowStat : ${skillSearchInfo.lsSkill}">
+			th:each="row,rowStat : ${skillSelectInfo.lsSkill}">
 			<label for="inputName" class="col-sm-4 control-label">スキル</label> <select
-				th:field="${skillSearchInfo.lsSkill[__${index}__]}"
+				th:field="${skillSelectInfo.lsSkill[__${index}__]}"
 				class="selectpicker dynamic-select" data-live-search="true" title="下記のスキルを選択してください">
 				<optgroup label="資格">
 					<option th:each="skill : ${skillOptions}"

skill_db/src/main/java/jp/wicresoft/domain/StuffSkill.java

@@ -0,0 +1,31 @@
+package jp.wicresoft.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@IdClass(StuffSkill.StuffId.class)
+public class StuffSkill {
+
+	@Id
+	int stuffId;
+	
+	@Id
+	int skillId;
+	
+	static class StuffId {
+		
+		int stuffId;
+		
+		int skillId;
+		
+	}
+}