refactor: files::file_storage -> files::storage

src/connectors/s3/mod.rs

@@ -19,7 +19,7 @@ use thiserror::Error;
 use crate::stores::{
     files::{
         database::{SResult, UploadLease, UploadLeaseStore},
-        file_storage::{Bucket, FileError, FileStore, PresignError},
+        storage::{Bucket, FileError, FileStore, PresignError},
     },
     Uuid,
 };

src/main.rs

@@ -2,7 +2,7 @@ use std::fmt::Debug;
 
 use genbu_server::connectors::{memory::MemStore, postgres::PgStore, s3};
 use genbu_server::server::builder::GenbuServerBuilder;
-use genbu_server::stores::{files::file_storage::FileStore, DataStore};
+use genbu_server::stores::{files::storage::FileStore, DataStore};
 
 #[tokio::main]
 async fn main() -> Result<(), impl Debug> {

src/server/builder.rs

@@ -1,6 +1,6 @@
 use std::iter::once;
 
-use crate::stores::{files::file_storage::FileStore, DataStore};
+use crate::stores::{files::storage::FileStore, DataStore};
 use axum::{Extension, Router, Server};
 use hyper::header;
 use tower::ServiceBuilder;

src/server/routes/files/mod.rs

@@ -7,7 +7,7 @@ pub mod upload;
 pub mod routes {
     use axum::Router;
 
-    use crate::stores::files::file_storage::FileStore;
+    use crate::stores::files::storage::FileStore;
 
     use super::upload::upload_unsigned;
     use super::{get_presigned_url, multipart_upload::finish_upload, upload::upload_file_request};
@@ -45,7 +45,7 @@ pub async fn get_presigned_url<F: FileStore>(
 
 use serde_json::json;
 
-use crate::stores::files::file_storage::{Bucket, FileError, FileStore};
+use crate::stores::files::storage::{Bucket, FileError, FileStore};
 
 pub type APIResult<T> = Result<T, FileAPIError>;
 

src/server/routes/files/multipart_upload.rs

@@ -1,6 +1,6 @@
 use axum::{Extension, Json};
 
-use crate::stores::files::file_storage::{Bucket, FileStore};
+use crate::stores::files::storage::{Bucket, FileStore};
 
 use super::{upload::UploadFileRequest, APIResult};
 

src/server/routes/files/upload.rs

@@ -9,7 +9,7 @@ use axum::{
 };
 
 use crate::stores::{
-    files::file_storage::{Bucket, FileError, FileStore},
+    files::storage::{Bucket, FileError, FileStore},
     Uuid,
 };
 

src/stores/files/database.rs

@@ -7,7 +7,7 @@ use thiserror::Error;
 use time::OffsetDateTime;
 use uuid::Uuid;
 
-use super::file_storage::Bucket;
+use super::storage::Bucket;
 
 #[derive(Debug, Error)]
 pub enum UploadLeaseError {

src/stores/files/mod.rs

@@ -1,2 +1,2 @@
 pub mod database;
-pub mod file_storage;
+pub mod storage;

src/stores/users.rs

@@ -121,6 +121,7 @@ pub trait UserStore {
     async fn update(&mut self, user_update: UserUpdate) -> SResult<Option<User>>;
 }
 
+// TODO: Remove this test
 #[cfg(test)]
 mod tests {
     use oso::{Oso, PolarClass};

tests/common.rs

@@ -8,10 +8,7 @@ use axum::{
 use genbu_server::{
     connectors::{memory::MemStore, postgres::PgStore, s3},
     server::builder::GenbuServerBuilder,
-    stores::{
-        stores::{DataStore, Reset, Setup},
-        Uuid,
-    },
+    stores::{DataStore, Reset, Setup, Uuid},
 };
 use http_body::combinators::UnsyncBoxBody;
 use serde_json::json;