task-012 (#2)

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

1 files changed, 15 insertions, 7 deletions

diff --git a/schist_core/schist_queries/src/bucket_transfers.rs b/schist_core/schist_queries/src/bucket_transfers.rs
index 2145944..923867f 100644
--- a/schist_core/schist_queries/src/bucket_transfers.rs
+++ b/schist_core/schist_queries/src/bucket_transfers.rs
@@ -1,10 +1,9 @@
 use anyhow::{Context, Result};
 use diesel::{dsl::sum, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection};
+use schist_models::bucket_transfer::BucketTransfer;
 use schist_schema::schema::bucket_transfers::{
-    self as bucket_transfers_schema,
-    dsl::bucket_transfers as bucket_transfers_table,
+    self as bucket_transfers_schema, dsl::bucket_transfers as bucket_transfers_table,
 };
-use schist_models::bucket_transfer::BucketTransfer;
 
 pub fn delete_all_bucket_transfers(connection: &mut SqliteConnection) -> Result<usize> {
     let num_rows_deleted = diesel::delete(bucket_transfers_table)
@@ -50,10 +49,15 @@ pub fn sum_bucket_transfer_quantity_per_from_bucket_id(
         .group_by(bucket_transfers_schema::from_bucket_id)
         .select((
             bucket_transfers_schema::from_bucket_id,
-            sum(bucket_transfers_schema::quantity),
+            sum(bucket_transfers_schema::amount),
         ))
         .load::<(i32, Option<i64>)>(connection)
-        .map(|result| result.iter().map(|sum| (sum.0, sum.1.unwrap_or(0))).collect())
+        .map(|result| {
+            result
+                .iter()
+                .map(|sum| (sum.0, sum.1.unwrap_or(0)))
+                .collect()
+        })
         .with_context(|| "failed to sum bucket transfer quantity per from bucket ID")?;
     Ok(sum)
 }
@@ -65,10 +69,14 @@ pub fn sum_bucket_transfer_quantity_per_to_bucket_id(
         .group_by(bucket_transfers_schema::to_bucket_id)
         .select((
             bucket_transfers_schema::to_bucket_id,
-            sum(bucket_transfers_schema::quantity),
+            sum(bucket_transfers_schema::amount),
         ))
         .load::<(i32, Option<i64>)>(connection)
-        .map(|vec| vec.iter().map(|(id, sum)| (*id, sum.unwrap_or(0))).collect())
+        .map(|vec| {
+            vec.iter()
+                .map(|(id, sum)| (*id, sum.unwrap_or(0)))
+                .collect()
+        })
         .with_context(|| "failed to sum bucket transfer quantity per to bucket ID")?;
     Ok(sum)
 }