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>

9 files changed, 58 insertions, 54 deletions

diff --git a/schist_core/schist_fakes/src/account_transfer.rs b/schist_core/schist_fakes/src/account_transfer.rs
index f762c2f..703d7ce 100644
--- a/schist_core/schist_fakes/src/account_transfer.rs
+++ b/schist_core/schist_fakes/src/account_transfer.rs
@@ -1,17 +1,20 @@
-use schist_models::{date_utc::DateUtc, account_transfer::{AccountTransfer, AccountTransferBuilder}};
+use schist_models::{
+    account_transfer::{AccountTransfer, AccountTransferBuilder},
+    date_utc::DateUtc,
+};
 use schist_traits::nowlike::Nowlike;
 
 pub fn make_fake_account_transfer(id: i32) -> AccountTransfer {
     make_fake_account_transfer_builder(id).build().unwrap()
 }
 
-pub fn make_fake_account_transfer_builder(id: i32) ->  AccountTransferBuilder {
+pub fn make_fake_account_transfer_builder(id: i32) -> AccountTransferBuilder {
     let mut builder = AccountTransferBuilder::default();
     builder
         .id(id)
         .date(DateUtc::now())
         .description(String::from("Fake account transfer"))
-        .quantity(0)
+        .amount(0)
         .from_account_id(0)
         .to_account_id(1);
     builder
diff --git a/schist_core/schist_fakes/src/bucket.rs b/schist_core/schist_fakes/src/bucket.rs
index 1b447b2..fe03a83 100644
--- a/schist_core/schist_fakes/src/bucket.rs
+++ b/schist_core/schist_fakes/src/bucket.rs
@@ -1,9 +1,4 @@
-use schist_models::{
-    bucket::{Bucket, BucketBuilder},
-    budget_period_unit::BudgetPeriodUnit,
-    date_utc::DateUtc,
-};
-use schist_traits::nowlike::Nowlike;
+use schist_models::bucket::{Bucket, BucketBuilder};
 
 pub fn make_fake_bucket(id: i32) -> Bucket {
     make_fake_bucket_builder(id).build().unwrap()
@@ -14,11 +9,8 @@ pub fn make_fake_bucket_builder(id: i32) -> BucketBuilder {
     builder
         .id(id)
         .name(String::from("Fake bucket"))
-        .balance(0)
-        .balance_date(DateUtc::now())
-        .budget_period(0)
-        .budget_period_unit(BudgetPeriodUnit::Day)
-        .budget_quantity(0)
+        .balance(None)
+        .balance_cache_key(None)
         .group(String::from("Fake group"));
     builder
 }
diff --git a/schist_core/schist_fakes/src/bucket_transfer.rs b/schist_core/schist_fakes/src/bucket_transfer.rs
index 9bc1f80..bf5e71b 100644
--- a/schist_core/schist_fakes/src/bucket_transfer.rs
+++ b/schist_core/schist_fakes/src/bucket_transfer.rs
@@ -9,7 +9,7 @@ pub fn make_fake_bucket_transfer_builder(id: i32) -> BucketTransferBuilder {
     builder
         .id(id)
         .description(String::from("Fake bucket transfer"))
-        .quantity(0)
+        .amount(0)
         .from_bucket_id(0)
         .to_bucket_id(1);
     builder
diff --git a/schist_core/schist_fakes/src/budget_drip.rs b/schist_core/schist_fakes/src/budget_drip.rs
deleted file mode 100644
index 498dd76..0000000
--- a/schist_core/schist_fakes/src/budget_drip.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use schist_models::{budget_drip::{BudgetDrip, BudgetDripBuilder}, date_utc::DateUtc};
-use schist_traits::nowlike::Nowlike;
-
-pub fn make_fake_budget_drip(id: i32) -> BudgetDrip {
-    make_fake_budget_drip_builder(id).build().unwrap()
-}
-
-pub fn make_fake_budget_drip_builder(id: i32) -> BudgetDripBuilder {
-    let mut builder = BudgetDripBuilder::default();
-    builder
-        .id(id)
-        .bucket_id(0)
-        .date(DateUtc::now())
-        .quantity(0);
-    builder
-}
diff --git a/schist_core/schist_fakes/src/drip.rs b/schist_core/schist_fakes/src/drip.rs
new file mode 100644
index 0000000..88f0b05
--- /dev/null
+++ b/schist_core/schist_fakes/src/drip.rs
@@ -0,0 +1,15 @@
+use schist_models::{
+    date_utc::DateUtc,
+    drip::{Drip, DripBuilder},
+};
+use schist_traits::nowlike::Nowlike;
+
+pub fn make_fake_drip(id: i32) -> Drip {
+    make_fake_drip_builder(id).build().unwrap()
+}
+
+pub fn make_fake_drip_builder(id: i32) -> DripBuilder {
+    let mut builder = DripBuilder::default();
+    builder.id(id).amount(0).bucket_id(0).date(DateUtc::now());
+    builder
+}
diff --git a/schist_core/schist_fakes/src/lib.rs b/schist_core/schist_fakes/src/lib.rs
index ba88fb5..0e4cbb4 100644
--- a/schist_core/schist_fakes/src/lib.rs
+++ b/schist_core/schist_fakes/src/lib.rs
@@ -1,7 +1,7 @@
 pub mod account;
 pub mod account_transfer;
 pub mod bucket;
-pub mod budget_drip;
 pub mod bucket_transfer;
+pub mod drip;
+pub mod pipe;
 pub mod transaction;
-pub mod transaction_categorisation;
diff --git a/schist_core/schist_fakes/src/pipe.rs b/schist_core/schist_fakes/src/pipe.rs
new file mode 100644
index 0000000..6e96401
--- /dev/null
+++ b/schist_core/schist_fakes/src/pipe.rs
@@ -0,0 +1,21 @@
+use schist_models::{
+    budget_period_unit::BudgetPeriodUnit,
+    date_utc::DateUtc,
+    pipe::{Pipe, PipeBuilder},
+};
+use schist_traits::nowlike::Nowlike;
+
+pub fn make_fake_pipe(id: i32) -> Pipe {
+    make_fake_pipe_builder(id).build().unwrap()
+}
+
+pub fn make_fake_pipe_builder(id: i32) -> PipeBuilder {
+    let mut builder = PipeBuilder::default();
+    builder
+        .id(id)
+        .amount(0)
+        .bucket_id(0)
+        .period(BudgetPeriodUnit::Day)
+        .start_date(DateUtc::now());
+    builder
+}
diff --git a/schist_core/schist_fakes/src/transaction.rs b/schist_core/schist_fakes/src/transaction.rs
index cee7e00..bce02e5 100644
--- a/schist_core/schist_fakes/src/transaction.rs
+++ b/schist_core/schist_fakes/src/transaction.rs
@@ -1,18 +1,23 @@
-use schist_models::{date_utc::DateUtc, transaction::{Transaction, TransactionBuilder}};
+use schist_models::{
+    date_utc::DateUtc,
+    transaction::{Transaction, TransactionBuilder},
+};
 use schist_traits::nowlike::Nowlike;
 
 pub fn make_fake_transaction(id: i32) -> Transaction {
     make_fake_transaction_builder(id).build().unwrap()
 }
 
-pub fn make_fake_transaction_builder(id: i32) ->  TransactionBuilder {
+pub fn make_fake_transaction_builder(id: i32) -> TransactionBuilder {
     let mut builder = TransactionBuilder::default();
     builder
         .id(id)
-        .description(String::from("Fake bucket transfer"))
-        .payee(String::from("Fake payee"))
-        .quantity(0)
+        .account_id(0)
+        .amount(0)
+        .bucket_id(None)
+        .counterparty(String::from("Fake payee"))
         .date(DateUtc::now())
+        .description(String::from("Fake transaction"))
         .account_id(0);
     builder
 }
diff --git a/schist_core/schist_fakes/src/transaction_categorisation.rs b/schist_core/schist_fakes/src/transaction_categorisation.rs
deleted file mode 100644
index 11b50c2..0000000
--- a/schist_core/schist_fakes/src/transaction_categorisation.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use schist_models::transaction_categorisation::{TransactionCategorisation, TransactionCategorisationBuilder};
-
-pub fn make_fake_transaction_categorisation(id: i32) -> TransactionCategorisation {
-    make_fake_transaction_categorisation_builder(id).build().unwrap()
-}
-
-pub fn make_fake_transaction_categorisation_builder(id: i32) ->  TransactionCategorisationBuilder {
-    let mut builder = TransactionCategorisationBuilder::default();
-    builder
-        .id(id)
-        .description(String::from("Fake bucket transfer"))
-        .quantity(0)
-        .transaction_id(0)
-        .bucket_id(0);
-    builder
-}