Misc testing improvements (#805)

* made dummy data more consistent; not an option

* fixed variable dropping issue crashing actix (?)

* removed scopes specific tests, removed schedule tests

* team routes use api

* removed printlns, fmt clippy prepare

tests/common/api_v3/collections.rs

@@ -0,0 +1,155 @@
+use actix_web::{
+    dev::ServiceResponse,
+    test::{self, TestRequest},
+};
+use bytes::Bytes;
+use labrinth::models::{collections::Collection, v3::projects::Project};
+use serde_json::json;
+
+use crate::common::api_common::{request_data::ImageData, Api, AppendsOptionalPat};
+
+use super::ApiV3;
+
+impl ApiV3 {
+    pub async fn create_collection(
+        &self,
+        collection_title: &str,
+        description: &str,
+        projects: &[&str],
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let req = test::TestRequest::post()
+            .uri("/v3/collection")
+            .append_pat(pat)
+            .set_json(json!({
+                "name": collection_title,
+                "description": description,
+                "projects": projects,
+            }))
+            .to_request();
+        self.call(req).await
+    }
+
+    pub async fn get_collection(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = TestRequest::get()
+            .uri(&format!("/v3/collection/{id}"))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
+    pub async fn get_collection_deserialized(&self, id: &str, pat: Option<&str>) -> Collection {
+        let resp = self.get_collection(id, pat).await;
+        assert_eq!(resp.status(), 200);
+        test::read_body_json(resp).await
+    }
+
+    pub async fn get_collections(&self, ids: &[&str], pat: Option<&str>) -> ServiceResponse {
+        let ids = serde_json::to_string(ids).unwrap();
+        let req = test::TestRequest::get()
+            .uri(&format!(
+                "/v3/collections?ids={}",
+                urlencoding::encode(&ids)
+            ))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
+    pub async fn get_collection_projects(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri(&format!("/v3/collection/{id}/projects"))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
+    pub async fn get_collection_projects_deserialized(
+        &self,
+        id: &str,
+        pat: Option<&str>,
+    ) -> Vec<Project> {
+        let resp = self.get_collection_projects(id, pat).await;
+        assert_eq!(resp.status(), 200);
+        test::read_body_json(resp).await
+    }
+
+    pub async fn edit_collection(
+        &self,
+        id: &str,
+        patch: serde_json::Value,
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let req = test::TestRequest::patch()
+            .uri(&format!("/v3/collection/{id}"))
+            .append_pat(pat)
+            .set_json(patch)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    pub async fn edit_collection_icon(
+        &self,
+        id: &str,
+        icon: Option<ImageData>,
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        if let Some(icon) = icon {
+            // If an icon is provided, upload it
+            let req = test::TestRequest::patch()
+                .uri(&format!(
+                    "/v3/collection/{id}/icon?ext={ext}",
+                    ext = icon.extension
+                ))
+                .append_pat(pat)
+                .set_payload(Bytes::from(icon.icon))
+                .to_request();
+
+            self.call(req).await
+        } else {
+            // If no icon is provided, delete the icon
+            let req = test::TestRequest::delete()
+                .uri(&format!("/v3/collection/{id}/icon"))
+                .append_pat(pat)
+                .to_request();
+
+            self.call(req).await
+        }
+    }
+
+    pub async fn delete_collection(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::delete()
+            .uri(&format!("/v3/collection/{id}"))
+            .append_pat(pat)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    pub async fn get_user_collections(
+        &self,
+        user_id_or_username: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri(&format!("/v3/user/{}/collections", user_id_or_username))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
+    pub async fn get_user_collections_deserialized_common(
+        &self,
+        user_id_or_username: &str,
+        pat: Option<&str>,
+    ) -> Vec<Collection> {
+        let resp = self.get_user_collections(user_id_or_username, pat).await;
+        assert_eq!(resp.status(), 200);
+        // First, deserialize to the non-common format (to test the response is valid for this api version)
+        let projects: Vec<Project> = test::read_body_json(resp).await;
+        // Then, deserialize to the common format
+        let value = serde_json::to_value(projects).unwrap();
+        serde_json::from_value(value).unwrap()
+    }
+}

tests/common/api_v3/mod.rs

@@ -9,6 +9,7 @@ use async_trait::async_trait;
 use labrinth::LabrinthConfig;
 use std::rc::Rc;
 
+pub mod collections;
 pub mod oauth;
 pub mod oauth_clients;
 pub mod organization;
@@ -16,6 +17,7 @@ pub mod project;
 pub mod request_data;
 pub mod tags;
 pub mod team;
+pub mod user;
 pub mod version;
 
 #[derive(Clone)]

tests/common/api_v3/organization.rs

@@ -46,6 +46,22 @@ impl ApiV3 {
         test::read_body_json(resp).await
     }
 
+    pub async fn get_organizations(
+        &self,
+        ids_or_titles: &[&str],
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let ids_or_titles = serde_json::to_string(ids_or_titles).unwrap();
+        let req = test::TestRequest::get()
+            .uri(&format!(
+                "/v3/organizations?ids={}",
+                urlencoding::encode(&ids_or_titles)
+            ))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
     pub async fn get_organization_projects(
         &self,
         id_or_title: &str,

tests/common/api_v3/project.rs

@@ -126,6 +126,30 @@ impl ApiProject for ApiV3 {
         serde_json::from_value(value).unwrap()
     }
 
+    async fn get_projects(&self, ids_or_slugs: &[&str], pat: Option<&str>) -> ServiceResponse {
+        let ids_or_slugs = serde_json::to_string(ids_or_slugs).unwrap();
+        let req = test::TestRequest::get()
+            .uri(&format!(
+                "/v2/projects?ids={encoded}",
+                encoded = urlencoding::encode(&ids_or_slugs)
+            ))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
+    async fn get_project_dependencies(
+        &self,
+        id_or_slug: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let req = TestRequest::get()
+            .uri(&format!("/v2/project/{id_or_slug}/dependencies"))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
     async fn get_user_projects(
         &self,
         user_id_or_username: &str,
@@ -245,28 +269,53 @@ impl ApiProject for ApiV3 {
 
     async fn get_report(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
         let req = test::TestRequest::get()
-            .uri(&format!("/v3/report/{id}", id = id))
+            .uri(&format!("/v3/report/{id}"))
             .append_pat(pat)
             .to_request();
 
         self.call(req).await
     }
 
-    async fn schedule_project(
+    async fn get_reports(&self, ids: &[&str], pat: Option<&str>) -> ServiceResponse {
+        let ids_str = serde_json::to_string(ids).unwrap();
+        let req = test::TestRequest::get()
+            .uri(&format!(
+                "/v3/reports?ids={encoded}",
+                encoded = urlencoding::encode(&ids_str)
+            ))
+            .append_pat(pat)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn get_user_reports(&self, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri("/v3/report")
+            .append_pat(pat)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn edit_report(
         &self,
-        id_or_slug: &str,
-        requested_status: &str,
-        date: DateTime<Utc>,
+        id: &str,
+        patch: serde_json::Value,
         pat: Option<&str>,
     ) -> ServiceResponse {
-        let req = test::TestRequest::post()
-            .uri(&format!("/v3/version/{id_or_slug}/schedule"))
-            .set_json(json!(
-                {
-                    "requested_status": requested_status,
-                    "time": date,
-                }
-            ))
+        let req = test::TestRequest::patch()
+            .uri(&format!("/v3/report/{id}"))
+            .append_pat(pat)
+            .set_json(patch)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn delete_report(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::delete()
+            .uri(&format!("/v3/report/{id}"))
             .append_pat(pat)
             .to_request();
 
@@ -355,6 +404,76 @@ impl ApiProject for ApiV3 {
 
         self.call(req).await
     }
+
+    async fn get_thread(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri(&format!("/v3/thread/{id}"))
+            .append_pat(pat)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn get_threads(&self, ids: &[&str], pat: Option<&str>) -> ServiceResponse {
+        let ids_str = serde_json::to_string(ids).unwrap();
+        let req = test::TestRequest::get()
+            .uri(&format!(
+                "/v3/threads?ids={encoded}",
+                encoded = urlencoding::encode(&ids_str)
+            ))
+            .append_pat(pat)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn write_to_thread(
+        &self,
+        id: &str,
+        r#type: &str,
+        content: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let req = test::TestRequest::post()
+            .uri(&format!("/v3/thread/{id}"))
+            .append_pat(pat)
+            .set_json(json!({
+                "body": {
+                    "type": r#type,
+                    "body": content
+                }
+            }))
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn get_moderation_inbox(&self, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri("/v3/thread/inbox")
+            .append_pat(pat)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn read_thread(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::post()
+            .uri(&format!("/v3/thread/{id}/read"))
+            .append_pat(pat)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn delete_thread_message(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::delete()
+            .uri(&format!("/v3/message/{id}"))
+            .append_pat(pat)
+            .to_request();
+
+        self.call(req).await
+    }
 }
 
 impl ApiV3 {

tests/common/api_v3/team.rs

@@ -63,6 +63,22 @@ impl ApiTeams for ApiV3 {
         serde_json::from_value(value).unwrap()
     }
 
+    async fn get_teams_members(
+        &self,
+        ids_or_titles: &[&str],
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let ids_or_titles = serde_json::to_string(ids_or_titles).unwrap();
+        let req = test::TestRequest::get()
+            .uri(&format!(
+                "/v3/teams?ids={}",
+                urlencoding::encode(&ids_or_titles)
+            ))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
     async fn get_project_members(&self, id_or_title: &str, pat: Option<&str>) -> ServiceResponse {
         let req = test::TestRequest::get()
             .uri(&format!("/v3/project/{id_or_title}/members"))
@@ -185,6 +201,30 @@ impl ApiTeams for ApiV3 {
         serde_json::from_value(value).unwrap()
     }
 
+    async fn get_notification(&self, notification_id: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri(&format!("/v3/notification/{notification_id}"))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
+    async fn get_notifications(
+        &self,
+        notification_ids: &[&str],
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let notification_ids = serde_json::to_string(notification_ids).unwrap();
+        let req = test::TestRequest::get()
+            .uri(&format!(
+                "/v3/notifications?ids={}",
+                urlencoding::encode(&notification_ids)
+            ))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
     async fn mark_notification_read(
         &self,
         notification_id: &str,
@@ -196,6 +236,23 @@ impl ApiTeams for ApiV3 {
             .to_request();
         self.call(req).await
     }
+
+    async fn mark_notifications_read(
+        &self,
+        notification_ids: &[&str],
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let notification_ids = serde_json::to_string(notification_ids).unwrap();
+        let req = test::TestRequest::patch()
+            .uri(&format!(
+                "/v3/notifications?ids={}",
+                urlencoding::encode(&notification_ids)
+            ))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
     async fn add_user_to_team(
         &self,
         team_id: &str,
@@ -227,4 +284,20 @@ impl ApiTeams for ApiV3 {
             .to_request();
         self.call(req).await
     }
+
+    async fn delete_notifications(
+        &self,
+        notification_ids: &[&str],
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let notification_ids = serde_json::to_string(notification_ids).unwrap();
+        let req = test::TestRequest::delete()
+            .uri(&format!(
+                "/v3/notifications?ids={}",
+                urlencoding::encode(&notification_ids)
+            ))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
 }

tests/common/api_v3/user.rs

@@ -0,0 +1,48 @@
+use actix_web::{dev::ServiceResponse, test};
+use async_trait::async_trait;
+
+use crate::common::api_common::{Api, ApiUser, AppendsOptionalPat};
+
+use super::ApiV3;
+
+#[async_trait(?Send)]
+impl ApiUser for ApiV3 {
+    async fn get_user(&self, user_id_or_username: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri(&format!("/v3/user/{}", user_id_or_username))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
+    async fn get_current_user(&self, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri("/v3/user")
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
+    async fn edit_user(
+        &self,
+        user_id_or_username: &str,
+        patch: serde_json::Value,
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let req = test::TestRequest::patch()
+            .uri(&format!("/v3/user/{}", user_id_or_username))
+            .append_pat(pat)
+            .set_json(patch)
+            .to_request();
+
+        self.call(req).await
+    }
+
+    async fn delete_user(&self, user_id_or_username: &str, pat: Option<&str>) -> ServiceResponse {
+        let req = test::TestRequest::delete()
+            .uri(&format!("/v3/user/{}", user_id_or_username))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+}

tests/common/api_v3/version.rs

@@ -181,6 +181,22 @@ impl ApiVersion for ApiV3 {
         self.call(req).await
     }
 
+    async fn download_version_redirect(
+        &self,
+        hash: &str,
+        algorithm: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse {
+        let req = test::TestRequest::get()
+            .uri(&format!("/v3/version_file/{hash}/download",))
+            .set_json(json!({
+                "algorithm": algorithm,
+            }))
+            .append_pat(pat)
+            .to_request();
+        self.call(req).await
+    }
+
     async fn get_version_from_hash(
         &self,
         hash: &str,