Record coins into the DB

Author: eupn

src/cashcode.rs

@@ -122,16 +122,13 @@ pub struct CashCode {
 }
 
 impl CashCode {
-    pub fn new(port_path: &str, db_path: &str) -> Result<Self, CashCodeError> {
+    pub fn new(port_path: &str, db: CashCodeDb) -> Result<Self, CashCodeError> {
         info!("opening serial port: {}", port_path);
 
         let port = serialport::new(port_path, 19200)
             .timeout(Duration::from_millis(100))
             .open()?;
 
-        info!("opening database: {}", db_path);
-        let db = CashCodeDb::open(db_path)?;
-
         Ok(CashCode {
             port,
             stacker_removed: false,

src/cashcode_db.rs

@@ -33,6 +33,14 @@ impl CashCodeDb {
             )?;
         }
 
+        db.execute(
+            "CREATE TABLE IF NOT EXISTS accepted_coins (
+                nominal INTEGER PRIMARY KEY,
+                quantity INTEGER NOT NULL
+            )",
+            [],
+        )?;
+
         Ok(())
     }
 
@@ -54,6 +62,16 @@ impl CashCodeDb {
         rows.collect::<SqlResult<Vec<_>>>().map_err(Into::into)
     }
 
+    pub fn record_coin(&self, value: i32) -> Result<(), CashCodeError> {
+        let db = self.conn.lock().unwrap();
+        db.execute(
+            "INSERT INTO accepted_coins (nominal, quantity) VALUES (?1, 1)
+             ON CONFLICT(nominal) DO UPDATE SET quantity = quantity + 1",
+            [value],
+        )?;
+        Ok(())
+    }
+
     pub fn get_total_amount(&self) -> Result<i32, CashCodeError> {
         let db = self.conn.lock().unwrap();
         let total: i32 = db

src/main.rs

@@ -16,6 +16,7 @@ mod retroarch;
 mod sound;
 
 use cashcode::{BillEvent, CashCode};
+use cashcode_db::CashCodeDb;
 use config::Config;
 use log::{error, info, warn};
 use slint::Model;
@@ -56,8 +57,15 @@ pub fn main() {
 
     virtual_keyboard::init(&main_window);
     autocomplete_handler::init(&main_window);
-    let cashcode_tx = bill_acceptor::init(&main_window, &config);
-    let cctalk_tx = coin_acceptor::init(&main_window, &config, cashcode_tx.clone());
+    let db = match CashCodeDb::open(&config.stats_db_path) {
+        Ok(db) => db,
+        Err(e) => {
+            error!("Failed to open stats database: {}", e);
+            return;
+        }
+    };
+    let cashcode_tx = bill_acceptor::init(&main_window, &config, db.clone());
+    let cctalk_tx = coin_acceptor::init(&main_window, &config, cashcode_tx.clone(), db);
     fund_fetcher::init(&main_window, &config);
     diagnostics_handler::init(
         &main_window,
@@ -86,7 +94,7 @@ mod bill_acceptor {
         Reset,
     }
 
-    pub fn init(app: &MainWindow, config: &Config) -> Sender<CashCodeCommand> {
+    pub fn init(app: &MainWindow, config: &Config, db: CashCodeDb) -> Sender<CashCodeCommand> {
         let weak = app.as_weak();
 
         // Create a channel for bill events (from CashCode to UI)
@@ -98,7 +106,7 @@ mod bill_acceptor {
         // Start CashCode driver in a separate thread
         thread::spawn({
             let config = config.clone();
-            move || match init_cashcode(&config, event_tx, cmd_rx) {
+            move || match init_cashcode(&config, db, event_tx, cmd_rx) {
                 Ok(_) => info!("CashCode driver stopped"),
                 Err(e) => error!("CashCode driver error: {}", e),
             }
@@ -195,13 +203,14 @@ mod bill_acceptor {
 
 fn init_cashcode(
     config: &Config,
+    db: CashCodeDb,
     tx: Sender<BillEvent>,
     cmd_rx: std::sync::mpsc::Receiver<bill_acceptor::CashCodeCommand>,
 ) -> Result<(), cashcode::CashCodeError> {
     use bill_acceptor::CashCodeCommand;
 
     info!("Initializing CashCode driver...");
-    let mut cashcode = match CashCode::new(&config.cashcode_serial_port, &config.stats_db_path) {
+    let mut cashcode = match CashCode::new(&config.cashcode_serial_port, db) {
         Ok(c) => c,
         Err(e) => {
             let _ = tx.send(BillEvent::Status(e.to_string(), 3));
@@ -324,6 +333,7 @@ mod coin_acceptor {
         app: &MainWindow,
         config: &Config,
         cashcode_tx: Sender<bill_acceptor::CashCodeCommand>,
+        db: CashCodeDb,
     ) -> Sender<CoinAcceptorCommand> {
         let weak = app.as_weak();
 
@@ -378,6 +388,9 @@ mod coin_acceptor {
                         match event {
                             CoinAcceptorEvent::Accepted(value) => {
                                 info!("🪙 Coin accepted in UI: {} AMD", value);
+                                if let Err(e) = db.record_coin(value) {
+                                    error!("Failed to record coin in DB: {}", e);
+                                }
                                 let current = window.get_session_amount();
                                 window.set_session_amount(current + value);
                                 window.set_last_added_amount(value);