Merge pull request #14 from suba327777/feature/card-db

[WIP]Feature/card db

Author: suba327777

migrations/2023-11-22-075134_create_account/up.sql

@@ -1,9 +1,8 @@
 -- Your SQL goes here
 CREATE TABLE account (
   id bigserial NOT NULL PRIMARY KEY,
-  username varchar(255) NOT NULL UNIQUE,
+  username varchar(255) NOT NULL ,
   grade INTEGER CHECK (grade >= 1 AND grade <= 4) NOT NULL,
-  card_type varchar(255) NOT NULL,
-  card_id bytea NOT NULL,
+  expiration_date TIMESTAMPTZ NOT NULL,
   created_at TIMESTAMPTZ NOT NULL
 );

migrations/2023-12-17-124725_create_card/down.sql

@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE card;

migrations/2023-12-17-124725_create_card/up.sql

@@ -0,0 +1,9 @@
+-- Your SQL goes here
+CREATE TABLE card (
+  id bigserial NOT NULL PRIMARY KEY,
+  account_id bigserial NOT NULL,
+  card_name varchar(255) NOT NULL,
+  card_number bytea NOT NULL,
+  created_at TIMESTAMPTZ NOT NULL,
+  FOREIGN KEY (account_id) REFERENCES account(id)
+);

src/domain/object/account.rs

@@ -1,5 +1,6 @@
 use super::Id;
-use chrono::{Local, NaiveDateTime};
+use crate::utils::time::create_time;
+use chrono::NaiveDateTime;
 
 pub type AccountId = Id<Account>;
 
@@ -8,50 +9,38 @@ pub struct Account {
     pub id: AccountId,
     pub username: String,
     pub grade: i32,
-    pub card_type: String,
-    pub card_id: Vec<u8>,
+    pub expiration_date: NaiveDateTime,
     pub created_at: NaiveDateTime,
 }
 
 impl Account {
-    pub fn create(username: String, grade: i32, card_type: String) -> Self {
+    pub fn new(username: String, grade: i32, expiration_date: NaiveDateTime) -> Self {
         Self {
             id: Default::default(),
             username,
             grade,
-            card_type,
-            card_id: create_card_id(),
+            expiration_date,
             created_at: create_time(),
         }
     }
 }
 
-fn create_card_id() -> Vec<u8> {
-    //TODO
-    let card_id: Vec<u8> = vec![1, 16, 3, 16, 197, 20, 106, 38];
-    card_id
-}
-
-fn create_time() -> NaiveDateTime {
-    let local_now = Local::now();
-    local_now.naive_local()
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
+    use chrono::Duration;
 
     #[test]
     fn test_create_account() {
         let username = "test_user".to_string();
         let grade = 4;
-        let card_type = "Suica".to_string();
-        let card_id = [1, 16, 3, 16, 197, 20, 106, 38].to_vec();
+        let current_time = create_time();
+        let expiration_date = current_time + Duration::hours(1);
 
-        let account = Account::create(username.clone(), grade, card_type.clone());
+        let account = Account::new(username.clone(), grade, expiration_date);
 
         assert_eq!(account.id.get(), 0);
         assert_eq!(account.username, username);
-        assert_eq!(account.card_id, card_id);
+        assert_eq!(account.expiration_date, expiration_date);
     }
 }

src/domain/object/card.rs

@@ -0,0 +1,44 @@
+use super::{account::AccountId, Id};
+use crate::utils::time::create_time;
+use chrono::NaiveDateTime;
+
+pub type CardId = Id<Card>;
+
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
+pub struct Card {
+    pub id: CardId,
+    pub account_id: AccountId,
+    pub card_name: String,
+    pub card_number: Vec<u8>,
+    pub created_at: NaiveDateTime,
+}
+
+impl Card {
+    pub fn new(account_id: AccountId, card_name: String, card_number: Vec<u8>) -> Self {
+        Self {
+            id: Default::default(),
+            account_id,
+            card_name,
+            card_number,
+            created_at: create_time(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_create_card() {
+        let account_id = AccountId::new(1);
+        let card_name = "suica".to_string();
+        let card_number = [1, 16, 3, 16, 197, 20, 106, 38].to_vec();
+
+        let card = Card::new(account_id, card_name, card_number);
+
+        assert_eq!(card.account_id.get(), 1);
+        assert_eq!(card.card_name, "suica");
+        assert_eq!(card.card_number, vec![1, 16, 3, 16, 197, 20, 106, 38])
+    }
+}

src/domain/object/mod.rs

@@ -1,9 +1,11 @@
+use serde::{Deserialize, Deserializer, Serialize};
 use std::marker::PhantomData;
 
 pub mod account;
+pub mod card;
 mod mqtt;
 
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, Serialize)]
 pub struct Id<T> {
     id: i64,
     _phantom: PhantomData<T>,
@@ -26,3 +28,13 @@ impl<T> Default for Id<T> {
         Id::new(0)
     }
 }
+
+impl<'de, T> Deserialize<'de> for Id<T> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let id = i64::deserialize(deserializer)?;
+        Ok(Id::new(id))
+    }
+}

src/domain/repository/card.rs

@@ -0,0 +1,13 @@
+use super::super::object::{
+    account::AccountId,
+    card::{Card, CardId},
+};
+use anyhow;
+pub trait CardRepository {
+    fn insert(&self, card: &Card) -> anyhow::Result<()>;
+    fn list(&self, account_id: &AccountId) -> anyhow::Result<Vec<Card>>;
+    fn find_by_id(&self, card_id: &CardId, account_id: &AccountId) -> anyhow::Result<Card>;
+    #[allow(dead_code)]
+    fn find_by_card_number(&self, card_number: &[u8]) -> anyhow::Result<bool>;
+    fn delete(&self, card: &Card) -> anyhow::Result<()>;
+}

src/domain/repository/mod.rs

@@ -1 +1,2 @@
 pub mod account;
+pub mod card;

src/infrastructures/database/models.rs

@@ -6,8 +6,7 @@ use chrono::NaiveDateTime;
 pub struct NewAccountEntity {
     pub username: String,
     pub grade: i32,
-    pub card_type: String,
-    pub card_id: Vec<u8>,
+    pub expiration_date: NaiveDateTime,
     pub created_at: NaiveDateTime,
 }
 
@@ -17,7 +16,25 @@ pub struct AccountEntity {
     pub id: i64,
     pub username: String,
     pub grade: i32,
-    pub card_type: String,
-    pub card_id: Vec<u8>,
+    pub expiration_date: NaiveDateTime,
+    pub created_at: NaiveDateTime,
+}
+
+#[derive(Debug, Insertable)]
+#[table_name = "card"]
+pub struct NewCardEntity {
+    pub account_id: i64,
+    pub card_name: String,
+    pub card_number: Vec<u8>,
+    pub created_at: NaiveDateTime,
+}
+
+#[derive(Debug, Queryable, Identifiable, AsChangeset)]
+#[table_name = "card"]
+pub struct CardEntity {
+    pub id: i64,
+    pub account_id: i64,
+    pub card_name: String,
+    pub card_number: Vec<u8>,
     pub created_at: NaiveDateTime,
 }

src/infrastructures/database/schema.rs

@@ -6,9 +6,22 @@ diesel::table! {
         #[max_length = 255]
         username -> Varchar,
         grade -> Int4,
+        expiration_date -> Timestamptz,
+        created_at -> Timestamptz,
+    }
+}
+
+diesel::table! {
+    card (id) {
+        id -> Int8,
+        account_id -> Int8,
         #[max_length = 255]
-        card_type -> Varchar,
-        card_id -> Bytea,
+        card_name -> Varchar,
+        card_number -> Bytea,
         created_at -> Timestamptz,
     }
 }
+
+diesel::joinable!(card -> account (account_id));
+
+diesel::allow_tables_to_appear_in_same_query!(account, card,);

src/infrastructures/iot/mqtt_client.rs

@@ -7,6 +7,7 @@ use std::time::Duration;
 
 type MessageHandler = Arc<dyn Fn(&Message) + Send + Sync>;
 
+#[allow(dead_code)]
 pub trait MessageListener: Fn(Message) + Send + Sync + 'static {}
 impl<T> MessageListener for T where T: Fn(Message) + Send + Sync + 'static {}
 

src/infrastructures/repository/account.rs

@@ -10,15 +10,13 @@ impl NewAccountEntity {
     pub fn new(
         username: String,
         grade: i32,
-        card_type: String,
-        card_id: Vec<u8>,
+        expiration_date: NaiveDateTime,
         created_at: NaiveDateTime,
     ) -> Self {
         Self {
             username,
             grade,
-            card_type,
-            card_id,
+            expiration_date,
             created_at,
         }
     }
@@ -27,8 +25,7 @@ impl NewAccountEntity {
         NewAccountEntity {
             username: model.username.to_owned(),
             grade: model.grade.to_owned(),
-            card_type: model.card_type.to_owned(),
-            card_id: model.card_id.to_owned(),
+            expiration_date: model.expiration_date.to_owned(),
             created_at: model.created_at.to_owned(),
         }
     }
@@ -40,8 +37,7 @@ impl AccountEntity {
             id: model.id.get(),
             username: model.username.to_owned(),
             grade: model.grade.to_owned(),
-            card_type: model.card_type.to_owned(),
-            card_id: model.card_id.to_owned(),
+            expiration_date: model.expiration_date.to_owned(),
             created_at: model.created_at.to_owned(),
         }
     }
@@ -50,8 +46,7 @@ impl AccountEntity {
             id: AccountId::new(self.id),
             username: self.username.to_owned(),
             grade: self.grade.to_owned(),
-            card_type: self.card_type.to_owned(),
-            card_id: self.card_id.to_owned(),
+            expiration_date: self.expiration_date.to_owned(),
             created_at: self.created_at.to_owned(),
         }
     }