task-072

Co-authored-by: Joe Carstairs <jcarstairs@scottlogic.com>
Reviewed-on: https://git.joeac.net/joeac/schist/pulls/3
Co-authored-by: Joe Carstairs <me@joeac.net>
Co-committed-by: Joe Carstairs <me@joeac.net>

3 files changed, 9 insertions, 13 deletions

diff --git a/schist_core/schist_queries/src/clear.rs b/schist_core/schist_queries/src/clear.rs
index 04d22d9..a5a82f3 100644
--- a/schist_core/schist_queries/src/clear.rs
+++ b/schist_core/schist_queries/src/clear.rs
@@ -2,17 +2,16 @@ use anyhow::Result;
 use diesel::SqliteConnection;
 
 use crate::{
-    accounts::delete_all_accounts, bucket_transfers::delete_all_bucket_transfers,
-    buckets::delete_all_buckets, drips::delete_all_drips, pipes::delete_all_pipes,
-    transactions::delete_all_transactions,
+    account_transfers::delete_all_account_transfers, accounts::delete_all_accounts, bucket_transfers::delete_all_bucket_transfers, buckets::delete_all_buckets, drips::delete_all_drips, pipes::delete_all_pipes, transactions::delete_all_transactions
 };
 
 pub fn clear(connection: &mut SqliteConnection) -> Result<()> {
-    delete_all_accounts(connection)?;
+    delete_all_account_transfers(connection)?;
     delete_all_drips(connection)?;
-    delete_all_buckets(connection)?;
-    delete_all_bucket_transfers(connection)?;
-    delete_all_transactions(connection)?;
     delete_all_pipes(connection)?;
+    delete_all_transactions(connection)?;
+    delete_all_accounts(connection)?;
+    delete_all_bucket_transfers(connection)?;
+    delete_all_buckets(connection)?;
     Ok(())
 }
diff --git a/schist_core/schist_queries/src/utils/mod.rs b/schist_core/schist_queries/src/utils/mod.rs
index 6b47b48..3a81c8c 100644
--- a/schist_core/schist_queries/src/utils/mod.rs
+++ b/schist_core/schist_queries/src/utils/mod.rs
@@ -2,7 +2,5 @@ mod calculate_bucket_balance;
 mod find_by_id_or;
 mod sum_drips_for_bucket;
 
+use find_by_id_or::find_by_id_or;
 use sum_drips_for_bucket::sum_drips_for_bucket;
-
-pub use calculate_bucket_balance::calculate_bucket_balance;
-pub use find_by_id_or::find_by_id_or;
diff --git a/schist_core/schist_queries/tests/category_transfers.rs b/schist_core/schist_queries/tests/category_transfers.rs
index 13b9866..f7c75a7 100644
--- a/schist_core/schist_queries/tests/category_transfers.rs
+++ b/schist_core/schist_queries/tests/category_transfers.rs
@@ -184,6 +184,7 @@ fn given_bucket_transfers_when_sum_quantity_per_to_bucket_id_then_returns_sum_pe
         make_fake_bucket_transfer_builder(2)
             .from_bucket_id(1)
             .to_bucket_id(0)
+            .amount(4)
             .build()
             .unwrap(),
     ];
@@ -196,7 +197,5 @@ fn given_bucket_transfers_when_sum_quantity_per_to_bucket_id_then_returns_sum_pe
     assert!(sums.is_ok());
     let mut sums = sums.unwrap();
     sums.sort_by_key(|sum| sum.0);
-    assert_eq!(buckets.len(), sums.len());
-    assert_eq!(4, sums[0].1);
-    assert_eq!(3, sums[1].1);
+    assert_eq!([(0, 4), (1, 3)], sums.as_slice());
 }