feat(graphql): return userValue for message attachment doc

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

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/ee/tabby-schema/src/dao.rs b/ee/tabby-schema/src/dao.rs
@@ -10,6 +10,7 @@ use tabby_db::{
 
 use crate::{
     integration::{Integration, IntegrationKind, IntegrationStatus},
+    interface::UserValue,
     repository::RepositoryKind,
     schema::{
         auth::{self, OAuthCredential, OAuthProvider},
@@ -242,7 +243,7 @@ impl From<ThreadMessageAttachmentDoc> for thread::MessageAttachmentDoc {
                 thread::MessageAttachmentDoc::Issue(thread::MessageAttachmentIssueDoc {
                     title: val.title,
                     link: val.link,
-                    author: val.author_user_id.map(|x| thread::MessageAttachmentAuthor {
+                    author: val.author_user_id.map(|x| UserValue {
                         id: x,
                         email: None,
                         name: None,
@@ -255,7 +256,7 @@ impl From<ThreadMessageAttachmentDoc> for thread::MessageAttachmentDoc {
                 thread::MessageAttachmentDoc::Pull(thread::MessageAttachmentPullDoc {
                     title: val.title,
                     link: val.link,
-                    author: val.author_user_id.map(|x| thread::MessageAttachmentAuthor {
+                    author: val.author_user_id.map(|x| UserValue {
                         id: x,
                         email: None,
                         name: None,

diff --git a/ee/tabby-schema/src/schema/auth.rs b/ee/tabby-schema/src/schema/auth.rs
@@ -174,7 +174,7 @@ impl JWTPayload {
     }
 }
 
-#[derive(Debug, GraphQLObject)]
+#[derive(Debug, GraphQLObject, Clone)]
 #[graphql(context = Context, impl = [UserValue])]
 pub struct UserSecured {
     // === implements User ===

diff --git a/ee/tabby-schema/src/schema/thread/types.rs b/ee/tabby-schema/src/schema/thread/types.rs
@@ -7,7 +7,7 @@ use tabby_common::api::{
 };
 use validator::Validate;
 
-use crate::{juniper::relay::NodeType, Context};
+use crate::{interface::UserValue, juniper::relay::NodeType, Context};
 
 #[derive(GraphQLEnum, Serialize, Clone, PartialEq, Eq)]
 pub enum Role {
@@ -55,6 +55,7 @@ pub struct UpdateMessageInput {
 }
 
 #[derive(GraphQLObject, Clone, Default)]
+#[graphql(context = Context)]
 pub struct MessageAttachment {
     pub code: Vec<MessageAttachmentCode>,
     pub client_code: Vec<MessageAttachmentClientCode>,
@@ -122,6 +123,7 @@ impl From<CodeSearchHit> for MessageCodeSearchHit {
 }
 
 #[derive(GraphQLUnion, Clone)]
+#[graphql(context = Context)]
 pub enum MessageAttachmentDoc {
     Web(MessageAttachmentWebDoc),
     Issue(MessageAttachmentIssueDoc),
@@ -136,26 +138,21 @@ pub struct MessageAttachmentWebDoc {
 }
 
 #[derive(GraphQLObject, Clone)]
+#[graphql(context = Context)]
 pub struct MessageAttachmentIssueDoc {
     pub title: String,
     pub link: String,
-    pub author: Option<MessageAttachmentAuthor>,
+    pub author: Option<UserValue>,
     pub body: String,
     pub closed: bool,
 }
 
 #[derive(GraphQLObject, Clone)]
-pub struct MessageAttachmentAuthor {
-    pub id: String,
-    pub email: Option<String>,
-    pub name: Option<String>,
-}
-
-#[derive(GraphQLObject, Clone)]
+#[graphql(context = Context)]
 pub struct MessageAttachmentPullDoc {
     pub title: String,
     pub link: String,
-    pub author: Option<MessageAttachmentAuthor>,
+    pub author: Option<UserValue>,
     pub body: String,
     pub patch: String,
     pub merged: bool,
@@ -191,6 +188,7 @@ impl From<DocSearchDocument> for MessageAttachmentDoc {
 }
 
 #[derive(GraphQLObject)]
+#[graphql(context = Context)]
 pub struct MessageDocSearchHit {
     pub doc: MessageAttachmentDoc,
     pub score: f64,
@@ -256,6 +254,7 @@ pub struct ThreadAssistantMessageAttachmentsCode {
 }
 
 #[derive(GraphQLObject)]
+#[graphql(context = Context)]
 pub struct ThreadAssistantMessageAttachmentsDoc {
     pub hits: Vec<MessageDocSearchHit>,
 }
@@ -274,6 +273,7 @@ pub struct ThreadAssistantMessageCompleted {
 ///
 /// Apart from `thread_message_content_delta`, all other items will only appear once in the stream.
 #[derive(GraphQLUnion)]
+#[graphql(context = Context)]
 pub enum ThreadRunItem {
     ThreadCreated(ThreadCreated),
     ThreadRelevantQuestions(ThreadRelevantQuestions),