fix: db formatting

Cargo.toml

@@ -19,7 +19,8 @@ sea-orm-migration = { version = "0.12.1", optional = true }
 sea-orm = { version = "0.12.1", features = [
   "macros",
   "runtime-tokio-native-tls",
-  "sqlx-mysql"
+  "sqlx-mysql",
+  "rust_decimal"
 ], optional = true}
 
 # Traits & Futures

Dockerfile

@@ -23,7 +23,7 @@ COPY ./Rocket.toml ./
 ARG RELEASE_TYPE
 
 # build for release or dev depending on what is desired
-RUN if [ ${RELEASE_TYPE} = "dev" ]; then cargo build --locked --jobs 1 ; else ROCKET_ENV=prod cargo build --release --locked ; fi
+RUN if [ ${RELEASE_TYPE} = "dev" ]; then cargo build --locked --jobs 1 ; else ROCKET_ENV=prod cargo build --release --locked --jobs 8 ; fi
 
 # move that file up the tree
 RUN if [ ${RELEASE_TYPE} = "dev" ]; then cp /open-stock/target/debug/open-stock . ; else cp /open-stock/target/release/open-stock . ; fi

src/entities/customer.rs

@@ -11,7 +11,7 @@ pub struct Model {
     pub name: String,
     pub contact: Json,
     pub customer_notes: Json,
-    pub balance: u32,
+    pub balance: i64,
     pub special_pricing: Json,
     pub accepts_marketing: bool,
     pub tenant_id: String,

src/entities/transactions.rs

@@ -11,7 +11,7 @@ pub struct Model {
     pub customer: Json,
     pub transaction_type: TransactionType,
     pub products: Json,
-    pub order_total: f32,
+    pub order_total: i64,
     pub payment: Json,
     pub order_date: DateTime,
     pub order_notes: Json,

src/methods/customer/structs.rs

@@ -31,7 +31,7 @@ pub struct Customer {
     pub contact: ContactInformation,
 
     pub customer_notes: NoteList,
-    pub balance: u32,
+    pub balance: i64,
 
     pub special_pricing: String,
     pub accepts_marketing: bool,
@@ -81,7 +81,7 @@ pub struct CustomerInput {
     pub customer_notes: NoteList,
 
     pub special_pricing: String,
-    pub balance: u32,
+    pub balance: i64,
 
     pub accepts_marketing: bool,
 }

src/methods/helpers/handlers.rs

@@ -24,6 +24,7 @@ use rocket_okapi::{openapi, openapi_get_routes_spec};
 use rocket_okapi::settings::OpenApiSettings;
 use schemars::JsonSchema;
 use sea_orm::EntityTrait;
+use serde_json::json;
 use crate::session::ActiveModel;
 
 pub fn documented_routes(_settings: &OpenApiSettings) -> (Vec<rocket::Route>, OpenApi) {
@@ -69,23 +70,32 @@ pub async fn generate_template(conn: Connection<Db>) -> Result<Json<All>, Error>
         tenant_id: tenant_id2.to_string().clone(),
     };
 
-    let tenant = Tenant::generate(&db, tenant_id).await.unwrap();
-    let tenant2 = Tenant::generate(&db, tenant_id2).await.unwrap();
-
-    let employee = Employee::generate(&db, session.clone()).await.unwrap();
-    let _employee2 = Employee::generate(&db, session2.clone()).await.unwrap();
-
-    let stores = Store::generate(session.clone(), &db).await.unwrap();
-    let products = Product::generate(session.clone(), &db).await.unwrap();
-    let customer = Customer::generate(session.clone(), &db).await.unwrap();
-
-    let kiosk = Kiosk::generate("adbd48ab-f4ca-4204-9c88-3516f3133621", session.clone(), &db)
-        .await
-        .unwrap();
-
-    let _kiosk2 = Kiosk::generate("adbd48ab-f4ca-4204-9c88-3516f3133622", session2.clone(), &db)
-        .await
-        .unwrap();
+    // Add Tenants
+    let tenant = Tenant::generate(&db, tenant_id).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
+    let tenant2 = Tenant::generate(&db, tenant_id2).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
+
+    // Add Employees
+    let employee = Employee::generate(&db, session.clone()).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
+    let _employee2 = Employee::generate(&db, session2.clone()).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
+
+    // Add other items (aggregated)
+    let stores = Store::generate(session.clone(), &db).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
+    let products = Product::generate(session.clone(), &db).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
+    let customer = Customer::generate(session.clone(), &db).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
+
+    // Add Kiosks
+    let kiosk = Kiosk::generate("adbd48ab-f4ca-4204-9c88-3516f3133621", session.clone(), &db).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
+
+    let _kiosk2 = Kiosk::generate("adbd48ab-f4ca-4204-9c88-3516f3133622", session2.clone(), &db).await
+        .map_err(|e| ErrorResponse::db_err(e))?;
 
     let transaction = Transaction::generate(
         &db,
@@ -97,10 +107,9 @@ pub async fn generate_template(conn: Connection<Db>) -> Result<Json<All>, Error>
             expiry: Utc::now(),
             tenant_id: tenant_id.to_string(),
         },
-    )
-    .await
-    .unwrap();
-    let promotions = Promotion::generate(session, &db).await.unwrap();
+    ).await.map_err(|e| ErrorResponse::db_err(e))?;
+
+    let promotions = Promotion::generate(session, &db).await.map_err(|e| ErrorResponse::db_err(e))?;
 
     Ok(Json(All {
         employee,

src/methods/product/conversions.rs

@@ -21,8 +21,8 @@ impl Product {
             name_long: Set(self.name_long),
             description_long: Set(self.description_long),
             tenant_id: Set(session.tenant_id),
-            created_at: Default::default(),
-            updated_at: Default::default(),
+            created_at: Set(self.created_at.naive_utc()),
+            updated_at: Set(self.created_at.naive_utc()),
         }
     }
 }

src/methods/store/conversions.rs

@@ -12,8 +12,8 @@ impl Store {
             contact: Set(json!(self.contact)),
             code: Set(self.code),
             tenant_id: Set(session.tenant_id),
-            created_at: Default::default(),
-            updated_at: Default::default(),
+            created_at: Set(self.created_at.naive_utc()),
+            updated_at: Set(self.updated_at.naive_utc()),
         }
     }
 }

src/methods/store/example.rs

@@ -1,3 +1,4 @@
+use chrono::Utc;
 use crate::{Address, ContactInformation, Email, MobileNumber, Store};
 
 pub fn example_stores() -> Vec<Store> {
@@ -28,8 +29,8 @@ pub fn example_stores() -> Vec<Store> {
                 },
             },
             code: "001".to_string(),
-            created_at: Default::default(),
-            updated_at: Default::default(),
+            created_at: Utc::now(),
+            updated_at: Utc::now(),
         },
         Store {
             id: "c4a1d88b-e8a0-4dcd-ade2-1eea82254816".to_string(),
@@ -57,8 +58,8 @@ pub fn example_stores() -> Vec<Store> {
                 },
             },
             code: "002".to_string(),
-            created_at: Default::default(),
-            updated_at: Default::default(),
+            created_at: Utc::now(),
+            updated_at: Utc::now(),
         },
         Store {
             id: "a91509fa-2783-43ae-8c3c-5d5bc5cb6c95".to_string(),
@@ -86,8 +87,8 @@ pub fn example_stores() -> Vec<Store> {
                 },
             },
             code: "003".to_string(),
-            created_at: Default::default(),
-            updated_at: Default::default(),
+            created_at: Utc::now(),
+            updated_at: Utc::now(),
         },
     ]
 }