refactor: Verifier trait の verify 関数として T 型の引数を受け取るように

GiganticMinecraft · Jan 19, 2025 · 6066904 · 6066904
1 parent 7e7ddef
commit 6066904
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/server/domain/src/form/answer/service.rs b/server/domain/src/form/answer/service.rs
@@ -12,14 +12,11 @@ use crate::{
 pub struct PostAnswerEntriesVerifier<'a, FormRepo: FormRepository> {
     pub form_repo: &'a FormRepo,
     pub actor: &'a User,
-    pub answer_entry: AnswerEntry,
 }
 
 #[async_trait]
 impl<FormRepo: FormRepository> Verifier<AnswerEntry> for PostAnswerEntriesVerifier<'_, FormRepo> {
-    async fn verify(self) -> Result<Verified<AnswerEntry>, Error> {
-        let target = self.answer_entry;
-
+    async fn verify(self, target: AnswerEntry) -> Result<Verified<AnswerEntry>, Error> {
         let form = self
             .form_repo
             .get(*target.form_id())

diff --git a/server/domain/src/types/verified.rs b/server/domain/src/types/verified.rs
@@ -18,7 +18,7 @@ impl<T> Verified<T> {
 
 #[async_trait]
 pub trait Verifier<T> {
-    async fn verify(self) -> Result<Verified<T>, Error>;
+    async fn verify(self, target: T) -> Result<Verified<T>, Error>;
 
     fn new_verified(inner: T) -> Verified<T> {
         Verified { inner }

diff --git a/server/usecase/src/forms/answer.rs b/server/usecase/src/forms/answer.rs
@@ -59,15 +59,14 @@ impl<
             .to_answer_title(&user, form_id, answers.as_slice())
             .await?;
 
-        let answer_entry = AnswerEntry::new(user.to_owned(), form_id, title);
-
         let verifier = PostAnswerEntriesVerifier {
             form_repo: self.form_repository,
             actor: &user,
-            answer_entry,
         };
 
-        let answer_entry = verifier.verify().await?;
+        let answer_entry = verifier
+            .verify(AnswerEntry::new(user.to_owned(), form_id, title))
+            .await?;
 
         self.answer_repository
             .post_answer(answer_entry, answers)