feat: 横断検索エンドポイントでコメントも返すように

GiganticMinecraft · Sep 25, 2024 · 53ab2b7 · 53ab2b7
1 parent 41ced3f
commit 53ab2b7
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 6 deletions.
diff --git a/server/domain/src/repository/search_repository.rs b/server/domain/src/repository/search_repository.rs
@@ -3,7 +3,7 @@ use errors::Error;
 use mockall::automock;
 
 use crate::{
-    form::models::{Answer, Form, Label},
+    form::models::{Answer, Comment, Form, Label},
     user::models::User,
 };
 
@@ -15,4 +15,5 @@ pub trait SearchRepository: Send + Sync + 'static {
     async fn search_labels_for_forms(&self, query: String) -> Result<Vec<Label>, Error>;
     async fn search_labels_for_answers(&self, query: String) -> Result<Vec<Label>, Error>;
     async fn search_answers(&self, query: String) -> Result<Vec<Answer>, Error>;
+    async fn search_comments(&self, query: String) -> Result<Vec<Comment>, Error>;
 }
diff --git a/server/domain/src/search/models.rs b/server/domain/src/search/models.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    form::models::{Answer, Form, Label},
+    form::models::{Answer, Comment, Form, Label},
     user::models::User,
 };
 
@@ -12,6 +12,7 @@ pub struct CrossSearchResult {
     pub answers: Vec<Answer>,
     pub label_for_forms: Vec<Label>,
     pub label_for_answers: Vec<Label>,
+    pub comments: Vec<Comment>,
 }
 
 #[derive(Deserialize, Debug, PartialEq)]

diff --git a/server/infra/resource/src/database/components.rs b/server/infra/resource/src/database/components.rs
@@ -125,4 +125,5 @@ pub trait SearchDatabase: Send + Sync {
     async fn search_labels_for_forms(&self, query: String) -> Result<Vec<Label>, InfraError>;
     async fn search_labels_for_answers(&self, query: String) -> Result<Vec<Label>, InfraError>;
     async fn search_answers(&self, query: String) -> Result<Vec<Answer>, InfraError>;
+    async fn search_comments(&self, query: String) -> Result<Vec<Comment>, InfraError>;
 }
diff --git a/server/infra/resource/src/database/search.rs b/server/infra/resource/src/database/search.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 use domain::{
-    form::models::{Answer, Form, Label},
+    form::models::{Answer, Comment, Form, Label},
     user::models::User,
 };
 use errors::infra::InfraError;
@@ -85,4 +85,19 @@ impl SearchDatabase for ConnectionPool {
             .map(|hit| hit.result)
             .collect_vec())
     }
+
+    async fn search_comments(&self, query: String) -> Result<Vec<Comment>, InfraError> {
+        Ok(self
+            .meilisearch_client
+            .index("form_answer_comments")
+            .search()
+            .with_query(query.as_str())
+            .with_attributes_to_highlight(Selectors::All)
+            .execute::<Comment>()
+            .await?
+            .hits
+            .into_iter()
+            .map(|hit| hit.result)
+            .collect_vec())
+    }
 }
diff --git a/server/infra/resource/src/repository/search_repository_impl.rs b/server/infra/resource/src/repository/search_repository_impl.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 use domain::{
-    form::models::{Answer, Form, Label},
+    form::models::{Answer, Comment, Form, Label},
     repository::search_repository::SearchRepository,
     user::models::User,
 };
@@ -52,4 +52,12 @@ impl<Client: DatabaseComponents + 'static> SearchRepository for Repository<Clien
             .await
             .map_err(Into::into)
     }
+
+    async fn search_comments(&self, query: String) -> Result<Vec<Comment>, Error> {
+        self.client
+            .search()
+            .search_comments(query)
+            .await
+            .map_err(Into::into)
+    }
 }
diff --git a/server/usecase/src/search.rs b/server/usecase/src/search.rs
@@ -8,12 +8,13 @@ pub struct SearchUseCase<'a, SearchRepo: SearchRepository> {
 
 impl<R: SearchRepository> SearchUseCase<'_, R> {
     pub async fn cross_search(&self, query: String) -> Result<CrossSearchResult, Error> {
-        let (forms, users, label_for_forms, label_for_answers, answers) = try_join!(
+        let (forms, users, label_for_forms, label_for_answers, answers, comments) = try_join!(
             self.repository.search_forms(query.to_owned()),
             self.repository.search_users(query.to_owned()),
             self.repository.search_labels_for_forms(query.to_owned()),
             self.repository.search_labels_for_answers(query.to_owned()),
-            self.repository.search_answers(query.to_owned())
+            self.repository.search_answers(query.to_owned()),
+            self.repository.search_comments(query.to_owned())
         )?;
 
         Ok(CrossSearchResult {
@@ -22,6 +23,7 @@ impl<R: SearchRepository> SearchUseCase<'_, R> {
             label_for_forms,
             label_for_answers,
             answers,
+            comments,
         })
     }
 }