From 0eeb088b24e09a1d48ffa74604f1c7d134655254 Mon Sep 17 00:00:00 2001
From: Zynh0722 <Zynh0722@gmail.com>
Date: Tue, 14 Nov 2023 16:38:15 -0800
Subject: [PATCH] remove unneeded type conversion

---
 src/api.rs        | 21 ++-------------------
 src/lib/models.rs |  2 +-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/api.rs b/src/api.rs
index 7421054..018e3a6 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -79,27 +79,10 @@ async fn close_shift(
     render!(crate::templates::home_html, None, !hx)
 }
 
-#[derive(Deserialize, Debug)]
-struct DrinkForm {
-    shift_id: u32,
-    price: u32,
-    quantity: u32,
-}
-
-impl From<DrinkForm> for NewDrink {
-    fn from(value: DrinkForm) -> Self {
-        NewDrink {
-            price: value.price,
-            quantity: value.quantity,
-            shift: value.shift_id,
-        }
-    }
-}
-
 async fn add_drink(
     State(state): State<AppState>,
     HxRequest(hx): HxRequest,
-    Form(form): Form<DrinkForm>,
+    Form(form): Form<NewDrink>,
 ) -> Response {
     let mut conn = state.connection.get().await.unwrap();
 
@@ -129,7 +112,7 @@ async fn add_drink(
         use cm_lib::schema::drinks::dsl::*;
 
         diesel::insert_into(drinks)
-            .values::<NewDrink>(form.into())
+            .values::<NewDrink>(form)
             .execute(&mut conn)
             .await
             .unwrap()
diff --git a/src/lib/models.rs b/src/lib/models.rs
index 1e41f63..48c3ed7 100644
--- a/src/lib/models.rs
+++ b/src/lib/models.rs
@@ -49,7 +49,7 @@ pub struct Show {
     pub end: Option<chrono::NaiveDateTime>,
 }
 
-#[derive(Insertable, Debug)]
+#[derive(Insertable, Deseralize, Debug)]
 #[diesel(table_name = crate::schema::drinks)]
 #[diesel(check_for_backend(diesel::mysql::Mysql))]
 pub struct NewDrink {