Subpackage common -> ariadne (#3323)

* Subpackage common -> ariadne

* add common

* Remove build

* only build labrinth

* common

* set sqlx offline

* copy dirs

* Fix build

apps/labrinth/tests/analytics.rs

@@ -1,3 +1,4 @@
+use ariadne::ids::base62_impl::parse_base62;
 use chrono::{DateTime, Duration, Utc};
 use common::permissions::PermissionsTest;
 use common::permissions::PermissionsTestContext;
@@ -7,7 +8,6 @@ use common::{
     environment::{with_test_environment, TestEnvironment},
 };
 use itertools::Itertools;
-use labrinth::common::ids::base62_impl::parse_base62;
 use labrinth::models::teams::ProjectPermissions;
 use labrinth::queue::payouts;
 use rust_decimal::{prelude::ToPrimitive, Decimal};

apps/labrinth/tests/common/api_common/generic.rs

@@ -7,7 +7,7 @@ use labrinth::models::{
     teams::{OrganizationPermissions, ProjectPermissions},
 };
 
-use crate::common::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
+use ariadne::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
 
 use super::{
     models::{CommonProject, CommonVersion},
@@ -81,7 +81,7 @@ delegate_api_variant!(
         [add_gallery_item, ServiceResponse, id_or_slug: &str, image: ImageData,  featured: bool, title: Option<String>, description: Option<String>, ordering: Option<i32>, pat: Option<&str>],
         [remove_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, pat: Option<&str>],
         [edit_gallery_item, ServiceResponse, id_or_slug: &str, image_url: &str, patch: HashMap<String, String>, pat: Option<&str>],
-        [create_report, ServiceResponse, report_type: &str, id: &str, item_type: crate::common::api_common::models::CommonItemType, body: &str, pat: Option<&str>],
+        [create_report, ServiceResponse, report_type: &str, id: &str, item_type: ariadne::api_common::models::CommonItemType, body: &str, pat: Option<&str>],
         [get_report, ServiceResponse, id: &str, pat: Option<&str>],
         [get_reports, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [get_user_reports, ServiceResponse, pat: Option<&str>],
@@ -100,9 +100,9 @@ delegate_api_variant!(
     #[async_trait(?Send)]
     impl ApiTags for GenericApi {
         [get_loaders, ServiceResponse,],
-        [get_loaders_deserialized_common, Vec<crate::common::api_common::models::CommonLoaderData>,],
+        [get_loaders_deserialized_common, Vec<ariadne::api_common::models::CommonLoaderData>,],
         [get_categories, ServiceResponse,],
-        [get_categories_deserialized_common, Vec<crate::common::api_common::models::CommonCategoryData>,],
+        [get_categories_deserialized_common, Vec<ariadne::api_common::models::CommonCategoryData>,],
     }
 );
 
@@ -110,18 +110,18 @@ delegate_api_variant!(
     #[async_trait(?Send)]
     impl ApiTeams for GenericApi {
         [get_team_members, ServiceResponse, team_id: &str, pat: Option<&str>],
-        [get_team_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, team_id: &str, pat: Option<&str>],
+        [get_team_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, team_id: &str, pat: Option<&str>],
         [get_teams_members, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [get_project_members, ServiceResponse, id_or_slug: &str, pat: Option<&str>],
-        [get_project_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, id_or_slug: &str, pat: Option<&str>],
+        [get_project_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, id_or_slug: &str, pat: Option<&str>],
         [get_organization_members, ServiceResponse, id_or_title: &str, pat: Option<&str>],
-        [get_organization_members_deserialized_common, Vec<crate::common::api_common::models::CommonTeamMember>, id_or_title: &str, pat: Option<&str>],
+        [get_organization_members_deserialized_common, Vec<ariadne::api_common::models::CommonTeamMember>, id_or_title: &str, pat: Option<&str>],
         [join_team, ServiceResponse, team_id: &str, pat: Option<&str>],
         [remove_from_team, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>],
         [edit_team_member, ServiceResponse, team_id: &str, user_id: &str, patch: serde_json::Value, pat: Option<&str>],
         [transfer_team_ownership, ServiceResponse, team_id: &str, user_id: &str, pat: Option<&str>],
         [get_user_notifications, ServiceResponse, user_id: &str, pat: Option<&str>],
-        [get_user_notifications_deserialized_common, Vec<crate::common::api_common::models::CommonNotification>, user_id: &str, pat: Option<&str>],
+        [get_user_notifications_deserialized_common, Vec<ariadne::api_common::models::CommonNotification>, user_id: &str, pat: Option<&str>],
         [get_notification, ServiceResponse, notification_id: &str, pat: Option<&str>],
         [get_notifications, ServiceResponse, ids: &[&str], pat: Option<&str>],
         [mark_notification_read, ServiceResponse, notification_id: &str, pat: Option<&str>],

apps/labrinth/tests/common/api_common/request_data.rs

@@ -3,7 +3,7 @@
 
 use labrinth::util::actix::MultipartSegment;
 
-use crate::common::dummy_data::TestFile;
+use ariadne::dummy_data::TestFile;
 
 #[allow(dead_code)]
 pub struct ProjectCreationRequestData {

apps/labrinth/tests/common/api_v2/project.rs

@@ -24,7 +24,7 @@ use labrinth::{
 };
 use serde_json::json;
 
-use crate::common::database::MOD_USER_PAT;
+use ariadne::database::MOD_USER_PAT;
 
 use super::{
     request_data::{self, get_public_project_creation_data},

apps/labrinth/tests/common/api_v2/request_data.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 use serde_json::json;
 
-use crate::common::{
+use ariadne::{
     api_common::request_data::{
         ProjectCreationRequestData, VersionCreationRequestData,
     },

apps/labrinth/tests/common/api_v2/user.rs

@@ -1,6 +1,6 @@
 use super::ApiV2;
-use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
 use actix_web::{dev::ServiceResponse, test};
+use ariadne::api_common::{Api, ApiUser, AppendsOptionalPat};
 use async_trait::async_trait;
 
 #[async_trait(?Send)]

apps/labrinth/tests/common/api_v3/request_data.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 use serde_json::json;
 
-use crate::common::{
+use ariadne::{
     api_common::request_data::{
         ProjectCreationRequestData, VersionCreationRequestData,
     },

apps/labrinth/tests/common/api_v3/user.rs

@@ -1,7 +1,7 @@
 use actix_web::{dev::ServiceResponse, test};
 use async_trait::async_trait;
 
-use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
+use ariadne::api_common::{Api, ApiUser, AppendsOptionalPat};
 
 use super::ApiV3;
 

apps/labrinth/tests/common/asserts.rs

@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
-use crate::common::get_json_val_str;
+use ariadne::get_json_val_str;
 use itertools::Itertools;
 use labrinth::models::v3::projects::Version;
 

apps/labrinth/tests/common/database.rs

@@ -5,7 +5,7 @@ use sqlx::{postgres::PgPoolOptions, PgPool};
 use std::time::Duration;
 use url::Url;
 
-use crate::common::{dummy_data, environment::TestEnvironment};
+use ariadne::{dummy_data, environment::TestEnvironment};
 
 use super::{api_v3::ApiV3, dummy_data::DUMMY_DATA_UPDATE};
 

apps/labrinth/tests/common/permissions.rs

@@ -6,7 +6,7 @@ use itertools::Itertools;
 use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
 use serde_json::json;
 
-use crate::common::{
+use ariadne::{
     api_common::ApiTeams,
     database::{generate_random_name, ADMIN_USER_PAT},
 };

apps/labrinth/tests/loader_fields.rs

@@ -9,13 +9,11 @@ use labrinth::database::models::legacy_loader_fields::MinecraftGameVersion;
 use labrinth::models::v3;
 use serde_json::json;
 
-use crate::common::api_common::{ApiProject, ApiVersion};
-use crate::common::api_v3::request_data::get_public_project_creation_data;
-use crate::common::database::*;
+use ariadne::api_common::{ApiProject, ApiVersion};
+use ariadne::api_v3::request_data::get_public_project_creation_data;
+use ariadne::database::*;
 
-use crate::common::dummy_data::{
-    DummyProjectAlpha, DummyProjectBeta, TestFile,
-};
+use ariadne::dummy_data::{DummyProjectAlpha, DummyProjectBeta, TestFile};
 
 // importing common module.
 mod common;

apps/labrinth/tests/notifications.rs

@@ -3,7 +3,7 @@ use common::{
     environment::with_test_environment_all,
 };
 
-use crate::common::api_common::ApiTeams;
+use ariadne::api_common::ApiTeams;
 
 mod common;
 

apps/labrinth/tests/organizations.rs

@@ -1,4 +1,5 @@
-use crate::common::{
+use actix_http::StatusCode;
+use ariadne::{
     api_common::{ApiProject, ApiTeams},
     database::{
         generate_random_name, ADMIN_USER_PAT, ENEMY_USER_ID_PARSED,
@@ -9,7 +10,6 @@ use crate::common::{
         DummyImage, DummyOrganizationZeta, DummyProjectAlpha, DummyProjectBeta,
     },
 };
-use actix_http::StatusCode;
 use common::{
     api_v3::ApiV3,
     database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT},

apps/labrinth/tests/pats.rs

@@ -6,7 +6,7 @@ use common::{database::*, environment::with_test_environment_all};
 use labrinth::models::pats::Scopes;
 use serde_json::json;
 
-use crate::common::api_common::AppendsOptionalPat;
+use ariadne::api_common::AppendsOptionalPat;
 
 mod common;
 

apps/labrinth/tests/project.rs

@@ -4,12 +4,12 @@ use common::api_v3::ApiV3;
 use common::database::*;
 use common::dummy_data::DUMMY_CATEGORIES;
 
+use ariadne::ids::base62_impl::parse_base62;
 use common::environment::{
     with_test_environment, with_test_environment_all, TestEnvironment,
 };
 use common::permissions::{PermissionsTest, PermissionsTestContext};
 use futures::StreamExt;
-use labrinth::common::ids::base62_impl::parse_base62;
 use labrinth::database::models::project_item::{
     PROJECTS_NAMESPACE, PROJECTS_SLUGS_NAMESPACE,
 };
@@ -18,10 +18,10 @@ use labrinth::models::teams::ProjectPermissions;
 use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
 use serde_json::json;
 
-use crate::common::api_common::models::CommonProject;
-use crate::common::api_common::request_data::ProjectCreationRequestData;
-use crate::common::api_common::{ApiProject, ApiTeams, ApiVersion};
-use crate::common::dummy_data::{
+use ariadne::api_common::models::CommonProject;
+use ariadne::api_common::request_data::ProjectCreationRequestData;
+use ariadne::api_common::{ApiProject, ApiTeams, ApiVersion};
+use ariadne::dummy_data::{
     DummyImage, DummyOrganizationZeta, DummyProjectAlpha, DummyProjectBeta,
     TestFile,
 };

apps/labrinth/tests/scopes.rs

@@ -1,13 +1,12 @@
 use std::collections::HashMap;
 
-use crate::common::api_common::{
-    ApiProject, ApiTeams, ApiUser, ApiVersion, AppendsOptionalPat,
-};
-use crate::common::dummy_data::{
-    DummyImage, DummyProjectAlpha, DummyProjectBeta,
-};
 use actix_http::StatusCode;
 use actix_web::test;
+use ariadne::api_common::{
+    ApiProject, ApiTeams, ApiUser, ApiVersion, AppendsOptionalPat,
+};
+use ariadne::dummy_data::{DummyImage, DummyProjectAlpha, DummyProjectBeta};
+use ariadne::ids::base62_impl::parse_base62;
 use chrono::{Duration, Utc};
 use common::api_common::models::CommonItemType;
 use common::api_common::Api;
@@ -18,7 +17,6 @@ use common::environment::{
     with_test_environment, with_test_environment_all, TestEnvironment,
 };
 use common::{database::*, scopes::ScopeTest};
-use labrinth::common::ids::base62_impl::parse_base62;
 use labrinth::models::pats::Scopes;
 use labrinth::models::projects::ProjectId;
 use labrinth::models::users::UserId;

apps/labrinth/tests/search.rs

@@ -4,11 +4,11 @@ use common::database::*;
 
 use common::dummy_data::DUMMY_CATEGORIES;
 
+use ariadne::ids::base62_impl::parse_base62;
 use common::environment::with_test_environment;
 use common::environment::TestEnvironment;
 use common::search::setup_search_projects;
 use futures::stream::StreamExt;
-use labrinth::common::ids::base62_impl::parse_base62;
 use serde_json::json;
 
 use crate::common::api_common::Api;

apps/labrinth/tests/tags.rs

@@ -7,7 +7,7 @@ use common::{
     },
 };
 
-use crate::common::api_common::ApiTags;
+use ariadne::api_common::ApiTags;
 
 mod common;
 

apps/labrinth/tests/teams.rs

@@ -1,5 +1,5 @@
-use crate::common::{api_common::ApiTeams, database::*};
 use actix_http::StatusCode;
+use ariadne::{api_common::ApiTeams, database::*};
 use common::{
     api_v3::ApiV3,
     environment::{

apps/labrinth/tests/user.rs

@@ -1,4 +1,4 @@
-use crate::common::api_common::{ApiProject, ApiTeams};
+use ariadne::api_common::{ApiProject, ApiTeams};
 use common::dummy_data::TestFile;
 use common::{
     database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_ID, USER_USER_PAT},

apps/labrinth/tests/v2/error.rs

@@ -1,12 +1,12 @@
 use crate::assert_status;
-use crate::common::api_common::ApiProject;
+use ariadne::api_common::ApiProject;
 
 use actix_http::StatusCode;
 use actix_web::test;
 use bytes::Bytes;
 
-use crate::common::database::USER_USER_PAT;
-use crate::common::{
+use ariadne::database::USER_USER_PAT;
+use ariadne::{
     api_v2::ApiV2,
     environment::{with_test_environment, TestEnvironment},
 };

apps/labrinth/tests/v2/notifications.rs

@@ -1,4 +1,4 @@
-use crate::common::{
+use ariadne::{
     api_common::ApiTeams,
     api_v2::ApiV2,
     database::{FRIEND_USER_ID, FRIEND_USER_PAT, USER_USER_PAT},

apps/labrinth/tests/v2/project.rs

@@ -16,9 +16,9 @@ use crate::{
 };
 use actix_http::StatusCode;
 use actix_web::test;
+use ariadne::ids::base62_impl::parse_base62;
 use futures::StreamExt;
 use itertools::Itertools;
-use labrinth::common::ids::base62_impl::parse_base62;
 use labrinth::{
     database::models::project_item::PROJECTS_SLUGS_NAMESPACE,
     models::{projects::ProjectId, teams::ProjectPermissions},

apps/labrinth/tests/v2/scopes.rs

@@ -1,12 +1,12 @@
-use crate::common::api_common::ApiProject;
-use crate::common::api_common::ApiVersion;
-use crate::common::api_v2::request_data::get_public_project_creation_data;
-use crate::common::api_v2::ApiV2;
-use crate::common::dummy_data::TestFile;
-use crate::common::environment::with_test_environment;
-use crate::common::environment::TestEnvironment;
-use crate::common::scopes::ScopeTest;
-use labrinth::common::ids::base62_impl::parse_base62;
+use ariadne::api_common::ApiProject;
+use ariadne::api_common::ApiVersion;
+use ariadne::api_v2::request_data::get_public_project_creation_data;
+use ariadne::api_v2::ApiV2;
+use ariadne::dummy_data::TestFile;
+use ariadne::environment::with_test_environment;
+use ariadne::environment::TestEnvironment;
+use ariadne::ids::base62_impl::parse_base62;
+use ariadne::scopes::ScopeTest;
 use labrinth::models::pats::Scopes;
 use labrinth::models::projects::ProjectId;
 

apps/labrinth/tests/v2/search.rs

@@ -1,17 +1,17 @@
 use crate::assert_status;
-use crate::common::api_common::Api;
-use crate::common::api_common::ApiProject;
-use crate::common::api_common::ApiVersion;
-use crate::common::api_v2::ApiV2;
+use ariadne::api_common::Api;
+use ariadne::api_common::ApiProject;
+use ariadne::api_common::ApiVersion;
+use ariadne::api_v2::ApiV2;
 
-use crate::common::database::*;
-use crate::common::dummy_data::TestFile;
-use crate::common::dummy_data::DUMMY_CATEGORIES;
-use crate::common::environment::with_test_environment;
-use crate::common::environment::TestEnvironment;
 use actix_http::StatusCode;
+use ariadne::database::*;
+use ariadne::dummy_data::TestFile;
+use ariadne::dummy_data::DUMMY_CATEGORIES;
+use ariadne::environment::with_test_environment;
+use ariadne::environment::TestEnvironment;
+use ariadne::ids::base62_impl::parse_base62;
 use futures::stream::StreamExt;
-use labrinth::common::ids::base62_impl::parse_base62;
 use serde_json::json;
 use std::collections::HashMap;
 use std::sync::Arc;

apps/labrinth/tests/v2/tags.rs

@@ -3,7 +3,7 @@ use labrinth::routes::v2::tags::DonationPlatformQueryData;
 
 use std::collections::HashSet;
 
-use crate::common::{
+use ariadne::{
     api_v2::ApiV2,
     environment::{with_test_environment, TestEnvironment},
 };

apps/labrinth/tests/v2/version.rs

@@ -9,13 +9,13 @@ use labrinth::{
 use serde_json::json;
 
 use crate::assert_status;
-use crate::common::api_common::{ApiProject, ApiVersion};
-use crate::common::api_v2::ApiV2;
+use ariadne::api_common::{ApiProject, ApiVersion};
+use ariadne::api_v2::ApiV2;
 
-use crate::common::api_v2::request_data::get_public_project_creation_data;
-use crate::common::dummy_data::{DummyProjectAlpha, DummyProjectBeta};
-use crate::common::environment::{with_test_environment, TestEnvironment};
-use crate::common::{
+use ariadne::api_v2::request_data::get_public_project_creation_data;
+use ariadne::dummy_data::{DummyProjectAlpha, DummyProjectBeta};
+use ariadne::environment::{with_test_environment, TestEnvironment};
+use ariadne::{
     database::{ENEMY_USER_PAT, USER_USER_PAT},
     dummy_data::TestFile,
 };

apps/labrinth/tests/version.rs

@@ -1,19 +1,17 @@
 use std::collections::HashMap;
 
-use crate::common::api_common::ApiVersion;
-use crate::common::database::*;
-use crate::common::dummy_data::{
-    DummyProjectAlpha, DummyProjectBeta, TestFile,
-};
-use crate::common::get_json_val_str;
 use actix_http::StatusCode;
 use actix_web::test;
+use ariadne::api_common::ApiVersion;
+use ariadne::database::*;
+use ariadne::dummy_data::{DummyProjectAlpha, DummyProjectBeta, TestFile};
+use ariadne::get_json_val_str;
+use ariadne::ids::base62_impl::parse_base62;
 use common::api_v3::ApiV3;
 use common::asserts::assert_common_version_ids;
 use common::database::USER_USER_PAT;
 use common::environment::{with_test_environment, with_test_environment_all};
 use futures::StreamExt;
-use labrinth::common::ids::base62_impl::parse_base62;
 use labrinth::database::models::version_item::VERSIONS_NAMESPACE;
 use labrinth::models::projects::{
     Dependency, DependencyType, VersionId, VersionStatus, VersionType,