feat(question): add DTOs, Redis cache, and new endpoints

levaArabadji · levaArabadji · commit a953335ef595 · 2025-07-31T13:18:05.000+02:00
- Added DTOs for Question and Answer entities
- Removed @JsonIgnore annotation on Question and replaced with DTO usage
- Implemented endpoints:
  - GET /questions/random – get random question
  - GET /questions/cached – get cached question from Redis
  - GET /questions/search?keyword= – get questions by title keyword
  - DELETE /questions?keyword= – delete questions by title keyword
  - GET /questions/{id}/answers – get answers by question ID
diff --git a/pom.xml b/pom.xml
@@ -47,6 +47,24 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.34</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>5.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
+			<version>2.12.0</version>
+		</dependency>
+
+
 	</dependencies>
 
 	<build>
@@ -55,6 +73,14 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>13</source>
+					<target>13</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/src/main/java/com/example/postgresdemo/DTO/DtoAnswer.java b/src/main/java/com/example/postgresdemo/DTO/DtoAnswer.java
@@ -0,0 +1,26 @@
+package com.example.postgresdemo.DTO;
+
+import com.example.postgresdemo.model.Question;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import javax.persistence.Column;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DtoAnswer {
+   private String text;
+   private String title;
+   private String description;
+
+}
diff --git a/src/main/java/com/example/postgresdemo/DTO/DtoQuestion.java b/src/main/java/com/example/postgresdemo/DTO/DtoQuestion.java
@@ -0,0 +1,16 @@
+package com.example.postgresdemo.DTO;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DtoQuestion {
+    private String title;
+    private String description;
+}
diff --git a/src/main/java/com/example/postgresdemo/Service/RedisConfig.java b/src/main/java/com/example/postgresdemo/Service/RedisConfig.java
@@ -0,0 +1,18 @@
+package com.example.postgresdemo.Service;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+
+@Configuration
+public class RedisConfig {
+
+    @Bean
+    public JedisPool jedisPool() {
+        JedisPoolConfig config = new JedisPoolConfig();
+        config.setMaxTotal(8);
+        config.setJmxEnabled(false); // <-- Это отключает регистрацию MBean
+        return new JedisPool(config, "localhost", 6379);
+    }
+}
diff --git a/src/main/java/com/example/postgresdemo/Service/ServiceQuestion.java b/src/main/java/com/example/postgresdemo/Service/ServiceQuestion.java
@@ -0,0 +1,71 @@
+package com.example.postgresdemo.Service;
+
+import com.example.postgresdemo.DTO.DtoQuestion;
+import com.example.postgresdemo.model.Question;
+import com.example.postgresdemo.repository.QuestionRepository;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+import java.util.Random;
+
+@Service
+public class ServiceQuestion {
+
+    private final QuestionRepository questionRepository;
+
+    @Autowired
+    private JedisPool jedisPool;
+    ObjectMapper mapper = new ObjectMapper();
+
+    private static final int TTL = 3600;
+
+    @Autowired
+    public ServiceQuestion(QuestionRepository questionRepository) {
+        this.questionRepository = questionRepository;
+    }
+
+    public DtoQuestion randomQuestion() {
+        long count = questionRepository.count();
+        if (count == 0){
+            return null;
+        }
+        long min = 1200;
+        long max = 1251;
+
+        long random = min + (long) (Math.random() * ((max - min) + 1));
+        return getCachedQuestion(random);
+    }
+
+    public DtoQuestion getQuestion(Long id) {
+        return questionRepository.findById(id).
+                map(qst -> new DtoQuestion(qst.getTitle(),
+                        qst.getDescription())).orElse(null);
+    }
+
+    public DtoQuestion getCachedQuestion(Long id) {
+        try(Jedis jedis = jedisPool.getResource()) {
+
+            String key = String.format("article:%d",id);
+            String raw = jedis.get(key);
+            if(raw != null) {
+                return mapper.readValue(raw,DtoQuestion.class);
+            }
+            var article = getQuestion(id);
+            if(article == null) {
+                return null;
+            }
+
+            jedis.setex(key,TTL , mapper.writeValueAsString(article));
+            return article;
+        } catch (JsonMappingException e) {
+            throw new RuntimeException(e);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/main/java/com/example/postgresdemo/controller/AnswerController.java b/src/main/java/com/example/postgresdemo/controller/AnswerController.java
@@ -1,5 +1,6 @@
 package com.example.postgresdemo.controller;
 
+import com.example.postgresdemo.DTO.DtoAnswer;
 import com.example.postgresdemo.exception.ResourceNotFoundException;
 import com.example.postgresdemo.model.Answer;
 import com.example.postgresdemo.repository.AnswerRepository;
@@ -8,7 +9,9 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 public class AnswerController {
@@ -20,8 +23,15 @@ public class AnswerController {
     private QuestionRepository questionRepository;
 
     @GetMapping("/questions/{questionId}/answers")
-    public List<Answer> getAnswersByQuestionId(@PathVariable Long questionId) {
-        return answerRepository.findByQuestionId(questionId);
+    public List<DtoAnswer> getAnswersByQuestionId(@PathVariable Long questionId) {
+         List<Answer> answer = answerRepository.findByQuestionId(questionId);
+
+         List<DtoAnswer> dtoAnswers = answer.stream().
+                 map(ans -> new DtoAnswer(ans.getText(),
+                         ans.getQuestion().getDescription(),
+                         ans.getQuestion().getDescription())).
+                 collect(Collectors.toList());
+        return dtoAnswers;
     }
 
     @PostMapping("/questions/{questionId}/answers")
@@ -63,4 +73,6 @@ public ResponseEntity<?> deleteAnswer(@PathVariable Long questionId,
                 }).orElseThrow(() -> new ResourceNotFoundException("Answer not found with id " + answerId));
 
     }
+
+
 }
diff --git a/src/main/java/com/example/postgresdemo/controller/QuestionController.java b/src/main/java/com/example/postgresdemo/controller/QuestionController.java
@@ -1,21 +1,32 @@
 package com.example.postgresdemo.controller;
 
+import com.example.postgresdemo.DTO.DtoQuestion;
+import com.example.postgresdemo.Service.ServiceQuestion;
 import com.example.postgresdemo.exception.ResourceNotFoundException;
+import com.example.postgresdemo.model.Answer;
 import com.example.postgresdemo.model.Question;
+import com.example.postgresdemo.repository.AnswerRepository;
 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;
+import java.util.List;
 
 @RestController
 public class QuestionController {
 
     @Autowired
     private QuestionRepository questionRepository;
 
+    @Autowired
+    private AnswerRepository answerRepository;
+
+    @Autowired
+    private ServiceQuestion serviceQuestion;
+
     @GetMapping("/questions")
     public Page<Question> getQuestions(Pageable pageable) {
         return questionRepository.findAll(pageable);
@@ -47,4 +58,41 @@ public ResponseEntity<?> deleteQuestion(@PathVariable Long questionId) {
                     return ResponseEntity.ok().build();
                 }).orElseThrow(() -> new ResourceNotFoundException("Question not found with id " + questionId));
     }
+
+    @GetMapping("/getAllAnswer/{questionId}")
+    public List<Answer> getAllAnswersOnQuestion(
+            @PathVariable Long questionId) {
+        return answerRepository.findAllByQuestionId(questionId);
+    }
+
+    @GetMapping("/getQuestionByTitle")
+    public List<Question> getQuestionByTitle(
+            @RequestParam String keyword) {
+        return questionRepository.findByTitleContainingIgnoreCase(keyword);
+    }
+
+    @DeleteMapping("/deleteQuestionByTitle")
+    public ResponseEntity<?> deleteQuestionByTitle(
+            @RequestParam String keyword) {
+        return questionRepository.findByTitleContainingIgnoreCase(keyword)
+                .stream()
+                .peek(questionRepository::delete)
+                .findAny()
+                .map(question -> ResponseEntity.ok().build())
+                .orElseThrow(() ->
+                        new ResourceNotFoundException
+                                ("Question not found with key Word " + keyword));
+    }
+
+    @GetMapping("/randomQuestion")
+    public DtoQuestion getRandomQuestion() {
+        return serviceQuestion.randomQuestion();
+    }
+
+
+    @GetMapping("/questionCached/{id}")
+    public DtoQuestion getCachedQuestion(@PathVariable Long id) {
+        return serviceQuestion.getCachedQuestion(id);
+    }
+
 }
diff --git a/src/main/java/com/example/postgresdemo/model/Answer.java b/src/main/java/com/example/postgresdemo/model/Answer.java
@@ -1,13 +1,17 @@
 package com.example.postgresdemo.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 @Entity
 @Table(name = "answers")
+@Data
 public class Answer extends AuditModel {
     @Id
     @GeneratedValue(generator = "answer_generator")
@@ -19,35 +23,13 @@ public class Answer extends AuditModel {
     private Long id;
 
     @Column(columnDefinition = "text")
+    @NotBlank(message = "Description is mandatory")
+    @Size(min = 10, max = 500, message = "Description must be between 10 and 500 characters")
     private String text;
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "question_id", nullable = false)
     @OnDelete(action = OnDeleteAction.CASCADE)
-    @JsonIgnore
     private Question question;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public Question getQuestion() {
-        return question;
-    }
-
-    public void setQuestion(Question question) {
-        this.question = question;
-    }
 }
diff --git a/src/main/java/com/example/postgresdemo/model/Question.java b/src/main/java/com/example/postgresdemo/model/Question.java
diff --git a/src/main/java/com/example/postgresdemo/repository/AnswerRepository.java b/src/main/java/com/example/postgresdemo/repository/AnswerRepository.java
diff --git a/src/main/java/com/example/postgresdemo/repository/QuestionRepository.java b/src/main/java/com/example/postgresdemo/repository/QuestionRepository.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
