fix(db): change synced_at column to synced using a bool (TabbyML#2169)

* fix(db): change synced_at column to synced using a bool

* Update method name

* [autofix.ci] apply automated fixes

* Fix tests

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

ee/tabby-db/migrations/0029_merged-provider-tables.up.sql

@@ -6,7 +6,7 @@ CREATE TABLE integrations(
     error TEXT,
     created_at TIMESTAMP NOT NULL DEFAULT (DATETIME('now')),
     updated_at TIMESTAMP NOT NULL DEFAULT (DATETIME('now')),
-    synced_at TIMESTAMP NOT NULL DEFAULT (DATETIME('now'))
+    synced BOOLEAN NOT NULL DEFAULT FALSE
 );
 
 CREATE TABLE provided_repositories(

ee/tabby-db/schema/schema.sql

@@ -180,7 +180,7 @@ CREATE TABLE integrations(
   error TEXT,
   created_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
   updated_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now')),
-  synced_at TIMESTAMP NOT NULL DEFAULT(DATETIME('now'))
+  synced BOOLEAN NOT NULL DEFAULT FALSE
 );
 CREATE TABLE provided_repositories(
   id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,

ee/tabby-db/src/integrations.rs

@@ -13,7 +13,7 @@ pub struct IntegrationDAO {
     pub access_token: String,
     pub created_at: DateTimeUtc,
     pub updated_at: DateTimeUtc,
-    pub synced_at: DateTimeUtc,
+    pub synced: bool,
 }
 
 impl DbConn {
@@ -45,7 +45,7 @@ impl DbConn {
                 access_token,
                 updated_at,
                 created_at,
-                synced_at
+                synced
             FROM integrations WHERE id = ?;"#,
             id
         )
@@ -81,7 +81,7 @@ impl DbConn {
         };
 
         let res = query!(
-            "UPDATE integrations SET display_name = ?, access_token = ?, updated_at = DATETIME('now') WHERE id = ? AND kind = ?;",
+            "UPDATE integrations SET display_name = ?, access_token = ?, updated_at = DATETIME('now'), synced = false WHERE id = ? AND kind = ?;",
             display_name,
             access_token,
             id,
@@ -101,7 +101,7 @@ impl DbConn {
 
     pub async fn update_integration_error(&self, id: i64, error: Option<String>) -> Result<()> {
         query!(
-            "UPDATE integrations SET synced_at = DATETIME('now'), error = ? WHERE id = ?",
+            "UPDATE integrations SET synced = true, error = ? WHERE id = ?",
             error,
             id
         )
@@ -146,7 +146,7 @@ impl DbConn {
                 "access_token",
                 "created_at",
                 "updated_at",
-                "synced_at"
+                "synced"
             ],
             limit,
             skip_id,

ee/tabby-schema/src/dao.rs

@@ -121,20 +121,19 @@ impl From<ServerSettingDAO> for NetworkSetting {
 impl TryFrom<IntegrationDAO> for Integration {
     type Error = anyhow::Error;
     fn try_from(value: IntegrationDAO) -> anyhow::Result<Self> {
-        let status = if *value.synced_at <= *value.updated_at {
-            IntegrationStatus::Pending
+        let status = if value.synced && value.error.is_none() {
+            IntegrationStatus::Ready
         } else if value.error.is_some() {
             IntegrationStatus::Failed
         } else {
-            IntegrationStatus::Ready
+            IntegrationStatus::Pending
         };
         Ok(Self {
             id: value.id.as_id(),
             kind: IntegrationKind::from_enum_str(&value.kind)?,
             display_name: value.display_name,
             access_token: value.access_token,
             created_at: *value.created_at,
-            synced_at: *value.synced_at,
             updated_at: *value.updated_at,
             status,
         })

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

@@ -25,7 +25,6 @@ pub struct Integration {
     pub access_token: String,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
-    pub synced_at: DateTime<Utc>,
     pub status: IntegrationStatus,
 }
 
@@ -59,5 +58,5 @@ pub trait IntegrationService: Send + Sync {
     ) -> Result<Vec<Integration>>;
 
     async fn get_integration(&self, id: ID) -> Result<Integration>;
-    async fn update_integration_error(&self, id: ID, error: Option<String>) -> Result<()>;
+    async fn update_integration_sync_status(&self, id: ID, error: Option<String>) -> Result<()>;
 }

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

@@ -97,7 +97,7 @@ impl IntegrationService for IntegrationServiceImpl {
         Ok(self.db.get_integration(id.as_rowid()?).await?.try_into()?)
     }
 
-    async fn update_integration_error(&self, id: ID, error: Option<String>) -> Result<()> {
+    async fn update_integration_sync_status(&self, id: ID, error: Option<String>) -> Result<()> {
         self.db
             .update_integration_error(id.as_rowid()?, error)
             .await?;
@@ -150,7 +150,7 @@ mod tests {
         // Test updating error status for gitlab provider
         tokio::time::sleep(Duration::from_secs(1)).await;
         integration
-            .update_integration_error(id.clone(), Some("error".into()))
+            .update_integration_sync_status(id.clone(), Some("error".into()))
             .await
             .unwrap();
 
@@ -159,7 +159,7 @@ mod tests {
 
         // Test successful status (no error)
         integration
-            .update_integration_error(id.clone(), None)
+            .update_integration_sync_status(id.clone(), None)
             .await
             .unwrap();
 

ee/tabby-webserver/src/service/repository/third_party.rs

@@ -166,7 +166,7 @@ impl ThirdPartyRepositoryService for ThirdPartyRepositoryServiceImpl {
             Ok(repos) => repos,
             Err((e, true)) => {
                 self.integration
-                    .update_integration_error(provider.id.clone(), Some("".into()))
+                    .update_integration_sync_status(provider.id.clone(), Some("".into()))
                     .await?;
                 error!(
                     "Credentials for integration {} are expired or invalid",
@@ -233,7 +233,7 @@ async fn refresh_repositories_for_provider(
     }
 
     integration
-        .update_integration_error(provider.id.clone(), None)
+        .update_integration_sync_status(provider.id.clone(), None)
         .await?;
     let num_removed = repository
         .delete_outdated_repositories(provider.id, start)