feat(graphQL): add author_email in pull/issue thread attachment

ee/tabby-db/src/lib.rs

@@ -14,9 +14,9 @@ pub use repositories::RepositoryDAO;
 pub use server_setting::ServerSettingDAO;
 use sqlx::{query, query_scalar, sqlite::SqliteQueryResult, Pool, Sqlite, SqlitePool};
 pub use threads::{
-    ThreadDAO, ThreadMessageAttachmentClientCode, ThreadMessageAttachmentCode,
-    ThreadMessageAttachmentDoc, ThreadMessageAttachmentIssueDoc, ThreadMessageAttachmentPullDoc,
-    ThreadMessageAttachmentWebDoc, ThreadMessageDAO,
+    ThreadDAO, ThreadMessageAttachmentAuthor, ThreadMessageAttachmentClientCode,
+    ThreadMessageAttachmentCode, ThreadMessageAttachmentDoc, ThreadMessageAttachmentIssueDoc,
+    ThreadMessageAttachmentPullDoc, ThreadMessageAttachmentWebDoc, ThreadMessageDAO,
 };
 use tokio::sync::Mutex;
 use user_completions::UserCompletionDailyStatsDAO;

ee/tabby-db/src/threads.rs

@@ -50,6 +50,7 @@
 pub struct ThreadMessageAttachmentIssueDoc {
     pub title: String,
     pub link: String,
+    pub author_user_id: Option<String>,
     pub body: String,
     pub closed: bool,
 }
@@ -58,11 +59,19 @@
 pub struct ThreadMessageAttachmentPullDoc {
     pub title: String,
     pub link: String,
+    pub author_user_id: Option<String>,
     pub body: String,
     pub diff: String,
     pub merged: bool,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct ThreadMessageAttachmentAuthor {
+    pub id: String,
+    pub name: String,
+    pub email: String,
+}
+
 #[derive(Serialize, Deserialize)]
 pub struct ThreadMessageAttachmentCode {
     pub git_url: String,

ee/tabby-schema/graphql/schema.graphql

@@ -512,13 +512,15 @@ type MessageAttachmentCodeScores {
 type MessageAttachmentIssueDoc {
   title: String!
   link: String!
+  author: User
   body: String!
   closed: Boolean!
 }
 
 type MessageAttachmentPullDoc {
   title: String!
   link: String!
+  author: User
   body: String!
   patch: String!
   merged: Boolean!

ee/tabby-schema/src/dao.rs

@@ -5,11 +5,12 @@
     EmailSettingDAO, IntegrationDAO, InvitationDAO, JobRunDAO, OAuthCredentialDAO,
     ServerSettingDAO, ThreadDAO, ThreadMessageAttachmentClientCode, ThreadMessageAttachmentCode,
     ThreadMessageAttachmentDoc, ThreadMessageAttachmentIssueDoc, ThreadMessageAttachmentPullDoc,
-    ThreadMessageAttachmentWebDoc, ThreadMessageDAO, UserEventDAO,
+    ThreadMessageAttachmentWebDoc, UserEventDAO,
 };
 
 use crate::{
     integration::{Integration, IntegrationKind, IntegrationStatus},
+    interface::UserValue,
     repository::RepositoryKind,
     schema::{
         auth::{self, OAuthCredential, OAuthProvider},
@@ -22,7 +23,7 @@
         user_event::{EventKind, UserEvent},
         CoreError,
     },
-    thread::{self, MessageAttachment},
+    thread::{self},
 };
 
 impl From<InvitationDAO> for auth::Invitation {
@@ -228,33 +229,36 @@
     }
 }
 
-impl From<ThreadMessageAttachmentDoc> for thread::MessageAttachmentDoc {
-    fn from(value: ThreadMessageAttachmentDoc) -> Self {
-        match value {
-            ThreadMessageAttachmentDoc::Web(val) => {
-                thread::MessageAttachmentDoc::Web(thread::MessageAttachmentWebDoc {
-                    title: val.title,
-                    link: val.link,
-                    content: val.content,
-                })
-            }
-            ThreadMessageAttachmentDoc::Issue(val) => {
-                thread::MessageAttachmentDoc::Issue(thread::MessageAttachmentIssueDoc {
-                    title: val.title,
-                    link: val.link,
-                    body: val.body,
-                    closed: val.closed,
-                })
-            }
-            ThreadMessageAttachmentDoc::Pull(val) => {
-                thread::MessageAttachmentDoc::Pull(thread::MessageAttachmentPullDoc {
-                    title: val.title,
-                    link: val.link,
-                    body: val.body,
-                    patch: val.diff,
-                    merged: val.merged,
-                })
-            }
+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,
+            })
         }
     }
 }
@@ -273,6 +277,9 @@
                 ThreadMessageAttachmentDoc::Issue(ThreadMessageAttachmentIssueDoc {
                     title: val.title.clone(),
                     link: val.link.clone(),
+                    author_user_id: val.author.as_ref().map(|x| match x {
+                        UserValue::UserSecured(user) => user.id.to_string(),
+                    }),
                     body: val.body.clone(),
                     closed: val.closed,
                 })
@@ -281,6 +288,9 @@
                 ThreadMessageAttachmentDoc::Pull(ThreadMessageAttachmentPullDoc {
                     title: val.title.clone(),
                     link: val.link.clone(),
+                    author_user_id: val.author.as_ref().map(|x| match x {
+                        UserValue::UserSecured(user) => user.id.to_string(),
+                    }),
                     body: val.body.clone(),
                     diff: val.patch.clone(),
                     merged: val.merged,
@@ -301,37 +311,6 @@
     }
 }
 
-impl TryFrom<ThreadMessageDAO> for thread::Message {
-    type Error = anyhow::Error;
-    fn try_from(value: ThreadMessageDAO) -> Result<Self, Self::Error> {
-        let code = value.code_attachments;
-        let client_code = value.client_code_attachments;
-        let doc = value.doc_attachments;
-
-        let attachment = MessageAttachment {
-            code: code
-                .map(|x| x.0.into_iter().map(|i| i.into()).collect())
-                .unwrap_or_default(),
-            client_code: client_code
-                .map(|x| x.0.into_iter().map(|i| i.into()).collect())
-                .unwrap_or_default(),
-            doc: doc
-                .map(|x| x.0.into_iter().map(|i| i.into()).collect())
-                .unwrap_or_default(),
-        };
-
-        Ok(Self {
-            id: value.id.as_id(),
-            thread_id: value.thread_id.as_id(),
-            role: thread::Role::from_enum_str(&value.role)?,
-            content: value.content,
-            attachment,
-            created_at: value.created_at,
-            updated_at: value.updated_at,
-        })
-    }
-}
-
 lazy_static! {
     static ref HASHER: HashIds = HashIds::builder()
         .with_salt("tabby-id-serializer")

ee/tabby-schema/src/schema/auth.rs

@@ -174,7 +174,7 @@
     }
 }
 
-#[derive(Debug, GraphQLObject)]
+#[derive(Debug, GraphQLObject, Clone)]
 #[graphql(context = Context, impl = [UserValue])]
 pub struct UserSecured {
     // === implements User ===

ee/tabby-schema/src/schema/thread/types.rs

@@ -3,11 +3,11 @@
 use serde::Serialize;
 use tabby_common::api::{
     code::{CodeSearchDocument, CodeSearchHit, CodeSearchScores},
-    structured_doc::{DocSearchDocument, DocSearchHit},
+    structured_doc::DocSearchDocument,
 };
 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 @@
 }
 
 #[derive(GraphQLObject, Clone, Default)]
+#[graphql(context = Context)]
 pub struct MessageAttachment {
     pub code: Vec<MessageAttachmentCode>,
     pub client_code: Vec<MessageAttachmentClientCode>,
@@ -122,6 +123,7 @@
 }
 
 #[derive(GraphQLUnion, Clone)]
+#[graphql(context = Context)]
 pub enum MessageAttachmentDoc {
     Web(MessageAttachmentWebDoc),
     Issue(MessageAttachmentIssueDoc),
@@ -136,24 +138,28 @@
 }
 
 #[derive(GraphQLObject, Clone)]
+#[graphql(context = Context)]
 pub struct MessageAttachmentIssueDoc {
     pub title: String,
     pub link: String,
+    pub author: Option<UserValue>,
     pub body: String,
     pub closed: bool,
 }
 
 #[derive(GraphQLObject, Clone)]
+#[graphql(context = Context)]
 pub struct MessageAttachmentPullDoc {
     pub title: String,
     pub link: String,
+    pub author: Option<UserValue>,
     pub body: String,
     pub patch: String,
     pub merged: bool,
 }
 
-impl From<DocSearchDocument> for MessageAttachmentDoc {
-    fn from(doc: DocSearchDocument) -> Self {
+impl MessageAttachmentDoc {
+    pub fn from_doc_search_document(doc: DocSearchDocument, author: Option<UserValue>) -> Self {
         match doc {
             DocSearchDocument::Web(web) => MessageAttachmentDoc::Web(MessageAttachmentWebDoc {
                 title: web.title,
@@ -164,13 +170,15 @@
                 MessageAttachmentDoc::Issue(MessageAttachmentIssueDoc {
                     title: issue.title,
                     link: issue.link,
+                    author,
                     body: issue.body,
                     closed: issue.closed,
                 })
             }
             DocSearchDocument::Pull(pull) => MessageAttachmentDoc::Pull(MessageAttachmentPullDoc {
                 title: pull.title,
                 link: pull.link,
+                author,
                 body: pull.body,
                 patch: pull.diff,
                 merged: pull.merged,
@@ -180,20 +188,12 @@
 }
 
 #[derive(GraphQLObject)]
+#[graphql(context = Context)]
 pub struct MessageDocSearchHit {
     pub doc: MessageAttachmentDoc,
     pub score: f64,
 }
 
-impl From<DocSearchHit> for MessageDocSearchHit {
-    fn from(hit: DocSearchHit) -> Self {
-        Self {
-            doc: hit.doc.into(),
-            score: hit.score as f64,
-        }
-    }
-}
-
 #[derive(GraphQLObject)]
 #[graphql(context = Context)]
 pub struct Thread {
@@ -245,6 +245,7 @@
 }
 
 #[derive(GraphQLObject)]
+#[graphql(context = Context)]
 pub struct ThreadAssistantMessageAttachmentsDoc {
     pub hits: Vec<MessageDocSearchHit>,
 }
@@ -263,6 +264,7 @@
 ///
 /// 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),

ee/tabby-webserver/src/service/access_policy.rs

@@ -57,3 +57,18 @@ impl AccessPolicyService for AccessPolicyServiceImpl {
 pub fn create(db: DbConn, context: Arc<dyn ContextService>) -> impl AccessPolicyService {
     AccessPolicyServiceImpl { db, context }
 }
+
+#[cfg(test)]
+pub mod testutils {
+    use tabby_schema::policy::AccessPolicy;
+
+    use super::*;
+
+    pub async fn make_policy() -> AccessPolicy {
+        AccessPolicy::new(
+            DbConn::new_in_memory().await.unwrap(),
+            &ID::from("nihao".to_string()),
+            false,
+        )
+    }
+}