From 18e5f6be2ea0ba8df866edd0f8e8666c31840689 Mon Sep 17 00:00:00 2001
From: Ivan Schuetz <ivanschuetz@gmail.com>
Date: Thu, 16 Jul 2020 18:50:34 +0200
Subject: [PATCH] Cleanup

---
 src/reports_updater.rs | 76 +++---------------------------------------
 1 file changed, 4 insertions(+), 72 deletions(-)

diff --git a/src/reports_updater.rs b/src/reports_updater.rs
index e753be1..3c55962 100644
--- a/src/reports_updater.rs
+++ b/src/reports_updater.rs
@@ -214,15 +214,6 @@ where
             Err(_) => Err(ServicesError::General("Couldn't lock tcns batch".to_owned()))
         }
     }
-
-    //     // // This doesn't work: expand only if contiguous.
-    //     // let query = "
-    //     //     INSERT INTO tcn(tcn, contact_start, contact_end, min_distance)
-    //     //     values(?1, ?2, ?3, ?4)
-    //     //     ON CONFLICT(tcn) DO UPDATE SET
-    //     //     contact_start = MIN(tcn.contact_start, excluded.contact_start),
-    //     //     contact_end = MAX(tcn.contact_end, excluded.contact_end),
-    //     //     min_distance = MIN(tcn.min_distance, excluded.min_distance);";
 }
 
 pub struct ObservedTcnProcessorImpl<T>
@@ -248,10 +239,7 @@ where
 
     fn schedule_process_batches(&self) {
         let timer_mutex = self.timer.clone();
-        // let batch = self.tcns_batch.clone();
         let tcn_batches_manager = self.tcn_batches_manager.clone();
-        // let dao = self.tcn_dao.clone();
-
         thread::spawn(move || {
             let timer = timer_mutex.lock().unwrap();
             timer.schedule_repeating(chrono::Duration::seconds(10), move || {
@@ -260,10 +248,6 @@ where
                 let tcn_batches_manager = expect_log!(tcn_batches_manager_res, "error");
                 let flush_res = tcn_batches_manager.flush();
                 expect_log!(flush_res, "Couldn't flush TCNs");
-
-                // let save_res = dao.save_batch(vec.clone());
-                // expect_log!(save_res, "Couldn't save batch");
-                // vec.clear()
             })
         });
     }
@@ -298,7 +282,6 @@ pub trait TcnDao: Send + Sync {
         &self,
         with: Vec<TemporaryContactNumber>,
     ) -> Result<Vec<ObservedTcn>, ServicesError>;
-    fn save(&self, observed_tcn: &ObservedTcn) -> Result<(), ServicesError>;
     fn save_batch(&self, observed_tcns: Vec<ObservedTcn>) -> Result<(), ServicesError>;
 }
 
@@ -360,21 +343,6 @@ impl TcnDaoImpl {
         Self::create_table_if_not_exists(&db);
         TcnDaoImpl { db }
     }
-
-    // pub fn find_observed_tcn(
-    //     &self,
-    //     tcn: TemporaryContactNumber,
-    // ) -> Result<ObservedTcn, ServicesError> {
-    //     let tcn_str = hex::encode(tcn.0);
-
-    //     self.db
-    //         .query_row(
-    //             "select tcn, contact_start, contact_end, min_distance from tcn where tcn=?1",
-    //             &[tcn_str],
-    //             |row| Ok(Self::to_tcn(row)),
-    //         )
-    //         .map_err(ServicesError::from)
-    // }
 }
 
 impl TcnDao for TcnDaoImpl {
@@ -406,23 +374,6 @@ impl TcnDao for TcnDaoImpl {
         self.all()
     }
 
-    fn save(&self, observed_tcn: &ObservedTcn) -> Result<(), ServicesError> {
-        let tcn_str = hex::encode(observed_tcn.tcn.0);
-
-        let res = self.db.execute_sql(
-            "insert or replace into tcn(tcn, contact_start, contact_end, min_distance) values(?1, ?2, ?3, ?4)",
-            // conversion to signed timestamp is safe, for obvious reasons.
-            params![
-                tcn_str,
-                observed_tcn.contact_start.value as i64,
-                observed_tcn.contact_end.value as i64,
-                observed_tcn.min_distance as f64 // db requires f64 / real
-            ],
-        );
-        expect_log!(res, "Couldn't insert tcn");
-        Ok(())
-    }
-
     // Overwrites if already exists
     fn save_batch(&self, observed_tcns: Vec<ObservedTcn>) -> Result<(), ServicesError> {
         self.db.transaction(|t| {
@@ -442,25 +393,6 @@ impl TcnDao for TcnDaoImpl {
             }
             Ok(())
         })
-
-        // let query = "
-        // INSERT INTO tcn(tcn, contact_start, contact_end, min_distance)
-        // values(?1, ?2, ?3, ?4)
-        // ON CONFLICT DO UPDATE SET
-        // contact_start = MIN(tcn.contact_start, excluded.contact_start),
-        // contact_start = MIN(tcn.contact_end, excluded.contact_end),
-        // contact_start = MIN(tcn.min_distance, excluded.min_distance);";
-
-        // let res = self.db.execute_sql(
-        //     query,
-        //     // conversion to signed timestamp is safe, for obvious reasons.
-        //     params![
-        //         tcn_str,
-        //         observed_tcn.contact_start.value as i64,
-        //         observed_tcn.contact_end.value as i64,
-        //         observed_tcn.min_distance as f64 // db requires f64 / real
-        //     ],
-        // );
     }
 }
 
@@ -977,7 +909,7 @@ mod tests {
             min_distance: 0.0,
         };
 
-        let save_res = tcn_dao.save(&observed_tcn);
+        let save_res = tcn_dao.save_batch(vec![observed_tcn.clone()]);
         assert!(save_res.is_ok());
 
         let loaded_tcns_res = tcn_dao.all();
@@ -1021,9 +953,9 @@ mod tests {
             min_distance: 0.0,
         };
 
-        let save_res_1 = tcn_dao.save(&observed_tcn_1);
-        let save_res_2 = tcn_dao.save(&observed_tcn_2);
-        let save_res_3 = tcn_dao.save(&observed_tcn_3);
+        let save_res_1 = tcn_dao.save_batch(vec![observed_tcn_1.clone()]);
+        let save_res_2 = tcn_dao.save_batch(vec![observed_tcn_2.clone()]);
+        let save_res_3 = tcn_dao.save_batch(vec![observed_tcn_3.clone()]);
         assert!(save_res_1.is_ok());
         assert!(save_res_2.is_ok());
         assert!(save_res_3.is_ok());