mod: updating customers

src/methods/common.rs

@@ -59,6 +59,27 @@ pub struct ContactInformation {
     pub address: Address,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, Validate)]
+pub struct ContactInformationInput {
+    pub name: String,
+    pub mobile: String,
+    pub email: String,
+    pub landline: String,
+    pub address: Address,
+}
+
+impl ContactInformationInput {
+    pub fn into_major(self) -> ContactInformation {
+        ContactInformation {
+            name: self.name,
+            email: Email::from(self.email),
+            mobile: MobileNumber::from(self.mobile),
+            landline: self.landline,
+            address: self.address
+        }
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, Validate)]
 pub struct MobileNumber {
     pub number: String,

src/methods/customer/conversions.rs

@@ -16,7 +16,7 @@ impl CustomerInput {
             id: Set(id),
             name: Set(self.name),
 
-            contact: Set(json!(self.contact)),
+            contact: Set(json!(self.contact.into_major())),
             customer_notes: Set(json!(self.customer_notes)),
 
             balance: Set(self.balance),
@@ -28,6 +28,22 @@ impl CustomerInput {
             updated_at: Set(Utc::now().naive_utc()),
         }
     }
+
+    pub(crate) fn from_existing(self, customer: Customer, tenant_id: String) -> ActiveModel {
+        ActiveModel {
+            id: Set(customer.id),
+            name: Set(self.name),
+
+            contact: Set(json!(self.contact.into_major())),
+            customer_notes: Set(json!(self.customer_notes)),
+            accepts_marketing: Set(self.accepts_marketing),
+            tenant_id: Set(tenant_id),
+
+            updated_at: Set(Utc::now().naive_utc()),
+
+            ..Default::default()
+        }
+    }
 }
 
 impl Customer {

src/methods/customer/handlers.rs

@@ -1,5 +1,5 @@
 use okapi::openapi3::OpenApi;
-use crate::check_permissions;
+use crate::{check_permissions};
 use crate::methods::{
     cookie_status_wrapper, Action, ContactInformation, CustomerWithTransactionsOut, Error,
     ErrorResponse, Transaction,
@@ -22,6 +22,7 @@ pub fn documented_routes(settings: &OpenApiSettings) -> (Vec<rocket::Route>, Ope
     openapi_get_routes_spec![
         settings:
         get,
+        delete,
         get_by_name,
         get_by_phone,
         get_by_addr,
@@ -31,6 +32,7 @@ pub fn documented_routes(settings: &OpenApiSettings) -> (Vec<rocket::Route>, Ope
         generate,
         search_query,
         update_contact_info,
+        update_by_input,
         find_related_transactions
     ]
 }
@@ -53,6 +55,24 @@ pub async fn get(
     }
 }
 
+#[openapi(tag = "Customer")]
+#[post("/delete/<id>")]
+pub async fn delete(
+    conn: Connection<Db>,
+    id: &str,
+    cookies: &CookieJar<'_>,
+) -> Result<(), Error> {
+    let db = conn.into_inner();
+
+    let session = cookie_status_wrapper(&db, cookies).await?;
+    check_permissions!(session.clone(), Action::AccessAdminPanel);
+
+    match Customer::delete(id, session, &db).await {
+        Ok(_res) => Ok(()),
+        Err(err) => Err(ErrorResponse::db_err(err)),
+    }
+}
+
 #[openapi(tag = "Customer")]
 #[get("/recent")]
 pub async fn get_recent(
@@ -192,6 +212,25 @@ async fn update(
     ))
 }
 
+#[openapi(tag = "Customer")]
+#[post("/input/<id>", data = "<input_data>")]
+async fn update_by_input(
+    conn: Connection<Db>,
+    id: &str,
+    cookies: &CookieJar<'_>,
+    input_data: Validated<Json<CustomerInput>>,
+) -> Result<Json<Customer>, Error> {
+    let input_data = input_data.clone().0.into_inner();
+    let db = conn.into_inner();
+
+    let session = cookie_status_wrapper(&db, cookies).await?;
+    check_permissions!(session.clone(), Action::ModifyCustomer);
+
+    Ok(Json(
+        Customer::update_by_input(input_data, session, id, &db).await?
+    ))
+}
+
 #[openapi(tag = "Customer")]
 #[post("/contact/<id>", data = "<input_data>")]
 async fn update_contact_info(

src/methods/customer/structs.rs

@@ -8,7 +8,7 @@ use crate::entities::customer;
 use crate::entities::prelude::Customer as Cust;
 #[cfg(feature = "process")]
 use crate::methods::convert_addr_to_geo;
-use crate::methods::{Address, ContactInformation, Email, Id, MobileNumber, NoteList};
+use crate::methods::{Address, ContactInformation, Id, NoteList};
 #[cfg(feature = "process")]
 use sea_orm::QueryFilter;
 #[cfg(feature = "process")]
@@ -17,12 +17,12 @@ use sea_orm::{
     ActiveModelTrait, ColumnTrait, DbBackend, DbConn, DbErr, EntityTrait, FromQueryResult,
     InsertResult, JsonValue, QuerySelect, RuntimeErr, Set, Statement,
 };
-use sea_orm::QueryOrder;
+use sea_orm::{DeleteResult, QueryOrder};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use validator::Validate;
 use crate::entities::customer::ActiveModel;
-use crate::Session;
+use crate::{ContactInformationInput, Session};
 
 #[cfg(feature = "types")]
 #[derive(Serialize, Deserialize, Clone, JsonSchema, Validate)]
@@ -84,7 +84,7 @@ pub struct CustomerWithTransactionsOut {
 pub struct CustomerInput {
     pub name: String,
 
-    pub contact: ContactInformation,
+    pub contact: ContactInformationInput,
     pub customer_notes: NoteList,
 
     pub special_pricing: String,
@@ -192,6 +192,17 @@ impl Customer {
         Ok(mapped)
     }
 
+    pub async fn delete(id: &str, session: Session, db: &DbConn) -> Result<DeleteResult, DbErr> {
+        match crate::entities::customer::Entity::delete_by_id(id)
+            .filter(customer::Column::TenantId.eq(session.tenant_id))
+            .exec(db)
+            .await
+        {
+            Ok(res) => Ok(res),
+            Err(err) => Err(err),
+        }
+    }
+
     pub async fn fetch_containing_contact(
         value: &str,
         session: Session,
@@ -255,6 +266,20 @@ impl Customer {
         Customer::fetch_by_id(&r.last_insert_id, session, db).await
     }
 
+    pub async fn update_by_input(
+        cust: CustomerInput,
+        session: Session,
+        id: &str,
+        db: &DbConn,
+    ) -> Result<Customer, DbErr> {
+        let old_customer = Self::fetch_by_id(id, session.clone(), db).await?;
+        let customer = cust.from_existing(old_customer, session.tenant_id.clone());
+
+        Cust::update(customer).exec(db).await?;
+
+        Self::fetch_by_id(id, session, db).await
+    }
+
     pub async fn update(
         cust: Customer,
         session: Session,
@@ -362,10 +387,10 @@ impl Display for Customer {
 }
 
 pub fn example_customer() -> CustomerInput {
-    let customer = ContactInformation {
+    let customer = ContactInformationInput {
         name: "Carl Kennith".into(),
-        mobile: MobileNumber::from("0212121204".to_string()),
-        email: Email::from("[email protected]".to_string()),
+        mobile: "0212121204".to_string(),
+        email: "[email protected]".to_string(),
         landline: "".into(),
         address: Address {
             street: "54 Arney Crescent".into(),

src/methods/employee/handlers.rs

@@ -278,7 +278,7 @@ pub async fn auth(
         }
         Err(reason) => {
             println!("[dberr]: {}", reason);
-            Err(ErrorResponse::input_error())
+            Err(ErrorResponse::db_err(reason))
         }
     }
 }