chore: fix ci

Signed-off-by: Wei Zhang <[email protected]>
TabbyML · Dec 9, 2024 · aa065ac · aa065ac
1 parent fdd146a
commit aa065ac
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 39 deletions.
diff --git a/ee/tabby-schema/src/dao.rs b/ee/tabby-schema/src/dao.rs
@@ -262,6 +262,40 @@ impl From<ThreadMessageAttachmentDoc> for thread::MessageAttachmentDoc {
     }
 }
 
+pub fn from_thread_message_attachment_document(
+    doc: ThreadMessageAttachmentDoc,
+    author: Option<UserValue>,
+) -> thread::MessageAttachmentDoc {
+    match doc {
+        ThreadMessageAttachmentDoc::Web(web) => {
+            thread::MessageAttachmentDoc::Web(thread::MessageAttachmentWebDoc {
+                title: web.title,
+                link: web.link,
+                content: web.content,
+            })
+        }
+        ThreadMessageAttachmentDoc::Issue(issue) => {
+            thread::MessageAttachmentDoc::Issue(thread::MessageAttachmentIssueDoc {
+                title: issue.title,
+                link: issue.link,
+                author,
+                body: issue.body,
+                closed: issue.closed,
+            })
+        }
+        ThreadMessageAttachmentDoc::Pull(pull) => {
+            thread::MessageAttachmentDoc::Pull(thread::MessageAttachmentPullDoc {
+                title: pull.title,
+                link: pull.link,
+                author,
+                body: pull.body,
+                patch: pull.diff,
+                merged: pull.merged,
+            })
+        }
+    }
+}
+
 impl From<&thread::MessageAttachmentDoc> for ThreadMessageAttachmentDoc {
     fn from(val: &thread::MessageAttachmentDoc) -> Self {
         match val {

diff --git a/ee/tabby-schema/src/schema/thread/types.rs b/ee/tabby-schema/src/schema/thread/types.rs
@@ -5,7 +5,6 @@ use tabby_common::api::{
     code::{CodeSearchDocument, CodeSearchHit, CodeSearchScores},
     structured_doc::DocSearchDocument,
 };
-use tabby_db::ThreadMessageAttachmentDoc;
 use validator::Validate;
 
 use crate::{interface::UserValue, juniper::relay::NodeType, Context};
@@ -186,40 +185,6 @@ impl MessageAttachmentDoc {
             }),
         }
     }
-
-    pub fn from_thread_message_attachment_document(
-        doc: ThreadMessageAttachmentDoc,
-        author: Option<UserValue>,
-    ) -> Self {
-        match doc {
-            ThreadMessageAttachmentDoc::Web(web) => {
-                MessageAttachmentDoc::Web(MessageAttachmentWebDoc {
-                    title: web.title,
-                    link: web.link,
-                    content: web.content,
-                })
-            }
-            ThreadMessageAttachmentDoc::Issue(issue) => {
-                MessageAttachmentDoc::Issue(MessageAttachmentIssueDoc {
-                    title: issue.title,
-                    link: issue.link,
-                    author,
-                    body: issue.body,
-                    closed: issue.closed,
-                })
-            }
-            ThreadMessageAttachmentDoc::Pull(pull) => {
-                MessageAttachmentDoc::Pull(MessageAttachmentPullDoc {
-                    title: pull.title,
-                    link: pull.link,
-                    author,
-                    body: pull.body,
-                    patch: pull.diff,
-                    merged: pull.merged,
-                })
-            }
-        }
-    }
 }
 
 #[derive(GraphQLObject)]

diff --git a/ee/tabby-webserver/src/service/thread.rs b/ee/tabby-webserver/src/service/thread.rs
@@ -6,7 +6,7 @@ use juniper::ID;
 use tabby_db::{DbConn, ThreadMessageAttachmentDoc, ThreadMessageDAO};
 use tabby_schema::{
     auth::AuthenticationService,
-    bail,
+    bail, from_thread_message_attachment_document,
     policy::AccessPolicy,
     thread::{
         self, CreateMessageInput, CreateThreadInput, MessageAttachment, MessageAttachmentDoc,
@@ -98,9 +98,7 @@ impl ThreadServiceImpl {
                 None
             };
 
-            output.push(
-                MessageAttachmentDoc::from_thread_message_attachment_document(thread_doc, user),
-            );
+            output.push(from_thread_message_attachment_document(thread_doc, user));
         }
         output
     }