From f1163f5ff443f29f7e0f107a0ffb63762353453e Mon Sep 17 00:00:00 2001
From: rito528 <39003544+rito528@users.noreply.github.com>
Date: Wed, 25 Sep 2024 23:14:41 +0900
Subject: [PATCH 1/5] =?UTF-8?q?chore:=20meilisync=20=E3=81=AE=E5=90=8C?=
 =?UTF-8?q?=E6=9C=9F=E5=AF=BE=E8=B1=A1=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB?=
 =?UTF-8?q?=E3=81=AB=20form=5Fanswer=5Fcomments=20=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/meilisync/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/meilisync/config.yml b/docker/meilisync/config.yml
index efacc1a5..86d568ca 100644
--- a/docker/meilisync/config.yml
+++ b/docker/meilisync/config.yml
@@ -27,4 +27,5 @@ sync:
     full: true
   - table: users
     full: true
-
+  - table: form_answer_comments
+    full: true

From 41ced3fa978bd640f336707b362266f11987f1ee Mon Sep 17 00:00:00 2001
From: rito528 <39003544+rito528@users.noreply.github.com>
Date: Wed, 25 Sep 2024 23:26:04 +0900
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20Comment=20=E3=81=AB=20answer=5Fid?=
 =?UTF-8?q?=20=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/domain/src/form/models.rs           | 1 +
 server/infra/resource/src/database/form.rs | 3 +++
 server/infra/resource/src/dto.rs           | 3 +++
 server/presentation/src/form_handler.rs    | 1 +
 4 files changed, 8 insertions(+)

diff --git a/server/domain/src/form/models.rs b/server/domain/src/form/models.rs
index 38ae8d2d..514418ab 100644
--- a/server/domain/src/form/models.rs
+++ b/server/domain/src/form/models.rs
@@ -283,6 +283,7 @@ pub type CommentId = types::Id<Comment>;
 
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 pub struct Comment {
+    pub answer_id: AnswerId,
     pub comment_id: CommentId,
     pub content: String,
     pub timestamp: DateTime<Utc>,
diff --git a/server/infra/resource/src/database/form.rs b/server/infra/resource/src/database/form.rs
index a5d39bf7..98d18804 100644
--- a/server/infra/resource/src/database/form.rs
+++ b/server/infra/resource/src/database/form.rs
@@ -603,6 +603,7 @@ impl FormDatabase for ConnectionPool {
                     iter()
                     .map(|rs| {
                         Ok::<CommentDto, InfraError>(CommentDto {
+                            answer_id: rs.try_get("", "answer_id")?,
                             comment_id: rs.try_get("", "comment_id")?,
                             content: rs.try_get("", "content")?,
                             timestamp: rs.try_get("", "timestamp")?,
@@ -712,6 +713,7 @@ impl FormDatabase for ConnectionPool {
                             })
                             .map(|rs| {
                                 Ok::<CommentDto, InfraError>(CommentDto {
+                                    answer_id: rs.try_get("", "answer_id")?,
                                     comment_id: rs.try_get("", "comment_id")?,
                                     content: rs.try_get("", "content")?,
                                     timestamp: rs.try_get("", "timestamp")?,
@@ -812,6 +814,7 @@ impl FormDatabase for ConnectionPool {
                             })
                             .map(|rs| {
                                 Ok::<CommentDto, InfraError>(CommentDto {
+                                    answer_id: rs.try_get("", "answer_id")?,
                                     comment_id: rs.try_get("", "comment_id")?,
                                     content: rs.try_get("", "content")?,
                                     timestamp: rs.try_get("", "timestamp")?,
diff --git a/server/infra/resource/src/dto.rs b/server/infra/resource/src/dto.rs
index fd24b9e3..e105c6a5 100644
--- a/server/infra/resource/src/dto.rs
+++ b/server/infra/resource/src/dto.rs
@@ -174,6 +174,7 @@ impl TryFrom<UserDto> for User {
 }
 
 pub struct CommentDto {
+    pub answer_id: i32,
     pub comment_id: i32,
     pub content: String,
     pub timestamp: DateTime<Utc>,
@@ -185,6 +186,7 @@ impl TryFrom<CommentDto> for domain::form::models::Comment {
 
     fn try_from(
         CommentDto {
+            answer_id,
             comment_id,
             content,
             timestamp,
@@ -192,6 +194,7 @@ impl TryFrom<CommentDto> for domain::form::models::Comment {
         }: CommentDto,
     ) -> Result<Self, Self::Error> {
         Ok(domain::form::models::Comment {
+            answer_id: answer_id.into(),
             comment_id: comment_id.into(),
             content,
             timestamp,
diff --git a/server/presentation/src/form_handler.rs b/server/presentation/src/form_handler.rs
index b8bfc924..50d96438 100644
--- a/server/presentation/src/form_handler.rs
+++ b/server/presentation/src/form_handler.rs
@@ -306,6 +306,7 @@ pub async fn post_form_comment(
     let comment = Comment {
         // NOTE: コメントはデータベースで insert した後に id が振られるのでデフォルト値を入れておく
         comment_id: Default::default(),
+        answer_id: comment_schema.answer_id,
         content: comment_schema.content,
         timestamp: chrono::Utc::now(),
         commented_by: user,

From 53ab2b70a50fec97fe610b8f25cd1345317c01d0 Mon Sep 17 00:00:00 2001
From: rito528 <39003544+rito528@users.noreply.github.com>
Date: Wed, 25 Sep 2024 23:29:41 +0900
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=A8=AA=E6=96=AD=E6=A4=9C?=
 =?UTF-8?q?=E7=B4=A2=E3=82=A8=E3=83=B3=E3=83=89=E3=83=9D=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E3=81=A7=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=82?=
 =?UTF-8?q?=E8=BF=94=E3=81=99=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/src/repository/search_repository.rs  |  3 ++-
 server/domain/src/search/models.rs              |  3 ++-
 .../infra/resource/src/database/components.rs   |  1 +
 server/infra/resource/src/database/search.rs    | 17 ++++++++++++++++-
 .../src/repository/search_repository_impl.rs    | 10 +++++++++-
 server/usecase/src/search.rs                    |  6 ++++--
 6 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/server/domain/src/repository/search_repository.rs b/server/domain/src/repository/search_repository.rs
index d119fd47..fc7f6813 100644
--- 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
index 4a7e9229..ed5e403c 100644
--- 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
index 70dab670..2ee76d37 100644
--- 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
index 18ed45df..732d9ff2 100644
--- 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
index 4124f53e..a6ea5322 100644
--- 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
index 9cdd9c21..ade441a6 100644
--- 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,
         })
     }
 }

From fad8b55d81713f5d8a88e16ac546e9cf97b3465b Mon Sep 17 00:00:00 2001
From: rito528 <39003544+rito528@users.noreply.github.com>
Date: Wed, 25 Sep 2024 23:32:45 +0900
Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E6=A4=9C=E7=B4=A2=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=81=A8=E3=81=8D=E3=81=AB=E3=82=AF=E3=82=A8=E3=83=AA?=
 =?UTF-8?q?=E3=81=AE=E6=89=80=E6=9C=89=E6=A8=A9=E3=82=92=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/repository/search_repository.rs       | 12 +++++-----
 .../infra/resource/src/database/components.rs | 12 +++++-----
 server/infra/resource/src/database/search.rs  | 24 +++++++++----------
 .../src/repository/search_repository_impl.rs  | 12 +++++-----
 server/usecase/src/search.rs                  | 12 +++++-----
 5 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/server/domain/src/repository/search_repository.rs b/server/domain/src/repository/search_repository.rs
index fc7f6813..79e06ae9 100644
--- a/server/domain/src/repository/search_repository.rs
+++ b/server/domain/src/repository/search_repository.rs
@@ -10,10 +10,10 @@ use crate::{
 #[automock]
 #[async_trait]
 pub trait SearchRepository: Send + Sync + 'static {
-    async fn search_users(&self, query: String) -> Result<Vec<User>, Error>;
-    async fn search_forms(&self, query: String) -> Result<Vec<Form>, Error>;
-    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>;
+    async fn search_users(&self, query: &str) -> Result<Vec<User>, Error>;
+    async fn search_forms(&self, query: &str) -> Result<Vec<Form>, Error>;
+    async fn search_labels_for_forms(&self, query: &str) -> Result<Vec<Label>, Error>;
+    async fn search_labels_for_answers(&self, query: &str) -> Result<Vec<Label>, Error>;
+    async fn search_answers(&self, query: &str) -> Result<Vec<Answer>, Error>;
+    async fn search_comments(&self, query: &str) -> Result<Vec<Comment>, Error>;
 }
diff --git a/server/infra/resource/src/database/components.rs b/server/infra/resource/src/database/components.rs
index 2ee76d37..7ac6b392 100644
--- a/server/infra/resource/src/database/components.rs
+++ b/server/infra/resource/src/database/components.rs
@@ -120,10 +120,10 @@ pub trait UserDatabase: Send + Sync {
 #[automock]
 #[async_trait]
 pub trait SearchDatabase: Send + Sync {
-    async fn search_users(&self, query: String) -> Result<Vec<User>, InfraError>;
-    async fn search_forms(&self, query: String) -> Result<Vec<Form>, InfraError>;
-    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>;
+    async fn search_users(&self, query: &str) -> Result<Vec<User>, InfraError>;
+    async fn search_forms(&self, query: &str) -> Result<Vec<Form>, InfraError>;
+    async fn search_labels_for_forms(&self, query: &str) -> Result<Vec<Label>, InfraError>;
+    async fn search_labels_for_answers(&self, query: &str) -> Result<Vec<Label>, InfraError>;
+    async fn search_answers(&self, query: &str) -> Result<Vec<Answer>, InfraError>;
+    async fn search_comments(&self, query: &str) -> Result<Vec<Comment>, InfraError>;
 }
diff --git a/server/infra/resource/src/database/search.rs b/server/infra/resource/src/database/search.rs
index 732d9ff2..d8ba1e61 100644
--- a/server/infra/resource/src/database/search.rs
+++ b/server/infra/resource/src/database/search.rs
@@ -11,12 +11,12 @@ use crate::database::{components::SearchDatabase, connection::ConnectionPool};
 
 #[async_trait]
 impl SearchDatabase for ConnectionPool {
-    async fn search_users(&self, query: String) -> Result<Vec<User>, InfraError> {
+    async fn search_users(&self, query: &str) -> Result<Vec<User>, InfraError> {
         Ok(self
             .meilisearch_client
             .index("users")
             .search()
-            .with_query(&query)
+            .with_query(query)
             .with_attributes_to_highlight(Selectors::All)
             .execute::<User>()
             .await?
@@ -26,12 +26,12 @@ impl SearchDatabase for ConnectionPool {
             .collect_vec())
     }
 
-    async fn search_forms(&self, query: String) -> Result<Vec<Form>, InfraError> {
+    async fn search_forms(&self, query: &str) -> Result<Vec<Form>, InfraError> {
         Ok(self
             .meilisearch_client
             .index("form_meta_data")
             .search()
-            .with_query(query.as_str())
+            .with_query(query)
             .with_attributes_to_highlight(Selectors::All)
             .execute::<Form>()
             .await?
@@ -41,12 +41,12 @@ impl SearchDatabase for ConnectionPool {
             .collect_vec())
     }
 
-    async fn search_labels_for_forms(&self, query: String) -> Result<Vec<Label>, InfraError> {
+    async fn search_labels_for_forms(&self, query: &str) -> Result<Vec<Label>, InfraError> {
         Ok(self
             .meilisearch_client
             .index("label_for_forms")
             .search()
-            .with_query(query.as_str())
+            .with_query(query)
             .with_attributes_to_highlight(Selectors::All)
             .execute::<Label>()
             .await?
@@ -56,12 +56,12 @@ impl SearchDatabase for ConnectionPool {
             .collect_vec())
     }
 
-    async fn search_labels_for_answers(&self, query: String) -> Result<Vec<Label>, InfraError> {
+    async fn search_labels_for_answers(&self, query: &str) -> Result<Vec<Label>, InfraError> {
         Ok(self
             .meilisearch_client
             .index("label_for_form_answers")
             .search()
-            .with_query(query.as_str())
+            .with_query(query)
             .with_attributes_to_highlight(Selectors::All)
             .execute::<Label>()
             .await?
@@ -71,12 +71,12 @@ impl SearchDatabase for ConnectionPool {
             .collect_vec())
     }
 
-    async fn search_answers(&self, query: String) -> Result<Vec<Answer>, InfraError> {
+    async fn search_answers(&self, query: &str) -> Result<Vec<Answer>, InfraError> {
         Ok(self
             .meilisearch_client
             .index("real_answers")
             .search()
-            .with_query(query.as_str())
+            .with_query(query)
             .with_attributes_to_highlight(Selectors::All)
             .execute::<Answer>()
             .await?
@@ -86,12 +86,12 @@ impl SearchDatabase for ConnectionPool {
             .collect_vec())
     }
 
-    async fn search_comments(&self, query: String) -> Result<Vec<Comment>, InfraError> {
+    async fn search_comments(&self, query: &str) -> Result<Vec<Comment>, InfraError> {
         Ok(self
             .meilisearch_client
             .index("form_answer_comments")
             .search()
-            .with_query(query.as_str())
+            .with_query(query)
             .with_attributes_to_highlight(Selectors::All)
             .execute::<Comment>()
             .await?
diff --git a/server/infra/resource/src/repository/search_repository_impl.rs b/server/infra/resource/src/repository/search_repository_impl.rs
index a6ea5322..a184d9c8 100644
--- a/server/infra/resource/src/repository/search_repository_impl.rs
+++ b/server/infra/resource/src/repository/search_repository_impl.rs
@@ -13,7 +13,7 @@ use crate::{
 
 #[async_trait]
 impl<Client: DatabaseComponents + 'static> SearchRepository for Repository<Client> {
-    async fn search_users(&self, query: String) -> Result<Vec<User>, Error> {
+    async fn search_users(&self, query: &str) -> Result<Vec<User>, Error> {
         self.client
             .search()
             .search_users(query)
@@ -21,7 +21,7 @@ impl<Client: DatabaseComponents + 'static> SearchRepository for Repository<Clien
             .map_err(Into::into)
     }
 
-    async fn search_forms(&self, query: String) -> Result<Vec<Form>, Error> {
+    async fn search_forms(&self, query: &str) -> Result<Vec<Form>, Error> {
         self.client
             .search()
             .search_forms(query)
@@ -29,7 +29,7 @@ impl<Client: DatabaseComponents + 'static> SearchRepository for Repository<Clien
             .map_err(Into::into)
     }
 
-    async fn search_labels_for_forms(&self, query: String) -> Result<Vec<Label>, Error> {
+    async fn search_labels_for_forms(&self, query: &str) -> Result<Vec<Label>, Error> {
         self.client
             .search()
             .search_labels_for_forms(query)
@@ -37,7 +37,7 @@ impl<Client: DatabaseComponents + 'static> SearchRepository for Repository<Clien
             .map_err(Into::into)
     }
 
-    async fn search_labels_for_answers(&self, query: String) -> Result<Vec<Label>, Error> {
+    async fn search_labels_for_answers(&self, query: &str) -> Result<Vec<Label>, Error> {
         self.client
             .search()
             .search_labels_for_answers(query)
@@ -45,7 +45,7 @@ impl<Client: DatabaseComponents + 'static> SearchRepository for Repository<Clien
             .map_err(Into::into)
     }
 
-    async fn search_answers(&self, query: String) -> Result<Vec<Answer>, Error> {
+    async fn search_answers(&self, query: &str) -> Result<Vec<Answer>, Error> {
         self.client
             .search()
             .search_answers(query)
@@ -53,7 +53,7 @@ impl<Client: DatabaseComponents + 'static> SearchRepository for Repository<Clien
             .map_err(Into::into)
     }
 
-    async fn search_comments(&self, query: String) -> Result<Vec<Comment>, Error> {
+    async fn search_comments(&self, query: &str) -> Result<Vec<Comment>, Error> {
         self.client
             .search()
             .search_comments(query)
diff --git a/server/usecase/src/search.rs b/server/usecase/src/search.rs
index ade441a6..ccb7a5c8 100644
--- a/server/usecase/src/search.rs
+++ b/server/usecase/src/search.rs
@@ -9,12 +9,12 @@ 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, 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_comments(query.to_owned())
+            self.repository.search_forms(&query),
+            self.repository.search_users(&query),
+            self.repository.search_labels_for_forms(&query),
+            self.repository.search_labels_for_answers(&query),
+            self.repository.search_answers(&query),
+            self.repository.search_comments(&query)
         )?;
 
         Ok(CrossSearchResult {

From 4d78443d1d6ecb6526eb9c53b02c0ad53f058a90 Mon Sep 17 00:00:00 2001
From: rito528 <39003544+rito528@users.noreply.github.com>
Date: Thu, 26 Sep 2024 00:35:39 +0900
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20meilisearch=20=E3=81=8B=E3=82=89=20s?=
 =?UTF-8?q?erialize=20=E3=81=99=E3=82=8B=E7=94=A8=E3=81=AE=20struct=20?=
 =?UTF-8?q?=E3=82=92=E5=AE=9A=E7=BE=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/domain/src/repository/search_repository.rs     |  3 ++-
 server/domain/src/search/models.rs                    | 11 ++++++++++-
 server/infra/resource/src/database/components.rs      |  5 ++++-
 server/infra/resource/src/database/search.rs          |  3 ++-
 .../resource/src/repository/search_repository_impl.rs |  3 ++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/server/domain/src/repository/search_repository.rs b/server/domain/src/repository/search_repository.rs
index 79e06ae9..bb811308 100644
--- a/server/domain/src/repository/search_repository.rs
+++ b/server/domain/src/repository/search_repository.rs
@@ -3,7 +3,8 @@ use errors::Error;
 use mockall::automock;
 
 use crate::{
-    form::models::{Answer, Comment, Form, Label},
+    form::models::{Answer, Form, Label},
+    search::models::Comment,
     user::models::User,
 };
 
diff --git a/server/domain/src/search/models.rs b/server/domain/src/search/models.rs
index ed5e403c..6732999d 100644
--- a/server/domain/src/search/models.rs
+++ b/server/domain/src/search/models.rs
@@ -1,10 +1,19 @@
 use serde::{Deserialize, Serialize};
+use uuid::Uuid;
 
 use crate::{
-    form::models::{Answer, Comment, Form, Label},
+    form::models::{Answer, AnswerId, CommentId, Form, Label},
     user::models::User,
 };
 
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct Comment {
+    pub answer_id: AnswerId,
+    pub id: CommentId,
+    pub content: String,
+    pub commented_by: Uuid,
+}
+
 #[derive(Serialize, Debug, PartialEq)]
 pub struct CrossSearchResult {
     pub forms: Vec<Form>,
diff --git a/server/infra/resource/src/database/components.rs b/server/infra/resource/src/database/components.rs
index 7ac6b392..b2f47d1e 100644
--- a/server/infra/resource/src/database/components.rs
+++ b/server/infra/resource/src/database/components.rs
@@ -125,5 +125,8 @@ pub trait SearchDatabase: Send + Sync {
     async fn search_labels_for_forms(&self, query: &str) -> Result<Vec<Label>, InfraError>;
     async fn search_labels_for_answers(&self, query: &str) -> Result<Vec<Label>, InfraError>;
     async fn search_answers(&self, query: &str) -> Result<Vec<Answer>, InfraError>;
-    async fn search_comments(&self, query: &str) -> Result<Vec<Comment>, InfraError>;
+    async fn search_comments(
+        &self,
+        query: &str,
+    ) -> Result<Vec<domain::search::models::Comment>, InfraError>;
 }
diff --git a/server/infra/resource/src/database/search.rs b/server/infra/resource/src/database/search.rs
index d8ba1e61..c7764db0 100644
--- a/server/infra/resource/src/database/search.rs
+++ b/server/infra/resource/src/database/search.rs
@@ -1,6 +1,7 @@
 use async_trait::async_trait;
 use domain::{
-    form::models::{Answer, Comment, Form, Label},
+    form::models::{Answer, Form, Label},
+    search::models::Comment,
     user::models::User,
 };
 use errors::infra::InfraError;
diff --git a/server/infra/resource/src/repository/search_repository_impl.rs b/server/infra/resource/src/repository/search_repository_impl.rs
index a184d9c8..44a824ae 100644
--- a/server/infra/resource/src/repository/search_repository_impl.rs
+++ b/server/infra/resource/src/repository/search_repository_impl.rs
@@ -1,7 +1,8 @@
 use async_trait::async_trait;
 use domain::{
-    form::models::{Answer, Comment, Form, Label},
+    form::models::{Answer, Form, Label},
     repository::search_repository::SearchRepository,
+    search::models::Comment,
     user::models::User,
 };
 use errors::Error;