update

ee/tabby-db/migrations/0039_add-notification-inbox.up.sql

@@ -5,7 +5,7 @@ CREATE TABLE notifications (
   updated_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
 
   -- enum of admin, all_user
-  kind VARCHAR(255) NOT NULL DEFAULT 'admin',
+  recipient VARCHAR(255) NOT NULL DEFAULT 'admin',
 
   -- content of notification, in markdown format.
   content TEXT NOT NULL

ee/tabby-db/schema/schema.sql

@@ -228,7 +228,7 @@ CREATE TABLE notifications(
   created_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   updated_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   -- enum of admin, all_user
-  kind VARCHAR(255) NOT NULL DEFAULT 'admin',
+  recipient VARCHAR(255) NOT NULL DEFAULT 'admin',
   -- content of notification, in markdown format.
   content TEXT NOT NULL
 );

ee/tabby-db/src/notifications.rs

@@ -8,17 +8,17 @@ use crate::DbConn;
 pub struct NotificationDAO {
     pub id: i64,
 
-    pub kind: String,
+    pub recipient: String,
     pub content: String,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
 }
 
 impl DbConn {
-    pub async fn create_notification(&self, kind: &str, content: &str) -> Result<i64> {
+    pub async fn create_notification(&self, recipient: &str, content: &str) -> Result<i64> {
         let res = query!(
-            "INSERT INTO notifications (kind, content) VALUES (?, ?)",
-            kind,
+            "INSERT INTO notifications (recipient, content) VALUES (?, ?)",
+            recipient,
             content
         )
         .execute(&self.pool)
@@ -47,17 +47,17 @@ impl DbConn {
             .get_user(user_id)
             .await?
             .context("User doesn't exist")?;
-        let kind_clause = if user.is_admin {
-            "kind = 'all_user' OR kind = 'admin'"
+        let recipient_clause = if user.is_admin {
+            "recipient = 'all_user' OR recipient = 'admin'"
         } else {
-            "kind = 'all_user'"
+            "recipient = 'all_user'"
         };
         let date_7days_ago = Utc::now() - Duration::days(7);
         let sql = format!(
             r#"
-        SELECT notifications.id, notifications.created_at, notifications.updated_at, kind, content
+        SELECT notifications.id, notifications.created_at, notifications.updated_at, recipient, content
         FROM notifications LEFT JOIN readed_notifications ON notifications.id = readed_notifications.notification_id
-        WHERE ({kind_clause}) AND notifications.created_at > '{date_7days_ago}' AND readed_notifications.user_id IS NULL  -- notification is not marked as readed
+        WHERE ({recipient_clause}) AND notifications.created_at > '{date_7days_ago}' AND readed_notifications.user_id IS NULL  -- notification is not marked as readed
         "#
         );
         let notifications = query_as(&sql).fetch_all(&self.pool).await?;

ee/tabby-schema/src/dao.rs

@@ -11,7 +11,7 @@ use tabby_db::{
 use crate::{
     integration::{Integration, IntegrationKind, IntegrationStatus},
     interface::UserValue,
-    notification::NotificationKind,
+    notification::NotificationRecipient,
     repository::RepositoryKind,
     schema::{
         auth::{self, OAuthCredential, OAuthProvider},
@@ -469,18 +469,18 @@ impl DbEnum for thread::Role {
     }
 }
 
-impl DbEnum for NotificationKind {
+impl DbEnum for NotificationRecipient {
     fn as_enum_str(&self) -> &'static str {
         match self {
-            NotificationKind::Admin => "admin",
-            NotificationKind::AllUser => "all_user",
+            NotificationRecipient::Admin => "admin",
+            NotificationRecipient::AllUser => "all_user",
         }
     }
 
     fn from_enum_str(s: &str) -> anyhow::Result<Self> {
         match s {
-            "admin" => Ok(NotificationKind::Admin),
-            "all_user" => Ok(NotificationKind::AllUser),
+            "admin" => Ok(NotificationRecipient::Admin),
+            "all_user" => Ok(NotificationRecipient::AllUser),
             _ => bail!("{s} is not a valid value for NotificationKind"),
         }
     }

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

@@ -1,7 +1,7 @@
 use juniper::GraphQLEnum;
 
 #[derive(GraphQLEnum, Clone, Debug)]
-pub enum NotificationKind {
+pub enum NotificationRecipient {
     Admin,
     AllUser,
 }