Extract input types

TabbyML · Apr 25, 2024 · 212ea92 · 212ea92
1 parent 5906b91
commit 212ea92
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 53 deletions.
diff --git a/ee/tabby-webserver/src/schema/github_repository_provider.rs b/ee/tabby-webserver/src/schema/github_repository_provider.rs
@@ -1,34 +1,10 @@
 use async_trait::async_trait;
 use chrono::{DateTime, Utc};
-use juniper::{GraphQLInputObject, GraphQLObject, ID};
-use validator::Validate;
+use juniper::{GraphQLObject, ID};
 
 use super::Context;
 use crate::{juniper::relay::NodeType, schema::Result};
 
-#[derive(GraphQLInputObject, Validate)]
-pub struct CreateRepositoryProviderInput {
-    #[validate(regex(
-        code = "displayName",
-        path = "crate::schema::constants::REPOSITORY_NAME_REGEX"
-    ))]
-    pub display_name: String,
-    #[validate(length(code = "access_token", min = 10))]
-    pub access_token: String,
-}
-
-#[derive(GraphQLInputObject, Validate)]
-pub struct UpdateRepositoryProviderInput {
-    pub id: ID,
-    #[validate(regex(
-        code = "displayName",
-        path = "crate::schema::constants::REPOSITORY_NAME_REGEX"
-    ))]
-    pub display_name: String,
-    #[validate(length(code = "access_token", min = 10))]
-    pub access_token: String,
-}
-
 #[derive(GraphQLObject, Debug, PartialEq)]
 #[graphql(context = Context)]
 pub struct GithubRepositoryProvider {

diff --git a/ee/tabby-webserver/src/schema/gitlab_repository_provider.rs b/ee/tabby-webserver/src/schema/gitlab_repository_provider.rs
@@ -1,34 +1,10 @@
 use async_trait::async_trait;
 use chrono::{DateTime, Utc};
-use juniper::{GraphQLInputObject, GraphQLObject, ID};
-use validator::Validate;
+use juniper::{GraphQLObject, ID};
 
 use super::Context;
 use crate::{juniper::relay::NodeType, schema::Result};
 
-#[derive(GraphQLInputObject, Validate)]
-pub struct CreateGitlabRepositoryProviderInput {
-    #[validate(regex(
-        code = "displayName",
-        path = "crate::schema::constants::REPOSITORY_NAME_REGEX"
-    ))]
-    pub display_name: String,
-    #[validate(length(code = "access_token", min = 10))]
-    pub access_token: String,
-}
-
-#[derive(GraphQLInputObject, Validate)]
-pub struct UpdateGitlabRepositoryProviderInput {
-    pub id: ID,
-    #[validate(regex(
-        code = "displayName",
-        path = "crate::schema::constants::REPOSITORY_NAME_REGEX"
-    ))]
-    pub display_name: String,
-    #[validate(length(code = "access_token", min = 10))]
-    pub access_token: String,
-}
-
 #[derive(GraphQLObject, Debug, PartialEq)]
 #[graphql(context = Context)]
 pub struct GitlabRepositoryProvider {

diff --git a/ee/tabby-webserver/src/schema/mod.rs b/ee/tabby-webserver/src/schema/mod.rs
@@ -9,6 +9,7 @@ pub mod job;
 pub mod license;
 pub mod repository;
 pub mod setting;
+pub mod types;
 pub mod user_event;
 pub mod worker;
 
@@ -51,11 +52,9 @@ use crate::{
     axum::FromAuth,
     juniper::relay::{self, Connection},
     schema::{
-        github_repository_provider::{
-            CreateRepositoryProviderInput, UpdateRepositoryProviderInput,
-        },
         gitlab_repository_provider::{GitlabProvidedRepository, GitlabRepositoryProvider},
         repository::FileEntrySearchResult,
+        types::{CreateRepositoryProviderInput, UpdateRepositoryProviderInput},
     },
 };
 

diff --git a/ee/tabby-webserver/src/schema/types.rs b/ee/tabby-webserver/src/schema/types.rs
@@ -0,0 +1,25 @@
+use juniper::{GraphQLInputObject, ID};
+use validator::Validate;
+
+#[derive(GraphQLInputObject, Validate)]
+pub struct CreateRepositoryProviderInput {
+    #[validate(regex(
+        code = "displayName",
+        path = "crate::schema::constants::REPOSITORY_NAME_REGEX"
+    ))]
+    pub display_name: String,
+    #[validate(length(code = "access_token", min = 10))]
+    pub access_token: String,
+}
+
+#[derive(GraphQLInputObject, Validate)]
+pub struct UpdateRepositoryProviderInput {
+    pub id: ID,
+    #[validate(regex(
+        code = "displayName",
+        path = "crate::schema::constants::REPOSITORY_NAME_REGEX"
+    ))]
+    pub display_name: String,
+    #[validate(length(code = "access_token", min = 10))]
+    pub access_token: String,
+}