Misc v3 linear tasks (#767)

* v3_reroute 404 error

* hash change

* fixed issue with error conversion

* added new model confirmation tests
+ title name change

* renaming, fields

* owner; test changes

* clippy prepare

* fmt

* merge fixes

* clippy

* working merge

* revs

* merge fixes

tests/common/api_common/generic.rs

@@ -11,6 +11,7 @@ use crate::common::{api_v2::ApiV2, api_v3::ApiV3, dummy_data::TestFile};
 
 use super::{
     models::{CommonImageData, CommonProject, CommonVersion},
+    request_data::ProjectCreationRequestData,
     Api, ApiProject, ApiTags, ApiTeams, ApiVersion,
 };
 
@@ -65,6 +66,8 @@ delegate_api_variant!(
     #[async_trait(?Send)]
     impl ApiProject for GenericApi {
         [add_public_project, (CommonProject, Vec<CommonVersion>), slug: &str, version_jar: Option<TestFile>, modify_json: Option<json_patch::Patch>, pat: &str],
+        [get_public_project_creation_data_json, serde_json::Value, slug: &str, version_jar: Option<&TestFile>],
+        [create_project, ServiceResponse, creation_data: ProjectCreationRequestData, pat: &str],
         [remove_project, ServiceResponse, project_slug_or_id: &str, pat: &str],
         [get_project, ServiceResponse, id_or_slug: &str, pat: &str],
         [get_project_deserialized_common, CommonProject, id_or_slug: &str, pat: &str],

tests/common/api_common/mod.rs

@@ -4,6 +4,7 @@ use self::models::{
     CommonCategoryData, CommonImageData, CommonLoaderData, CommonNotification, CommonProject,
     CommonTeamMember, CommonVersion,
 };
+use self::request_data::ProjectCreationRequestData;
 use actix_web::dev::ServiceResponse;
 use async_trait::async_trait;
 use labrinth::{
@@ -18,6 +19,7 @@ use super::dummy_data::TestFile;
 
 pub mod generic;
 pub mod models;
+pub mod request_data;
 #[async_trait(?Send)]
 pub trait ApiBuildable: Api {
     async fn build(labrinth_config: LabrinthConfig) -> Self;
@@ -38,6 +40,17 @@ pub trait ApiProject {
         modify_json: Option<json_patch::Patch>,
         pat: &str,
     ) -> (CommonProject, Vec<CommonVersion>);
+    async fn create_project(
+        &self,
+        creation_data: ProjectCreationRequestData,
+        pat: &str,
+    ) -> ServiceResponse;
+    async fn get_public_project_creation_data_json(
+        &self,
+        slug: &str,
+        version_jar: Option<&TestFile>,
+    ) -> serde_json::Value;
+
     async fn remove_project(&self, id_or_slug: &str, pat: &str) -> ServiceResponse;
     async fn get_project(&self, id_or_slug: &str, pat: &str) -> ServiceResponse;
     async fn get_project_deserialized_common(&self, id_or_slug: &str, pat: &str) -> CommonProject;

tests/common/api_common/models.rs

@@ -1,12 +1,12 @@
 use chrono::{DateTime, Utc};
 use labrinth::models::{
-    notifications::{NotificationAction, NotificationBody, NotificationId},
+    notifications::NotificationId,
     organizations::OrganizationId,
     projects::{
         Dependency, GalleryItem, License, ModeratorMessage, MonetizationStatus, ProjectId,
         ProjectStatus, VersionFile, VersionId, VersionStatus, VersionType,
     },
-    teams::{OrganizationPermissions, ProjectPermissions, TeamId},
+    teams::{ProjectPermissions, TeamId},
     threads::ThreadId,
     users::{User, UserId},
 };
@@ -31,12 +31,7 @@ pub struct CommonProject {
     // For any tests that require those fields, we make a separate test with separate API functions tht do not use Common models.
     pub id: ProjectId,
     pub slug: Option<String>,
-    pub team: TeamId,
     pub organization: Option<OrganizationId>,
-    pub title: String,
-    pub description: String,
-    pub body: String,
-    pub body_url: Option<String>,
     pub published: DateTime<Utc>,
     pub updated: DateTime<Utc>,
     pub approved: Option<DateTime<Utc>>,
@@ -67,7 +62,6 @@ pub struct CommonVersion {
     pub name: String,
     pub version_number: String,
     pub changelog: String,
-    pub changelog_url: Option<String>,
     pub date_published: DateTime<Utc>,
     pub downloads: u32,
     pub version_type: VersionType,
@@ -109,9 +103,7 @@ pub struct CommonTeamMember {
     pub user: User,
     pub role: String,
 
-    // TODO: Should these be removed from the Common?
     pub permissions: Option<ProjectPermissions>,
-    pub organization_permissions: Option<OrganizationPermissions>,
 
     pub accepted: bool,
     pub payouts_split: Option<Decimal>,
@@ -124,13 +116,13 @@ pub struct CommonNotification {
     pub user_id: UserId,
     pub read: bool,
     pub created: DateTime<Utc>,
-    pub body: NotificationBody,
-
-    // DEPRECATED: use body field instead
-    #[serde(rename = "type")]
-    pub type_: Option<String>,
-    pub title: String,
+    // Body is absent as one of the variants differs
     pub text: String,
     pub link: String,
-    pub actions: Vec<NotificationAction>,
+    pub actions: Vec<CommonNotificationAction>,
+}
+
+#[derive(Deserialize)]
+pub struct CommonNotificationAction {
+    pub action_route: (String, String),
 }

tests/common/api_common/request_data.rs

@@ -0,0 +1,24 @@
+// The structures for project/version creation.
+// These are created differently, but are essentially the same between versions.
+
+use labrinth::util::actix::MultipartSegment;
+
+use crate::common::dummy_data::TestFile;
+
+pub struct ProjectCreationRequestData {
+    pub slug: String,
+    pub jar: Option<TestFile>,
+    pub segment_data: Vec<MultipartSegment>,
+}
+
+pub struct VersionCreationRequestData {
+    pub version: String,
+    pub jar: Option<TestFile>,
+    pub segment_data: Vec<MultipartSegment>,
+}
+
+pub struct ImageData {
+    pub filename: String,
+    pub extension: String,
+    pub icon: Vec<u8>,
+}