restructure dir for repository

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

@@ -6,7 +6,7 @@ use juniper::ID;
 use octocrab::{models::Repository, GitHubError, Octocrab};
 use tracing::warn;
 
-use crate::schema::github_repository::{GithubRepositoryProvider, GithubRepositoryService};
+use crate::schema::repository::{GithubRepositoryProvider, GithubRepositoryService};
 
 pub async fn refresh_all_repositories(service: Arc<dyn GithubRepositoryService>) -> Result<()> {
     for provider in service

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

@@ -10,7 +10,7 @@ use juniper::ID;
 use serde::Deserialize;
 use tracing::warn;
 
-use crate::schema::gitlab_repository::{GitlabRepositoryProvider, GitlabRepositoryService};
+use crate::schema::repository::{GitlabRepositoryProvider, GitlabRepositoryService};
 
 pub async fn refresh_all_repositories(service: Arc<dyn GitlabRepositoryService>) -> Result<()> {
     for provider in service

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

@@ -11,8 +11,9 @@ use tokio_cron_scheduler::Job;
 use tracing::{debug, error};
 
 use crate::schema::{
-    auth::AuthenticationService, github_repository::GithubRepositoryService,
-    gitlab_repository::GitlabRepositoryService, job::JobService,
+    auth::AuthenticationService,
+    job::JobService,
+    repository::{GithubRepositoryService, GitlabRepositoryService},
 };
 
 const EVERY_TWO_HOURS: &str = "0 0 1/2 * * * *";

ee/tabby-webserver/src/schema/mod.rs

@@ -2,14 +2,10 @@ pub mod analytic;
 pub mod auth;
 pub mod constants;
 pub mod email;
-pub mod git_repository;
-pub mod github_repository;
-pub mod gitlab_repository;
 pub mod job;
 pub mod license;
 pub mod repository;
 pub mod setting;
-pub mod types;
 pub mod user_event;
 pub mod worker;
 
@@ -38,16 +34,12 @@ use self::{
         RequestInvitationInput, RequestPasswordResetEmailInput, UpdateOAuthCredentialInput,
     },
     email::{EmailService, EmailSetting, EmailSettingInput},
-    git_repository::GitRepository,
-    github_repository::{GithubProvidedRepository, GithubRepositoryProvider},
-    gitlab_repository::{GitlabProvidedRepository, GitlabRepositoryProvider},
     job::JobStats,
     license::{IsLicenseValid, LicenseInfo, LicenseService, LicenseType},
     repository::{FileEntrySearchResult, Repository, RepositoryKind, RepositoryService},
     setting::{
         NetworkSetting, NetworkSettingInput, SecuritySetting, SecuritySettingInput, SettingService,
     },
-    types::{CreateRepositoryProviderInput, UpdateRepositoryProviderInput},
     user_event::{UserEvent, UserEventService},
 };
 use crate::{
@@ -230,7 +222,7 @@ impl Query {
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> Result<Connection<GithubRepositoryProvider>> {
+    ) -> Result<Connection<repository::GithubRepositoryProvider>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
@@ -255,7 +247,7 @@ impl Query {
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> Result<Connection<GithubProvidedRepository>> {
+    ) -> Result<Connection<repository::GithubProvidedRepository>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
@@ -280,7 +272,7 @@ impl Query {
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> Result<Connection<GitlabRepositoryProvider>> {
+    ) -> Result<Connection<repository::GitlabRepositoryProvider>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
@@ -305,7 +297,7 @@ impl Query {
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> Result<Connection<GitlabProvidedRepository>> {
+    ) -> Result<Connection<repository::GitlabProvidedRepository>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
@@ -374,7 +366,7 @@ impl Query {
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> Result<Connection<GitRepository>> {
+    ) -> Result<Connection<repository::GitRepository>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
@@ -682,7 +674,7 @@ impl Mutation {
 
     async fn create_git_repository(ctx: &Context, name: String, git_url: String) -> Result<ID> {
         check_admin(ctx).await?;
-        let input = git_repository::CreateGitRepositoryInput { name, git_url };
+        let input = repository::CreateGitRepositoryInput { name, git_url };
         input.validate()?;
         ctx.locator
             .repository()
@@ -774,7 +766,7 @@ impl Mutation {
 
     async fn create_github_repository_provider(
         ctx: &Context,
-        input: CreateRepositoryProviderInput,
+        input: repository::CreateRepositoryProviderInput,
     ) -> Result<ID> {
         check_admin(ctx).await?;
         input.validate()?;
@@ -799,7 +791,7 @@ impl Mutation {
 
     async fn update_github_repository_provider(
         ctx: &Context,
-        input: UpdateRepositoryProviderInput,
+        input: repository::UpdateRepositoryProviderInput,
     ) -> Result<bool> {
         check_admin(ctx).await?;
         input.validate()?;
@@ -826,7 +818,7 @@ impl Mutation {
 
     async fn create_gitlab_repository_provider(
         ctx: &Context,
-        input: CreateRepositoryProviderInput,
+        input: repository::CreateRepositoryProviderInput,
     ) -> Result<ID> {
         check_admin(ctx).await?;
         input.validate()?;
@@ -851,7 +843,7 @@ impl Mutation {
 
     async fn update_gitlab_repository_provider(
         ctx: &Context,
-        input: UpdateRepositoryProviderInput,
+        input: repository::UpdateRepositoryProviderInput,
     ) -> Result<bool> {
         check_admin(ctx).await?;
         input.validate()?;

ee/tabby-webserver/src/schema/git_repository.rs → ee/tabby-webserver/src/schema/repository/git_repository.rs

@@ -2,8 +2,11 @@ use async_trait::async_trait;
 use juniper::{GraphQLObject, ID};
 use validator::Validate;
 
-use super::{repository::RepositoryProvider, Context, Result};
-use crate::juniper::relay::NodeType;
+use super::RepositoryProvider;
+use crate::{
+    juniper::relay::NodeType,
+    schema::{Context, Result},
+};
 
 #[derive(Validate)]
 pub struct CreateGitRepositoryInput {

ee/tabby-webserver/src/schema/github_repository.rs → ee/tabby-webserver/src/schema/repository/github_repository.rs

@@ -2,8 +2,11 @@ use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use juniper::{GraphQLObject, ID};
 
-use super::{repository::RepositoryProvider, types::RepositoryProviderStatus, Context};
-use crate::{juniper::relay::NodeType, schema::Result};
+use super::{RepositoryProvider, RepositoryProviderStatus};
+use crate::{
+    juniper::relay::NodeType,
+    schema::{Context, Result},
+};
 
 #[derive(GraphQLObject, Debug, PartialEq)]
 #[graphql(context = Context)]

ee/tabby-webserver/src/schema/gitlab_repository.rs → ee/tabby-webserver/src/schema/repository/gitlab_repository.rs

@@ -2,8 +2,11 @@ use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use juniper::{GraphQLObject, ID};
 
-use super::{repository::RepositoryProvider, types::RepositoryProviderStatus, Context};
-use crate::{juniper::relay::NodeType, schema::Result};
+use super::{RepositoryProvider, RepositoryProviderStatus};
+use crate::{
+    juniper::relay::NodeType,
+    schema::{Context, Result},
+};
 
 #[derive(GraphQLObject, Debug, PartialEq)]
 #[graphql(context = Context)]

ee/tabby-webserver/src/schema/repository.rs → ee/tabby-webserver/src/schema/repository/mod.rs

@@ -1,17 +1,27 @@
+mod types;
+pub use types::*;
+
+mod git_repository;
+pub use git_repository::{CreateGitRepositoryInput, GitRepository, GitRepositoryService};
+
+mod github_repository;
+pub use github_repository::{
+    GithubProvidedRepository, GithubRepositoryProvider, GithubRepositoryService,
+};
+
+mod gitlab_repository;
 use std::{path::PathBuf, sync::Arc};
 
 use async_trait::async_trait;
+pub use gitlab_repository::{
+    GitlabProvidedRepository, GitlabRepositoryProvider, GitlabRepositoryService,
+};
 use juniper::{GraphQLEnum, GraphQLObject, ID};
 use serde::Deserialize;
 use tabby_common::config::{RepositoryAccess, RepositoryConfig};
 use tabby_search::FileSearch;
 
-use super::{
-    git_repository::{GitRepository, GitRepositoryService},
-    github_repository::{GithubProvidedRepository, GithubRepositoryService},
-    gitlab_repository::{GitlabProvidedRepository, GitlabRepositoryService},
-    Result,
-};
+use super::Result;
 
 #[derive(GraphQLObject, Debug)]
 pub struct FileEntrySearchResult {

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

@@ -11,12 +11,12 @@ use crate::{
     schema::{
         auth::{self, OAuthCredential, OAuthProvider},
         email::{AuthMethod, EmailSetting, Encryption},
-        git_repository::GitRepository,
-        github_repository::{GithubProvidedRepository, GithubRepositoryProvider},
-        gitlab_repository::{GitlabProvidedRepository, GitlabRepositoryProvider},
         job,
+        repository::{
+            GitRepository, GithubProvidedRepository, GithubRepositoryProvider,
+            GitlabProvidedRepository, GitlabRepositoryProvider, RepositoryProviderStatus,
+        },
         setting::{NetworkSetting, SecuritySetting},
-        types::RepositoryProviderStatus,
         user_event::{EventKind, UserEvent},
         CoreError,
     },

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

@@ -3,9 +3,6 @@ mod auth;
 mod dao;
 mod email;
 pub mod event_logger;
-mod git_repository;
-mod github_repository;
-mod gitlab_repository;
 mod job;
 mod license;
 mod proxy;

ee/tabby-webserver/src/service/git_repository.rs → ee/tabby-webserver/src/service/repository/git_repository.rs

@@ -2,11 +2,12 @@ use async_trait::async_trait;
 use juniper::ID;
 use tabby_db::DbConn;
 
-use super::{graphql_pagination_to_filter, AsID, AsRowid};
-use crate::schema::{
-    git_repository::{GitRepository, GitRepositoryService},
-    repository::{Repository, RepositoryProvider},
-    Result,
+use crate::{
+    schema::{
+        repository::{GitRepository, GitRepositoryService, Repository, RepositoryProvider},
+        Result,
+    },
+    service::{graphql_pagination_to_filter, AsID, AsRowid},
 };
 
 #[async_trait]

ee/tabby-webserver/src/service/github_repository.rs → ee/tabby-webserver/src/service/repository/github_repository.rs

@@ -6,16 +6,15 @@ use juniper::ID;
 use tabby_db::DbConn;
 use url::Url;
 
-use super::{AsID, AsRowid};
 use crate::{
     schema::{
-        github_repository::{
+        repository::{
             GithubProvidedRepository, GithubRepositoryProvider, GithubRepositoryService,
+            Repository, RepositoryProvider,
         },
-        repository::{Repository, RepositoryProvider},
         Result,
     },
-    service::graphql_pagination_to_filter,
+    service::{graphql_pagination_to_filter, AsID, AsRowid},
 };
 
 struct GithubRepositoryProviderServiceImpl {
@@ -216,7 +215,7 @@ mod tests {
     use chrono::Duration;
 
     use super::*;
-    use crate::{schema::types::RepositoryProviderStatus, service::AsID};
+    use crate::{schema::repository::RepositoryProviderStatus, service::AsID};
 
     #[tokio::test]
     async fn test_github_provided_repositories() {

ee/tabby-webserver/src/service/gitlab_repository.rs → ee/tabby-webserver/src/service/repository/gitlab_repository.rs

@@ -6,16 +6,15 @@ use juniper::ID;
 use tabby_db::DbConn;
 use url::Url;
 
-use super::{AsID, AsRowid};
 use crate::{
     schema::{
-        gitlab_repository::{
+        repository::{
             GitlabProvidedRepository, GitlabRepositoryProvider, GitlabRepositoryService,
+            Repository, RepositoryProvider,
         },
-        repository::{Repository, RepositoryProvider},
         Result,
     },
-    service::graphql_pagination_to_filter,
+    service::{graphql_pagination_to_filter, AsID, AsRowid},
 };
 
 struct GitlabRepositoryProviderServiceImpl {
@@ -219,7 +218,7 @@ mod tests {
     use chrono::Duration;
 
     use super::*;
-    use crate::{schema::types::RepositoryProviderStatus, service::AsID};
+    use crate::{schema::repository::RepositoryProviderStatus, service::AsID};
 
     #[tokio::test]
     async fn test_gitlab_provided_repositories() {

ee/tabby-webserver/src/service/repository.rs → ee/tabby-webserver/src/service/repository/mod.rs

@@ -1,16 +1,20 @@
+mod git_repository;
+mod github_repository;
+mod gitlab_repository;
+
 use std::sync::Arc;
 
 use async_trait::async_trait;
 use juniper::ID;
 use tabby_common::config::{RepositoryAccess, RepositoryConfig};
 use tabby_db::DbConn;
 
-use super::{github_repository, gitlab_repository, Result};
 use crate::schema::{
-    git_repository::GitRepositoryService,
-    github_repository::GithubRepositoryService,
-    gitlab_repository::GitlabRepositoryService,
-    repository::{FileEntrySearchResult, Repository, RepositoryKind, RepositoryService},
+    repository::{
+        FileEntrySearchResult, GitRepositoryService, GithubRepositoryService,
+        GitlabRepositoryService, Repository, RepositoryKind, RepositoryService,
+    },
+    Result,
 };
 
 struct RepositoryServiceImpl {