From 5fced470220a9355a5b7ba0bb2858e1733b706dd Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Sat, 9 Nov 2024 00:29:27 +0000
Subject: Tests category_transfers queries

---
 .../queries/category_transfers/sum_quantity_per_from_category_id.rs    | 3 ++-
 .../src/queries/category_transfers/sum_quantity_per_to_category_id.rs  | 3 ++-
 .../transaction_categorisations/sum_quantity_per_category_id.rs        | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'backend/core/src/queries')

diff --git a/backend/core/src/queries/category_transfers/sum_quantity_per_from_category_id.rs b/backend/core/src/queries/category_transfers/sum_quantity_per_from_category_id.rs
index cd4137d..a9c2a8c 100644
--- a/backend/core/src/queries/category_transfers/sum_quantity_per_from_category_id.rs
+++ b/backend/core/src/queries/category_transfers/sum_quantity_per_from_category_id.rs
@@ -6,7 +6,7 @@ use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection};
 
 pub fn sum_category_transfer_quantity_per_from_category_id(
     connection: &mut SqliteConnection,
-) -> Result<Vec<(i32, Option<i64>)>, Error> {
+) -> Result<Vec<(i32, i64)>, Error> {
     category_transfers_table
         .group_by(category_transfers_schema::from_category_id)
         .select((
@@ -14,4 +14,5 @@ pub fn sum_category_transfer_quantity_per_from_category_id(
             sum(category_transfers_schema::quantity),
         ))
         .load::<(i32, Option<i64>)>(connection)
+        .map(|result| result.iter().map(|sum| (sum.0, sum.1.unwrap_or(0))).collect())
 }
diff --git a/backend/core/src/queries/category_transfers/sum_quantity_per_to_category_id.rs b/backend/core/src/queries/category_transfers/sum_quantity_per_to_category_id.rs
index f5fb561..f041477 100644
--- a/backend/core/src/queries/category_transfers/sum_quantity_per_to_category_id.rs
+++ b/backend/core/src/queries/category_transfers/sum_quantity_per_to_category_id.rs
@@ -6,7 +6,7 @@ use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection};
 
 pub fn sum_category_transfer_quantity_per_to_category_id(
     connection: &mut SqliteConnection,
-) -> Result<Vec<(i32, Option<i64>)>, Error> {
+) -> Result<Vec<(i32, i64)>, Error> {
     category_transfers_table
         .group_by(category_transfers_schema::to_category_id)
         .select((
@@ -14,4 +14,5 @@ pub fn sum_category_transfer_quantity_per_to_category_id(
             sum(category_transfers_schema::quantity),
         ))
         .load::<(i32, Option<i64>)>(connection)
+        .map(|vec| vec.iter().map(|(id, sum)| (*id, sum.unwrap_or(0))).collect())
 }
diff --git a/backend/core/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs b/backend/core/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs
index 7f93e0c..61f3492 100644
--- a/backend/core/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs
+++ b/backend/core/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs
@@ -6,7 +6,7 @@ use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection};
 
 pub fn sum_transaction_categorisation_quantity_per_category_id(
     connection: &mut SqliteConnection,
-) -> Result<Vec<(i32, Option<i64>)>, Error> {
+) -> Result<Vec<(i32, i64)>, Error> {
     transaction_categorisations_table
         .group_by(transaction_categorisations_schema::category_id)
         .select((
@@ -14,4 +14,5 @@ pub fn sum_transaction_categorisation_quantity_per_category_id(
             sum(transaction_categorisations_schema::quantity),
         ))
         .load::<(i32, Option<i64>)>(connection)
+        .map(|vec| vec.iter().map(|(category_id, sum)| (*category_id, sum.unwrap_or(0))).collect())
 }
-- 
cgit v1.2.3