Add questionDTOs and move all business logic from Controller to service

Author: zahar.kalosha

src/main/java/com/example/postgresdemo/controller/QuestionController.java

@@ -1,50 +1,40 @@
 package com.example.postgresdemo.controller;
 
-import com.example.postgresdemo.exception.ResourceNotFoundException;
-import com.example.postgresdemo.model.Question;
-import com.example.postgresdemo.repository.QuestionRepository;
+import com.example.postgresdemo.model.QuestionRequestDTO;
+import com.example.postgresdemo.model.QuestionResponseDTO;
+import com.example.postgresdemo.service.QuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
 
 @RestController
-public class QuestionController {
 
+public class QuestionController {
     @Autowired
-    private QuestionRepository questionRepository;
+    private QuestionService questionService;
 
     @GetMapping("/questions")
-    public Page<Question> getQuestions(Pageable pageable) {
-        return questionRepository.findAll(pageable);
+    public Page<QuestionResponseDTO> getQuestions(Pageable pageable) {
+        return questionService.findAll(pageable);
     }
 
-
     @PostMapping("/questions")
-    public Question createQuestion(@Valid @RequestBody Question question) {
-        return questionRepository.save(question);
+    public QuestionResponseDTO createQuestion(@Valid @RequestBody QuestionRequestDTO question) {
+        return questionService.create(question);
     }
 
     @PutMapping("/questions/{questionId}")
-    public Question updateQuestion(@PathVariable Long questionId,
-                                   @Valid @RequestBody Question questionRequest) {
-        return questionRepository.findById(questionId)
-                .map(question -> {
-                    question.setTitle(questionRequest.getTitle());
-                    question.setDescription(questionRequest.getDescription());
-                    return questionRepository.save(question);
-                }).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
+    public QuestionResponseDTO updateQuestion(@PathVariable Long questionId,
+                                   @Valid @RequestBody QuestionRequestDTO questionRequest) {
+        return questionService.update(questionId, questionRequest);
     }
 
-
     @DeleteMapping("/questions/{questionId}")
     public ResponseEntity<?> deleteQuestion(@PathVariable Long questionId) {
-        return questionRepository.findById(questionId)
-                .map(question -> {
-                    questionRepository.delete(question);
-                    return ResponseEntity.ok().build();
-                }).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
+        return questionService.delete(questionId);
     }
 }

src/main/java/com/example/postgresdemo/model/QuestionRequestDTO.java

@@ -0,0 +1,28 @@
+package com.example.postgresdemo.model;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+public class QuestionRequestDTO {
+    @NotBlank
+    @Size(min = 3, max = 100)
+    private String title;
+
+    private String description;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

src/main/java/com/example/postgresdemo/model/QuestionResponseDTO.java

@@ -0,0 +1,22 @@
+package com.example.postgresdemo.model;
+
+public class QuestionResponseDTO {
+    private Long id;
+    private String body;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+}

src/main/java/com/example/postgresdemo/service/QuestionService.java

@@ -0,0 +1,63 @@
+package com.example.postgresdemo.service;
+
+import com.example.postgresdemo.exception.ResourceNotFoundException;
+import com.example.postgresdemo.model.Question;
+import com.example.postgresdemo.model.QuestionRequestDTO;
+import com.example.postgresdemo.model.QuestionResponseDTO;
+import com.example.postgresdemo.repository.QuestionRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QuestionService {
+    @Autowired
+    private QuestionRepository questionRepository;
+
+    public Page<QuestionResponseDTO> findAll(Pageable pageable) {
+        return questionRepository.findAll(pageable)
+                .map(this::toQuestionResponseDTO);
+    }
+
+    public QuestionResponseDTO create(QuestionRequestDTO questionRequest) {
+        Question question = toQuestion(questionRequest);
+        return toQuestionResponseDTO(questionRepository.save(question));
+    }
+
+    public QuestionResponseDTO update(Long questionId, QuestionRequestDTO questionRequest) {
+        Question question = toQuestion(questionRequest);
+        return questionRepository.findById(questionId)
+                .map(foundQuestion -> {
+                    foundQuestion.setTitle(question.getTitle());
+                    foundQuestion.setDescription(question.getDescription());
+                    return toQuestionResponseDTO(questionRepository.save(foundQuestion));
+                }).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
+
+    }
+
+    public ResponseEntity<?> delete(Long questionId) {
+        return questionRepository.findById(questionId)
+                .map(question -> {
+                    questionRepository.delete(question);
+                    return ResponseEntity.ok().build();
+                }).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
+    }
+
+    private QuestionResponseDTO toQuestionResponseDTO(Question question) {
+        QuestionResponseDTO questionResponse = new QuestionResponseDTO();
+        questionResponse.setId(question.getId());
+        questionResponse.setBody(question.getTitle() + "\n" + question.getDescription());
+
+
+        return questionResponse;
+    }
+
+    private Question toQuestion(QuestionRequestDTO questionRequestDTO) {
+        Question question = new Question();
+        question.setTitle(questionRequestDTO.getTitle());
+        question.setDescription(questionRequestDTO.getDescription());
+        return question;
+    }
+}

src/test/java/com/example/postgresdemo/controller/QuestionControllerTest.java

@@ -79,16 +79,15 @@ void testCreateCorrectQuestion() throws Exception {
                                 "}"))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-                .andExpect(MockMvcResultMatchers.jsonPath("$.title", Matchers.equalTo("Question 1")))
-                .andExpect(MockMvcResultMatchers.jsonPath("$.description", Matchers.equalTo("Description 1")));
+                .andExpect(MockMvcResultMatchers.jsonPath("$.body", Matchers.equalTo("Question 1\nDescription 1")));
     }
 
     @Test
     void testCreateQuestionWithoutTitle() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.post("/questions")
                         .contentType(MediaType.APPLICATION_JSON)
                         .content("{\n" +
-                                "    \"description\": \"Description\"\n" +
+                                "    \"body\": \"\\nDescription\"\n" +
                                 "}"))
                 .andExpect(status().is4xxClientError());
     }
@@ -127,9 +126,7 @@ void testCreateQuestionWithoutDescription() throws Exception {
                                 "}"))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-                .andExpect(MockMvcResultMatchers.jsonPath("$.title", Matchers.equalTo("Question 1")))
-                .andExpect(MockMvcResultMatchers.jsonPath("$.description", Matchers.equalTo(null)));
-    }
+                .andExpect(MockMvcResultMatchers.jsonPath("$.body", Matchers.equalTo("Question 1\nnull")));}
 
     @Test
     void testUpdateQuestion() throws Exception {
@@ -144,8 +141,7 @@ void testUpdateQuestion() throws Exception {
                                 "}"))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-                .andExpect(MockMvcResultMatchers.jsonPath("$.title", Matchers.equalTo("Edited Question 1")))
-                .andExpect(MockMvcResultMatchers.jsonPath("$.description", Matchers.equalTo("Edited Description 1")));
+                .andExpect(MockMvcResultMatchers.jsonPath("$.body", Matchers.equalTo("Edited Question 1\nEdited Description 1")));
     }
 
     @Test