From e9da3ef28b46a96a21223475de4805e01df87fd8 Mon Sep 17 00:00:00 2001 From: Maiorovaek Date: Wed, 23 Jan 2019 01:54:37 +0300 Subject: [PATCH 1/2] fixed bug --- .../epam/mlhh/controllers/HelloController.java | 14 ++++++-------- .../epam/mlhh/repository/CandidateAddRepo.java | 7 ------- src/main/resources/templates/add.html | 4 ++-- 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 src/main/java/learn/epam/mlhh/repository/CandidateAddRepo.java diff --git a/src/main/java/learn/epam/mlhh/controllers/HelloController.java b/src/main/java/learn/epam/mlhh/controllers/HelloController.java index 69208c2..180f4c5 100644 --- a/src/main/java/learn/epam/mlhh/controllers/HelloController.java +++ b/src/main/java/learn/epam/mlhh/controllers/HelloController.java @@ -2,7 +2,6 @@ import learn.epam.mlhh.WebSecurityConfig; import learn.epam.mlhh.entity.Candidate; -import learn.epam.mlhh.repository.CandidateAddRepo; import learn.epam.mlhh.service.CandidateService; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -19,8 +18,7 @@ public class HelloController { @Autowired private CandidateService candidateService; - @Autowired - private CandidateAddRepo addRepo; + @RequestMapping(value="/", method=RequestMethod.GET) public String home(Map model) { @@ -45,21 +43,21 @@ public String Table(Map model) { else logger.error("Database error"); return "table"; } - @RequestMapping(value = "/add", method = RequestMethod.GET) + @RequestMapping(value = "/add", method = RequestMethod.POST) public String add(Map model) { - Iterable candidates = addRepo.findAll(); + Iterable candidates = candidateService.findAll(); model.put("candidates", candidates); return "add"; } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/addData", method = RequestMethod.POST) public String addData(@RequestParam String name, @RequestParam Integer age, @RequestParam String gender, @RequestParam String region, @RequestParam BigDecimal salary, @RequestParam String developer, @RequestParam Integer experience, @RequestParam String keyword, Map model) { Candidate candidate = new Candidate(name, age, gender, region, salary, developer, experience, keyword); - addRepo.save(candidate); - Iterable candidates = addRepo.findAll(); + candidateService.createCandidate(candidate); + Iterable candidates = candidateService.findAll(); model.put("candidates", candidates); return "add"; } diff --git a/src/main/java/learn/epam/mlhh/repository/CandidateAddRepo.java b/src/main/java/learn/epam/mlhh/repository/CandidateAddRepo.java deleted file mode 100644 index 89ce31b..0000000 --- a/src/main/java/learn/epam/mlhh/repository/CandidateAddRepo.java +++ /dev/null @@ -1,7 +0,0 @@ -package learn.epam.mlhh.repository; - -import learn.epam.mlhh.entity.Candidate; -import org.springframework.data.repository.CrudRepository; - -public interface CandidateAddRepo extends CrudRepository { -} diff --git a/src/main/resources/templates/add.html b/src/main/resources/templates/add.html index 2b0cbb3..aad87eb 100644 --- a/src/main/resources/templates/add.html +++ b/src/main/resources/templates/add.html @@ -12,11 +12,11 @@
- +

Добавление данных в БД

-
+ From cd4bfe76a8c5a46ba93cbb29f3447f6d1849339d Mon Sep 17 00:00:00 2001 From: Maiorovaek Date: Wed, 23 Jan 2019 02:05:54 +0300 Subject: [PATCH 2/2] fix bug --- src/main/resources/templates/add.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/add.html b/src/main/resources/templates/add.html index aad87eb..7dbebd3 100644 --- a/src/main/resources/templates/add.html +++ b/src/main/resources/templates/add.html @@ -20,7 +20,7 @@

Добавление данных в БД

-   +