refactor(webserver): cleanup directory structure / naming for Repository / GitRepository / GithubRepository / GitlabRepository

ee/tabby-webserver/src/cron/db/github.rs

@@ -6,39 +6,35 @@
 use octocrab::{models::Repository, GitHubError, Octocrab};
 use tracing::warn;
 
-use crate::schema::github_repository_provider::{
-    GithubRepositoryProvider, GithubRepositoryProviderService,
-};
+use crate::schema::repository::{GithubRepositoryProvider, GithubRepositoryService};
 
-pub async fn refresh_all_repositories(
-    service: Arc<dyn GithubRepositoryProviderService>,
-) -> Result<()> {
+pub async fn refresh_all_repositories(service: Arc<dyn GithubRepositoryService>) -> Result<()> {
     for provider in service
-        .list_github_repository_providers(vec![], None, None, None, None)
+        .list_providers(vec![], None, None, None, None)
         .await?
     {
         let start = Utc::now();
         refresh_repositories_for_provider(service.clone(), provider.id.clone()).await?;
         service
-            .delete_outdated_github_provided_repositories(provider.id, start)
+            .delete_outdated_repositories(provider.id, start)
             .await?;
     }
     Ok(())
 }
 
 async fn refresh_repositories_for_provider(
-    service: Arc<dyn GithubRepositoryProviderService>,
+    service: Arc<dyn GithubRepositoryService>,
     provider_id: ID,
 ) -> Result<()> {
-    let provider = service.get_github_repository_provider(provider_id).await?;
+    let provider = service.get_provider(provider_id).await?;
     let repos = match fetch_all_repos(&provider).await {
         Ok(repos) => repos,
         Err(octocrab::Error::GitHub {
             source: source @ GitHubError { .. },
             ..
         }) if source.status_code.is_client_error() => {
             service
-                .update_github_repository_provider_sync_status(provider.id.clone(), false)
+                .update_provider_status(provider.id.clone(), false)
                 .await?;
             warn!(
                 "GitHub credentials for provider {} are expired or invalid",
@@ -64,7 +60,7 @@
         let url = url.strip_suffix(".git").unwrap_or(&url);
 
         service
-            .upsert_github_provided_repository(
+            .upsert_repository(
                 provider.id.clone(),
                 id,
                 repo.full_name.unwrap_or(repo.name),
@@ -73,7 +69,7 @@
             .await?;
     }
     service
-        .update_github_repository_provider_sync_status(provider.id.clone(), true)
+        .update_provider_status(provider.id.clone(), true)
         .await?;
 
     Ok(())

ee/tabby-webserver/src/cron/db/gitlab.rs

@@ -10,36 +10,32 @@
 use serde::Deserialize;
 use tracing::warn;
 
-use crate::schema::gitlab_repository_provider::{
-    GitlabRepositoryProvider, GitlabRepositoryProviderService,
-};
+use crate::schema::repository::{GitlabRepositoryProvider, GitlabRepositoryService};
 
-pub async fn refresh_all_repositories(
-    service: Arc<dyn GitlabRepositoryProviderService>,
-) -> Result<()> {
+pub async fn refresh_all_repositories(service: Arc<dyn GitlabRepositoryService>) -> Result<()> {
     for provider in service
-        .list_gitlab_repository_providers(vec![], None, None, None, None)
+        .list_providers(vec![], None, None, None, None)
         .await?
     {
         let start = Utc::now();
         refresh_repositories_for_provider(service.clone(), provider.id.clone()).await?;
         service
-            .delete_outdated_gitlab_provided_repositories(provider.id, start)
+            .delete_outdated_repositories(provider.id, start)
             .await?;
     }
     Ok(())
 }
 
 async fn refresh_repositories_for_provider(
-    service: Arc<dyn GitlabRepositoryProviderService>,
+    service: Arc<dyn GitlabRepositoryService>,
     provider_id: ID,
 ) -> Result<()> {
-    let provider = service.get_gitlab_repository_provider(provider_id).await?;
+    let provider = service.get_provider(provider_id).await?;
     let repos = match fetch_all_repos(&provider).await {
         Ok(repos) => repos,
         Err(e) if e.to_string().contains("401 Unauthorized") => {
             service
-                .update_gitlab_repository_provider_sync_status(provider.id.clone(), false)
+                .update_provider_status(provider.id.clone(), false)
                 .await?;
             warn!(
                 "GitLab credentials for provider {} are expired or invalid",
@@ -58,7 +54,7 @@
         let url = url.strip_suffix(".git").unwrap_or(&url);
 
         service
-            .upsert_gitlab_provided_repository(
+            .upsert_repository(
                 provider.id.clone(),
                 id,
                 repo.name_with_namespace,
@@ -67,7 +63,7 @@
             .await?;
     }
     service
-        .update_gitlab_repository_provider_sync_status(provider.id.clone(), true)
+        .update_provider_status(provider.id.clone(), true)
         .await?;
 
     Ok(())

ee/tabby-webserver/src/cron/db/mod.rs

@@ -11,8 +11,9 @@
 use tracing::{debug, error};
 
 use crate::schema::{
-    auth::AuthenticationService, github_repository_provider::GithubRepositoryProviderService,
-    gitlab_repository_provider::GitlabRepositoryProviderService, job::JobService,
+    auth::AuthenticationService,
+    job::JobService,
+    repository::{GithubRepositoryService, GitlabRepositoryService},
 };
 
 const EVERY_TWO_HOURS: &str = "0 0 1/2 * * * *";
@@ -64,7 +65,7 @@
 }
 
 pub async fn update_integrated_github_repositories_job(
-    github_repository_provider: Arc<dyn GithubRepositoryProviderService>,
+    github_repository_provider: Arc<dyn GithubRepositoryService>,
 ) -> Result<Job> {
     service_job(
         "sync github repositories",
@@ -79,7 +80,7 @@
 }
 
 pub async fn update_integrated_gitlab_repositories_job(
-    gitlab_repository_provider: Arc<dyn GitlabRepositoryProviderService>,
+    gitlab_repository_provider: Arc<dyn GitlabRepositoryService>,
 ) -> Result<Job> {
     service_job(
         "sync gitlab repositories",