Add user field to question and refactor service and controller

Author: Kavazar-i

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

@@ -12,7 +12,6 @@
 import javax.validation.Valid;
 
 @RestController
-
 public class QuestionController {
     @Autowired
     private QuestionService questionService;

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

@@ -1,5 +1,9 @@
 package com.example.postgresdemo.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -23,6 +27,12 @@ public class Question extends AuditModel {
     @Column(columnDefinition = "text")
     private String description;
 
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "user_id", nullable = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JsonIgnore
+    private User user;
+
     public Long getId() {
         return id;
     }
@@ -46,4 +56,12 @@ public String getDescription() {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.example.postgresdemo.model;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 public class QuestionRequestDTO {
@@ -10,6 +11,9 @@ public class QuestionRequestDTO {
 
     private String description;
 
+    @NotNull
+    private Long authorId;
+
     public String getTitle() {
         return title;
     }
@@ -25,4 +29,12 @@ public String getDescription() {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public Long getAuthorId() {
+        return authorId;
+    }
+
+    public void setAuthorId(Long authorId) {
+        this.authorId = authorId;
+    }
 }

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

@@ -4,17 +4,22 @@
 import com.example.postgresdemo.model.Question;
 import com.example.postgresdemo.model.QuestionRequestDTO;
 import com.example.postgresdemo.model.QuestionResponseDTO;
+import com.example.postgresdemo.model.User;
 import com.example.postgresdemo.repository.QuestionRepository;
+import com.example.postgresdemo.repository.UserRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 @Service
 public class QuestionService {
     private final QuestionRepository questionRepository;
+    private final UserRepository userRepository;
 
-    public QuestionService(QuestionRepository questionRepository) {
+
+    public QuestionService(QuestionRepository questionRepository, UserRepository userRepository) {
         this.questionRepository = questionRepository;
+        this.userRepository = userRepository;
     }
 
     public Page<QuestionResponseDTO> findAll(Pageable pageable) {
@@ -23,19 +28,23 @@ public Page<QuestionResponseDTO> findAll(Pageable pageable) {
     }
 
     public QuestionResponseDTO create(QuestionRequestDTO questionRequest) {
-        Question question = toQuestion(questionRequest);
+        User user = userRepository.findById(questionRequest.getAuthorId())
+                .orElseThrow(() -> new ResourceNotFoundException("User not found with id " + questionRequest.getAuthorId()));
+        Question question = toQuestion(questionRequest, user);
         return toQuestionResponseDTO(questionRepository.save(question));
     }
 
     public QuestionResponseDTO update(Long questionId, QuestionRequestDTO questionRequest) {
-        Question question = toQuestion(questionRequest);
+        User user = userRepository.findById(questionRequest.getAuthorId())
+                .orElseThrow(() -> new ResourceNotFoundException("User not found with id " + questionRequest.getAuthorId()));
+        Question question = toQuestion(questionRequest, user);
         return questionRepository.findById(questionId)
                 .map(foundQuestion -> {
                     foundQuestion.setTitle(question.getTitle());
                     foundQuestion.setDescription(question.getDescription());
+                    foundQuestion.setUser(user);
                     return toQuestionResponseDTO(questionRepository.save(foundQuestion));
                 }).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
-
     }
 
     public void delete(Long questionId) {
@@ -53,10 +62,11 @@ private QuestionResponseDTO toQuestionResponseDTO(Question question) {
         return questionResponse;
     }
 
-    private Question toQuestion(QuestionRequestDTO questionRequestDTO) {
+    private Question toQuestion(QuestionRequestDTO questionRequestDTO, User user) {
         Question question = new Question();
         question.setTitle(questionRequestDTO.getTitle());
         question.setDescription(questionRequestDTO.getDescription());
+        question.setUser(user);
         return question;
     }
 }