Feature/create user entity and infrastructure

dev.env

@@ -0,0 +1,4 @@
+DB_URL=localhost
+DB_NAME=postgres_db
+DB_USER=postgres
+DB_PASSWORD=

docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3.5'
+
+services:
+  postgres-automaton:
+    container_name: postgres_demo_application
+    image: postgres:latest
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      PGDATA: /data/postgres
+    volumes:
+      - ./postgres-db:/data/postgres

pom.xml

@@ -24,30 +24,38 @@
 		<java.version>11</java.version>
 	</properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
 
 	<build>
 		<plugins>
@@ -58,5 +66,4 @@
 		</plugins>
 	</build>
 
-
 </project>

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

@@ -1,66 +1,66 @@
-package com.example.postgresdemo.controller;
-
-import com.example.postgresdemo.exception.ResourceNotFoundException;
-import com.example.postgresdemo.model.Answer;
-import com.example.postgresdemo.repository.AnswerRepository;
-import com.example.postgresdemo.repository.QuestionRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import javax.validation.Valid;
-import java.util.List;
-
-@RestController
-public class AnswerController {
-
-    @Autowired
-    private AnswerRepository answerRepository;
-
-    @Autowired
-    private QuestionRepository questionRepository;
-
-    @GetMapping("/questions/{questionId}/answers")
-    public List<Answer> getAnswersByQuestionId(@PathVariable Long questionId) {
-        return answerRepository.findByQuestionId(questionId);
-    }
-
-    @PostMapping("/questions/{questionId}/answers")
-    public Answer addAnswer(@PathVariable Long questionId,
-                            @Valid @RequestBody Answer answer) {
-        return questionRepository.findById(questionId)
-                .map(question -> {
-                    answer.setQuestion(question);
-                    return answerRepository.save(answer);
-                }).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
-    }
-
-    @PutMapping("/questions/{questionId}/answers/{answerId}")
-    public Answer updateAnswer(@PathVariable Long questionId,
-                               @PathVariable Long answerId,
-                               @Valid @RequestBody Answer answerRequest) {
-        if(!questionRepository.existsById(questionId)) {
-            throw new ResourceNotFoundException("Question not found with id " + questionId);
-        }
-
-        return answerRepository.findById(answerId)
-                .map(answer -> {
-                    answer.setText(answerRequest.getText());
-                    return answerRepository.save(answer);
-                }).orElseThrow(() -> new ResourceNotFoundException("Answer not found with id " + answerId));
-    }
-
-    @DeleteMapping("/questions/{questionId}/answers/{answerId}")
-    public ResponseEntity<?> deleteAnswer(@PathVariable Long questionId,
-                                          @PathVariable Long answerId) {
-        if(!questionRepository.existsById(questionId)) {
-            throw new ResourceNotFoundException("Question not found with id " + questionId);
-        }
-
-        return answerRepository.findById(answerId)
-                .map(answer -> {
-                    answerRepository.delete(answer);
-                    return ResponseEntity.ok().build();
-                }).orElseThrow(() -> new ResourceNotFoundException("Answer not found with id " + answerId));
-
-    }
-}
+package com.example.postgresdemo.controller;
+
+import com.example.postgresdemo.exception.ResourceNotFoundException;
+import com.example.postgresdemo.model.Answer;
+import com.example.postgresdemo.repository.AnswerRepository;
+import com.example.postgresdemo.repository.QuestionRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+public class AnswerController {
+
+    @Autowired
+    private AnswerRepository answerRepository;
+
+    @Autowired
+    private QuestionRepository questionRepository;
+
+    @GetMapping("/questions/{questionId}/answers")
+    public List<Answer> getAnswersByQuestionId(@PathVariable Long questionId) {
+        return answerRepository.findByQuestionId(questionId);
+    }
+
+    @PostMapping("/questions/{questionId}/answers")
+    public Answer addAnswer(@PathVariable Long questionId,
+                            @Valid @RequestBody Answer answer) {
+        return questionRepository.findById(questionId)
+                .map(question -> {
+                    answer.setQuestion(question);
+                    return answerRepository.save(answer);
+                }).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
+    }
+
+    @PutMapping("/questions/{questionId}/answers/{answerId}")
+    public Answer updateAnswer(@PathVariable Long questionId,
+                               @PathVariable Long answerId,
+                               @Valid @RequestBody Answer answerRequest) {
+        if(!questionRepository.existsById(questionId)) {
+            throw new ResourceNotFoundException("Question not found with id " + questionId);
+        }
+
+        return answerRepository.findById(answerId)
+                .map(answer -> {
+                    answer.setText(answerRequest.getText());
+                    return answerRepository.save(answer);
+                }).orElseThrow(() -> new ResourceNotFoundException("Answer not found with id " + answerId));
+    }
+
+    @DeleteMapping("/questions/{questionId}/answers/{answerId}")
+    public ResponseEntity<?> deleteAnswer(@PathVariable Long questionId,
+                                          @PathVariable Long answerId) {
+        if(!questionRepository.existsById(questionId)) {
+            throw new ResourceNotFoundException("Question not found with id " + questionId);
+        }
+
+        return answerRepository.findById(answerId)
+                .map(answer -> {
+                    answerRepository.delete(answer);
+                    return ResponseEntity.ok().build();
+                }).orElseThrow(() -> new ResourceNotFoundException("Answer not found with id " + answerId));
+
+    }
+}

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

@@ -1,50 +1,39 @@
-package com.example.postgresdemo.controller;
-
-import com.example.postgresdemo.exception.ResourceNotFoundException;
-import com.example.postgresdemo.model.Question;
-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.web.bind.annotation.*;
-import javax.validation.Valid;
-
-@RestController
-public class QuestionController {
-
-    @Autowired
-    private QuestionRepository questionRepository;
-
-    @GetMapping("/questions")
-    public Page<Question> getQuestions(Pageable pageable) {
-        return questionRepository.findAll(pageable);
-    }
-
-
-    @PostMapping("/questions")
-    public Question createQuestion(@Valid @RequestBody Question question) {
-        return questionRepository.save(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));
-    }
-
-
-    @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));
-    }
-}
+package com.example.postgresdemo.controller;
+
+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 {
+    @Autowired
+    private QuestionService questionService;
+
+    @GetMapping("/questions")
+    public Page<QuestionResponseDTO> getQuestions(Pageable pageable) {
+        return questionService.findAll(pageable);
+    }
+
+    @PostMapping("/questions")
+    public QuestionResponseDTO createQuestion(@Valid @RequestBody QuestionRequestDTO question) {
+        return questionService.create(question);
+    }
+
+    @PutMapping("/questions/{questionId}")
+    public QuestionResponseDTO updateQuestion(@PathVariable Long questionId,
+                                              @Valid @RequestBody QuestionRequestDTO questionRequest) {
+        return questionService.update(questionId, questionRequest);
+    }
+
+    @DeleteMapping("/questions/{questionId}")
+    public void deleteQuestion(@PathVariable Long questionId) {
+        questionService.delete(questionId);
+    }
+}