From 1b0f81d30a6a88bf6ec730e549dd4b3910325efc Mon Sep 17 00:00:00 2001
From: HuyDuong <64969059+Deamon227@users.noreply.github.com>
Date: Thu, 11 Jul 2024 10:26:13 +0700
Subject: [PATCH] add more info related to search function

---
 .../example/controllers/SearchController.java |  5 +--
 .../java/org/example/objects/SearchDTO.java   | 36 +++++++++++--------
 .../queryresults/SearchQueryResult.java       | 30 ++++++++++++++++
 .../example/repositories/PostRepository.java  |  3 +-
 .../org/example/services/PostService.java     |  3 +-
 5 files changed, 59 insertions(+), 18 deletions(-)
 create mode 100644 BE/src/main/java/org/example/queryresults/SearchQueryResult.java

diff --git a/BE/src/main/java/org/example/controllers/SearchController.java b/BE/src/main/java/org/example/controllers/SearchController.java
index cb3b199..d9bfcab 100644
--- a/BE/src/main/java/org/example/controllers/SearchController.java
+++ b/BE/src/main/java/org/example/controllers/SearchController.java
@@ -1,6 +1,7 @@
 package org.example.controllers;
 
 import org.example.objects.SearchDTO;
+import org.example.queryresults.SearchQueryResult;
 import org.example.services.PostService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,8 +20,8 @@ public class SearchController {
 
 
     @GetMapping("/search_result")
-    public ResponseEntity<List<SearchDTO>> searchRelatedTopics(@RequestParam String key){
-        List<SearchDTO> searchResult  =  postService.searchRelatedTopics(key);
+    public ResponseEntity<List<SearchQueryResult>> searchRelatedTopics(@RequestParam String key){
+        List<SearchQueryResult> searchResult  =  postService.searchRelatedTopics(key);
         return new ResponseEntity<>(searchResult, HttpStatus.OK);
     }
 }
diff --git a/BE/src/main/java/org/example/objects/SearchDTO.java b/BE/src/main/java/org/example/objects/SearchDTO.java
index 6932664..1c4b8c7 100644
--- a/BE/src/main/java/org/example/objects/SearchDTO.java
+++ b/BE/src/main/java/org/example/objects/SearchDTO.java
@@ -1,27 +1,35 @@
 package org.example.objects;
 
+import org.example.models.Post;
+import org.example.models.User;
+
+import java.util.List;
+
 public class SearchDTO {
-    private String username;
-    private String title;
-    
-    public SearchDTO(String username, String title) {
-        this.username = username;
-        this.title = title;
+    private List<Post> posts;
+    private List<User> users;
+
+    public SearchDTO() {
+    }
+
+    public SearchDTO(List<Post> posts, List<User> users) {
+        this.posts = posts;
+        this.users = users;
     }
 
-    public String getUsername() {
-        return username;
+    public List<Post> getPosts() {
+        return posts;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setPosts(List<Post> posts) {
+        this.posts = posts;
     }
 
-    public String getTitle() {
-        return title;
+    public List<User> getUsers() {
+        return users;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
+    public void setUsers(List<User> users) {
+        this.users = users;
     }
 }
diff --git a/BE/src/main/java/org/example/queryresults/SearchQueryResult.java b/BE/src/main/java/org/example/queryresults/SearchQueryResult.java
new file mode 100644
index 0000000..abeff01
--- /dev/null
+++ b/BE/src/main/java/org/example/queryresults/SearchQueryResult.java
@@ -0,0 +1,30 @@
+package org.example.queryresults;
+
+import org.example.models.Post;
+import org.example.models.User;
+
+public class SearchQueryResult {
+//    private Post post;
+    private User user;
+
+    public SearchQueryResult(Post post, User user) {
+//        this.post = post;
+        this.user = user;
+    }
+
+//    public Post getPost() {
+//        return post;
+//    }
+//
+//    public void setPost(Post post) {
+//        this.post = post;
+//    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+}
diff --git a/BE/src/main/java/org/example/repositories/PostRepository.java b/BE/src/main/java/org/example/repositories/PostRepository.java
index 1cf0a2a..a387fa2 100644
--- a/BE/src/main/java/org/example/repositories/PostRepository.java
+++ b/BE/src/main/java/org/example/repositories/PostRepository.java
@@ -5,6 +5,7 @@ import org.example.models.Image;
 import org.example.models.Post;
 import org.example.objects.SearchDTO;
 import org.example.queryresults.PostQueryResult;
+import org.example.queryresults.SearchQueryResult;
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.repository.query.Param;
@@ -63,5 +64,5 @@ public interface PostRepository extends Neo4jRepository<Post,Long> {
         @Query("OPTIONAL MATCH (p:Post), (u:User) " +
                 "WHERE toLower(p.title) CONTAINS toLower($input) OR toLower(u.username) CONTAINS toLower($input) " +
                 "RETURN p, u;")
-        List<SearchDTO> search(@Param("input") String input);
+        List<SearchQueryResult> search(@Param("input") String input);
 }
diff --git a/BE/src/main/java/org/example/services/PostService.java b/BE/src/main/java/org/example/services/PostService.java
index 1632423..83ff593 100644
--- a/BE/src/main/java/org/example/services/PostService.java
+++ b/BE/src/main/java/org/example/services/PostService.java
@@ -9,6 +9,7 @@ import org.example.models.User;
 import org.example.models.Video;
 import org.example.objects.SearchDTO;
 import org.example.queryresults.PostQueryResult;
+import org.example.queryresults.SearchQueryResult;
 import org.example.repositories.PostRepository;
 import org.example.repositories.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -187,7 +188,7 @@ public class PostService {
     }
 
     @Transactional
-    public List<SearchDTO> searchRelatedTopics(String input){
+    public List<SearchQueryResult> searchRelatedTopics(String input){
         return postRepository.search(input);
     }
 }