Tests v2 recreate (#760)

* added common project information; setup for v2 test change

* all tests now use with_test_environment

* progress, failing

* finished re-adding tests

* prepare

* cargo sqlx prepare -- --tests

* fmt; clippy; prepare

* sqlx prepare

* adds version_create fix and corresponding test

* merge fixes; rev

* fmt, clippy, prepare

* test cargo sqlx prepare

tests/common/api_v2/team.rs

@@ -1,17 +1,22 @@
 use actix_http::StatusCode;
 use actix_web::{dev::ServiceResponse, test};
-use labrinth::models::{
-    notifications::Notification,
-    teams::{OrganizationPermissions, ProjectPermissions, TeamMember},
-};
+use async_trait::async_trait;
+use labrinth::models::teams::{OrganizationPermissions, ProjectPermissions};
 use serde_json::json;
 
-use crate::common::asserts::assert_status;
+use crate::common::{
+    api_common::{
+        models::{CommonNotification, CommonTeamMember},
+        Api, ApiTeams,
+    },
+    asserts::assert_status,
+};
 
 use super::ApiV2;
 
-impl ApiV2 {
-    pub async fn get_team_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
+#[async_trait(?Send)]
+impl ApiTeams for ApiV2 {
+    async fn get_team_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
         let req = test::TestRequest::get()
             .uri(&format!("/v2/team/{id_or_title}/members"))
             .append_header(("Authorization", pat))
@@ -19,17 +24,17 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn get_team_members_deserialized(
+    async fn get_team_members_deserialized_common(
         &self,
         id_or_title: &str,
         pat: &str,
-    ) -> Vec<TeamMember> {
+    ) -> Vec<CommonTeamMember> {
         let resp = self.get_team_members(id_or_title, pat).await;
         assert_eq!(resp.status(), 200);
         test::read_body_json(resp).await
     }
 
-    pub async fn get_project_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
+    async fn get_project_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
         let req = test::TestRequest::get()
             .uri(&format!("/v2/project/{id_or_title}/members"))
             .append_header(("Authorization", pat))
@@ -37,17 +42,17 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn get_project_members_deserialized(
+    async fn get_project_members_deserialized_common(
         &self,
         id_or_title: &str,
         pat: &str,
-    ) -> Vec<TeamMember> {
+    ) -> Vec<CommonTeamMember> {
         let resp = self.get_project_members(id_or_title, pat).await;
         assert_eq!(resp.status(), 200);
         test::read_body_json(resp).await
     }
 
-    pub async fn get_organization_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
+    async fn get_organization_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
         let req = test::TestRequest::get()
             .uri(&format!("/v2/organization/{id_or_title}/members"))
             .append_header(("Authorization", pat))
@@ -55,17 +60,17 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn get_organization_members_deserialized(
+    async fn get_organization_members_deserialized_common(
         &self,
         id_or_title: &str,
         pat: &str,
-    ) -> Vec<TeamMember> {
+    ) -> Vec<CommonTeamMember> {
         let resp = self.get_organization_members(id_or_title, pat).await;
         assert_eq!(resp.status(), 200);
         test::read_body_json(resp).await
     }
 
-    pub async fn join_team(&self, team_id: &str, pat: &str) -> ServiceResponse {
+    async fn join_team(&self, team_id: &str, pat: &str) -> ServiceResponse {
         let req = test::TestRequest::post()
             .uri(&format!("/v2/team/{team_id}/join"))
             .append_header(("Authorization", pat))
@@ -73,12 +78,7 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn remove_from_team(
-        &self,
-        team_id: &str,
-        user_id: &str,
-        pat: &str,
-    ) -> ServiceResponse {
+    async fn remove_from_team(&self, team_id: &str, user_id: &str, pat: &str) -> ServiceResponse {
         let req = test::TestRequest::delete()
             .uri(&format!("/v2/team/{team_id}/members/{user_id}"))
             .append_header(("Authorization", pat))
@@ -86,7 +86,7 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn edit_team_member(
+    async fn edit_team_member(
         &self,
         team_id: &str,
         user_id: &str,
@@ -101,7 +101,7 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn transfer_team_ownership(
+    async fn transfer_team_ownership(
         &self,
         team_id: &str,
         user_id: &str,
@@ -117,7 +117,7 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn get_user_notifications(&self, user_id: &str, pat: &str) -> ServiceResponse {
+    async fn get_user_notifications(&self, user_id: &str, pat: &str) -> ServiceResponse {
         let req = test::TestRequest::get()
             .uri(&format!("/v2/user/{user_id}/notifications"))
             .append_header(("Authorization", pat))
@@ -125,28 +125,25 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn get_user_notifications_deserialized(
+    async fn get_user_notifications_deserialized_common(
         &self,
         user_id: &str,
         pat: &str,
-    ) -> Vec<Notification> {
+    ) -> Vec<CommonNotification> {
         let resp = self.get_user_notifications(user_id, pat).await;
         assert_status(&resp, StatusCode::OK);
         test::read_body_json(resp).await
     }
 
-    pub async fn mark_notification_read(
-        &self,
-        notification_id: &str,
-        pat: &str,
-    ) -> ServiceResponse {
+    async fn mark_notification_read(&self, notification_id: &str, pat: &str) -> ServiceResponse {
         let req = test::TestRequest::patch()
             .uri(&format!("/v2/notification/{notification_id}"))
             .append_header(("Authorization", pat))
             .to_request();
         self.call(req).await
     }
-    pub async fn add_user_to_team(
+
+    async fn add_user_to_team(
         &self,
         team_id: &str,
         user_id: &str,
@@ -166,7 +163,7 @@ impl ApiV2 {
         self.call(req).await
     }
 
-    pub async fn delete_notification(&self, notification_id: &str, pat: &str) -> ServiceResponse {
+    async fn delete_notification(&self, notification_id: &str, pat: &str) -> ServiceResponse {
         let req = test::TestRequest::delete()
             .uri(&format!("/v2/notification/{notification_id}"))
             .append_header(("Authorization", pat))