cleanup

backend/tests/common/mod.rs

@@ -29,7 +29,7 @@ use papercrate::state::AppState;
 use papercrate::storage::ObjectStorage;
 use rand::rngs::OsRng;
 use rand::RngCore;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use serde_json::{self, json};
 use sha2::{Digest, Sha256};
 use tokio::sync::Mutex;
@@ -122,6 +122,13 @@ pub struct TestApp {
     storage: Arc<FakeStorage>,
 }
 
+#[derive(Debug, Deserialize)]
+pub struct ApiErrorResponse {
+    pub error: String,
+    #[serde(default)]
+    pub code: Option<String>,
+}
+
 impl TestApp {
     pub async fn new() -> Result<Self> {
         let database_url = env::var("TEST_DATABASE_URL")
@@ -538,6 +545,7 @@ impl TestApp {
             correspondents_json: None,
             issued_at: None,
             skip_existing: false,
+            document_type_id: None,
         };
         self.upload_document_with_extras(
             path,
@@ -666,6 +674,7 @@ pub struct UploadExtras<'a> {
     pub correspondents_json: Option<&'a str>,
     pub issued_at: Option<&'a str>,
     pub skip_existing: bool,
+    pub document_type_id: Option<Uuid>,
 }
 
 impl<'a> UploadExtras<'a> {
@@ -677,6 +686,7 @@ impl<'a> UploadExtras<'a> {
             correspondents_json: None,
             issued_at: None,
             skip_existing: false,
+            document_type_id: None,
         }
     }
 }
@@ -709,7 +719,11 @@ mod helper_tests {
         let (access, refresh, refresh_id) = app.create_session(username).await?;
         assert!(!access.is_empty(), "access token should not be empty");
         assert!(!refresh.is_empty(), "refresh token should not be empty");
-        assert_ne!(refresh_id, Uuid::nil(), "refresh token id should be assigned");
+        assert_ne!(
+            refresh_id,
+            Uuid::nil(),
+            "refresh token id should be assigned"
+        );
 
         let bearer = app.login_token(username, password).await?;
         assert!(!bearer.is_empty(), "login_token must yield bearer");