feat: Added file upload

Author: leo91000

.rustfmt.toml

@@ -1,7 +1,7 @@
-# unstable_features = true
+unstable_features = true
 
-# format_strings = true
-# imports_granularity = "Crate"
+format_strings = true
+imports_granularity = "Crate"
 use_field_init_shorthand = true
-# wrap_comments = true
+wrap_comments = true
 tab_spaces = 4

Cargo.lock

@@ -13,6 +13,6 @@ path = "src/lib.rs"
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = "1.0.87"
 chrono = { version = "0.4.22", features = ["serde"] }
-sea-orm = { version = "0.10.1" }
-sea-query = { version = "0.27.1" }
+sea-orm = { version = "0.10.1", features = ["postgres-array"] }
+sea-query = { version = "0.27.1", features = ["postgres-array"] }
 getset = "0.1.2"

crates/entity/Cargo.toml

@@ -0,0 +1,38 @@
+use getset::Getters;
+use sea_orm::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Eq, PartialEq, DeriveEntityModel, Deserialize, Serialize, Getters)]
+#[sea_orm(table_name = "files")]
+#[getset(get = "pub")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    #[serde(skip_deserializing)]
+    pub id: i32,
+    #[sea_orm(column_type = "Text")]
+    pub namespace: String,
+    #[sea_orm(column_type = "Text")]
+    pub storage_key: String,
+    pub tags: Vec<String>,
+    pub metadata: Json,
+    pub created_at: DateTimeUtc,
+    pub updated_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "crate::namespace::Entity",
+        from = "Column::Namespace",
+        to = "crate::namespace::Column::Name"
+    )]
+    Namespace,
+}
+
+impl Related<crate::namespace::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Namespace.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}

crates/entity/src/file.rs

@@ -1,5 +1,6 @@
 pub mod api_key;
 pub mod blok;
+pub mod file;
 pub mod git_auth;
 pub mod image;
 pub mod locale;

crates/entity/src/lib.rs

@@ -15,6 +15,7 @@ mod m20220917_000011_fix_blok_priority_trigger;
 mod m20220917_000012_fix_blok_priority_trigger;
 mod m20221013_000013_create_locale_table;
 mod m20221023_000014_add_timestamps_to_locales_data;
+mod m20221103_000015_create_files_table;
 pub(crate) mod utils;
 
 pub struct Migrator;
@@ -37,6 +38,7 @@ impl MigratorTrait for Migrator {
             Box::new(m20220917_000012_fix_blok_priority_trigger::Migration),
             Box::new(m20221013_000013_create_locale_table::Migration),
             Box::new(m20221023_000014_add_timestamps_to_locales_data::Migration),
+            Box::new(m20221103_000015_create_files_table::Migration),
         ]
     }
 }

crates/migration/src/lib.rs

@@ -1,6 +1,5 @@
 use crate::utils::macros::{create_table_from_entity, exec_stmt};
-use entity::locale::Entity;
-use entity::locale_data::Entity as DataEntity;
+use entity::{locale::Entity, locale_data::Entity as DataEntity};
 use sea_orm_migration::{prelude::*, MigrationName};
 
 pub struct Migration;

crates/migration/src/m20221013_000013_create_locale_table.rs

@@ -0,0 +1,68 @@
+use sea_orm_migration::{prelude::*, MigrationName};
+
+use entity::file::Entity;
+
+use crate::utils::macros::{create_table_from_entity, exec_stmt};
+
+pub struct Migration;
+
+impl MigrationName for Migration {
+    fn name(&self) -> &str {
+        "m20221103_000015_create_files_table"
+    }
+}
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        exec_stmt!(manager, r#"drop table if exists files"#)?;
+        create_table_from_entity!(manager, Entity)?;
+
+        // Set default value for created_at / updated_at columns and adds constraint
+        exec_stmt!(
+            manager,
+            r#"alter table files
+                alter column created_at set default now(),
+                alter column updated_at set default now(),
+                add constraint files_storage_key_unique unique (storage_key),
+                alter column tags type text[],
+                alter column tags set default '{{}}'::text[],
+                alter column metadata type jsonb,
+                alter column metadata set default '{{}}'::jsonb,
+                drop constraint if exists "fk-files-namespace",
+                add constraint "fk-files-namespace"
+                    foreign key (namespace)
+                    references namespaces (name)
+                    on update cascade
+                    on delete cascade
+            "#
+        )?;
+        exec_stmt!(manager, r#"create index tags_idx on files (tags)"#)?;
+        exec_stmt!(manager, r#"create index metadata_idx on files (metadata)"#)?;
+
+        // Trigger for timestamps
+        exec_stmt!(
+            manager,
+            r#"create trigger _100_timestamps
+                before insert or update on files
+                for each row execute procedure tg__timestamps();
+            "#
+        )?;
+        exec_stmt!(
+            manager,
+            r#"create trigger _500_create_missing_namespace
+                before insert or update on files
+                for each row execute procedure public.tg__create_missing_namespace();
+            "#
+        )?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_table(Table::drop().table(Entity).to_owned())
+            .await?;
+        Ok(())
+    }
+}

crates/migration/src/m20221103_000015_create_files_table.rs

@@ -23,7 +23,7 @@ tracing-opentelemetry = { version = "0.18.0" }
 tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }
 tracing-bunyan-formatter = "0.3.4"
 tracing-log = "0.1.3"
-sea-orm = { version = "0.10.1", features = ["debug-print", "runtime-tokio-native-tls", "sqlx-postgres"] }
+sea-orm = { version = "0.10.1", features = ["debug-print", "runtime-tokio-native-tls", "sqlx-postgres", "postgres-array"] }
 config = { version = "0.13.2" }
 serde_json = "1.0.87"
 chrono = "0.4.22"
@@ -47,7 +47,9 @@ lazy_static = { version = "1.4.0" }
 base64 = "0.20.0-alpha.1"
 reqwest = { version = "0.11.12", features = ["json", "cookies", "multipart", "stream"] }
 typed-builder = "0.11.0"
+humansize = { version = "2.1.0", features = ["impl_style"] }
 
 [dev-dependencies]
+insta = { version = "1.21.0", features = ["json"] }
 portpicker = "0.1.1"
 test-context = "0.1.4"

crates/server/Cargo.toml

@@ -1,8 +1,6 @@
 use aws_smithy_async::rt::sleep::default_async_sleep;
 use aws_smithy_http::endpoint::Endpoint;
-use aws_types::app_name::AppName;
-use aws_types::region::Region;
-use aws_types::Credentials;
+use aws_types::{app_name::AppName, region::Region, Credentials};
 use config::Environment;
 pub use config::{Config, ConfigError};
 use derive_more::Constructor;
@@ -92,6 +90,7 @@ impl S3Credentials {
 #[getset(get = "pub")]
 pub struct S3Buckets {
     image: String,
+    file: String,
 }
 
 impl Settings {
@@ -102,6 +101,7 @@ impl Settings {
             .set_default("host", "0.0.0.0")?
             .set_default("telemetry", false)?
             .set_default("s3.buckets.image", "lyonkit-images")?
+            .set_default("s3.buckets.file", "lyonkit-files")?
             .set_default("cors", Vec::<String>::new())?
             .set_default("log_format", "json")?
             .add_source(