Merge branch 'master' of https://github.com/RxJSInAction/banking-in-action

Author: paulpdaniels

app/scripts/actions.js

@@ -9,16 +9,15 @@
  * Balances
  */
 const SET_BALANCES = 'SET_BALANCES';
-const SET_TRANSACTION_FIELD = 'SET_TRANSACTION_FIELD';
 
 const setBalances = (balances) =>
   ({type: SET_BALANCES, balances});
 
 const balanceActions = {
   withdraw: () => ({type: 'TRANSACTION_START', value: 'WITHDRAW'}),
   deposit: () => ({type: 'TRANSACTION_START', value: 'DEPOSIT'}),
-  amount: (value) => ({type: 'SET_TRANSACTION_FIELD', value, field: 'amount'}),
-  account: (value) => ({type: 'SET_TRANSACTION_FIELD', value, field: 'account'})
+  amount: (value) => ({type: 'AMOUNT_CHANGED', value, field: 'amount'}),
+  account: (value) => ({type: 'ACCOUNT_CHANGED', value, field: 'account'})
 };
 
 /**
@@ -63,5 +62,5 @@ const ADD_TRANSACTION = 'ADD_TRANSACTION';
 const addTransaction = (transaction) =>
   ({type: ADD_TRANSACTION, transaction});
 
-const newTransaction = (account, amount, factor) =>
-  ({account, amount, factor, type: NEW_TRANSACTION});
+const newTransaction = (type, account, amount, factor) =>
+  ({account, amount: factor * amount, type});

app/scripts/app.js

@@ -6,18 +6,6 @@
  */
 'use strict';
 (function() {
-// Start configuration step here
-// 1) Check logged in status
-// 2) Force log-in
-// 3) Use log-in token to get dashboard set-up information
-
-/* Action Items:
-*
-* 1) Data (stocks, accounts, transactions, routing?)
-* 2) Tool to build transaction history
-* 3) Tool to build stock history
-
-* */
 
   const {Observable} = Rx;
   const {createStore} = Redux;
@@ -35,14 +23,14 @@
   };
 
   const middlewareFactories = [
-    initializeEpic,
+    initializeEpic(accountsDB),
     searchEpic,
     messageEpic,
     userEpic,
     interestEpic,
     transactionEpic,
     transactionLogEpic,
-    loggingEpic
+    loggingEpic()
   ];
 
   // Builds the global store with reducers and an initial state

app/scripts/components/message.component.js

@@ -4,7 +4,7 @@
  *  @author Paul Daniels
  *  @author Luis Atencio
  */
-(function(global) {
+(function() {
 
   const Message = (props) => {
     const {Alert} = ReactBootstrap;

app/scripts/epics/interest.js

@@ -5,18 +5,18 @@
  *  @author Luis Atencio
  */
 
-const computeInterest =  p => 0.1 / 365 * p;
+const computeInterest =  p => 1 / 10 / 365 * p;
 
 // Processes interest payments
-function interestEpic(action$, store) {
-  return Rx.Observable.interval(15000)
-    .map(() => store.getState())
-    .pluck('accounts')
-    .map(
-      ({savings}) => ({
-        type: 'DEPOSIT',
-        account: 'savings',
-        amount: computeInterest(savings)
-      })
-    );
+function interestEpic(action$, store, scheduler) {
+    return Rx.Observable.interval(15 * 1000, scheduler)
+      .map(() => store.getState())
+      .pluck('accounts')
+      .map(
+        ({savings}) => ({
+          type: 'DEPOSIT',
+          account: 'savings',
+          amount: computeInterest(savings)
+        })
+      );
 }

app/scripts/epics/logging.js

@@ -4,10 +4,10 @@
  *  @author Paul Daniels
  *  @author Luis Atencio
  */
-const loggingEpic = (action$) => action$
+const loggingEpic = (console = window.console) => (action$) => action$
   .do(
     action => {
-      console.log(`Dispatch [${action.type}]`, action)
+      console.log(`Dispatching [${action.type}]`, action)
     },
     err => console.error(err)
   )

app/scripts/epics/transaction.js

@@ -55,19 +55,22 @@ function transactionLogEpic(action$, store) {
     );
 }
 
-const getAccounts = () => Rx.Observable.fromPromise(accountsDB.get('accounts'));
+const getAccounts = (db) => Rx.Observable.from(db.get('accounts'));
 
-function initializeEpic() {
-  return getAccounts()
-    .catch(err => {
-      const defaults = {_id: 'accounts', checking: 100, savings: 100};
-      return accountsDB.put(defaults)
-        .then(() => defaults);
-    })
-    .map(accounts => {
-      const {checking, savings} = accounts;
-      return setBalances({checking, savings});
-    });
+function initializeEpic(db) {
+  return function() {
+    return getAccounts(db)
+      // If there is an error getting the accounts just start with some money to play with
+      .catch(err => {
+        const defaults = {_id: 'accounts', checking: 100, savings: 100};
+        return Rx.Observable.from(db.put(defaults))
+          .mapTo(defaults);
+      })
+      .map(accounts => {
+        const {checking, savings} = accounts;
+        return setBalances({checking, savings});
+      });
+  }
 }
 
 class Transaction {

app/scripts/util/createMiddleware.js

@@ -9,10 +9,6 @@
 
 // A custom utility operator for only accepting messages
 // of a certain type
-  /**
-   * @param types {string[]}
-   * @returns {function(*): boolean}
-   */
   Rx.Observable.prototype.ofType = function (...types) {
     const len = types.length;
     return this.filter(({type}) => {

app/scripts/util/searchEngine.js

@@ -15,7 +15,7 @@ class SearchQuery extends Rx.Observable {
     const { query, options, _subject } = this;
 
     // Degenerate case, if there is no data then simply return immediately
-    if (query.length == 0)
+    if (query.length === 0)
       return Rx.Observable.of([]).subscribe(observer);
 
     //The options for the search

test/index.html

@@ -18,7 +18,12 @@
 <!-- Sources -->
 <script src="../app/scripts/util/createMiddleware.js"></script>
 <script src="../app/scripts/actions.js"></script>
-<script src="../app/scripts/epics.js"></script>
+<script src="../app/scripts/epics/user.js"></script>
+<script src="../app/scripts/epics/logging.js"></script>
+<script src="../app/scripts/epics/message.js"></script>
+<script src="../app/scripts/epics/search.js"></script>
+<script src="../app/scripts/epics/transaction.js"></script>
+<script src="../app/scripts/epics/interest.js"></script>
 
 <!-- Scripts -->
 <script src="test.balance.js"></script>

test/test.balance.js

@@ -6,9 +6,9 @@
  */
 const expect = chai.expect;
 
-// function assertDeepEqual(actual, expected) { //#A
-//   expect(actual).to.deep.equal(expected);
-// }
+function assertDeepEqual(actual, expected) { //#A
+  expect(actual).to.deep.equal(expected);
+}
 
 function stringify(x) {
   return JSON.stringify(x, function (key, value) {
@@ -62,7 +62,7 @@ function frames(n = 1, unit = '-') { //#A
   unit + frames(n - 1, unit);
 }
 
-
+// Example unit tests, to see, open the index.html file from the same directory in your web browser
 describe('Balances', () => {
 
   let scheduler;
@@ -79,26 +79,19 @@ describe('Balances', () => {
     it('should zero the balances on error', () => {
 
       const fakeDB = {
-        accounts: {
-          get: () => scheduler.createColdObservable('--#')
-        }
+          get: () => scheduler.createColdObservable('--#'),
+          put: () => scheduler.createColdObservable('-x')
       };
 
       const mappings = {
-        // The beginning balance
-        a: {checking: 10, savings: 20},
-        // Signal the update
-        b: refreshBalances(),
         // Expect the balance to be set
-        c: setBalances({checking: 0, savings: 0})
+        a: setBalances({checking: 100, savings: 100})
       };
 
-      const input$ = scheduler
-        .createHotObservable('---b', mappings);
-      const expected$ =      '--c--c';
+      const expected$ =      '---a';
 
       scheduler.expectObservable(
-        initializeEpic(fakeDB)(input$)
+        initializeEpic(fakeDB)(Rx.Observable.empty())
       ).toBe(expected$, mappings);
 
       scheduler.flush();
@@ -107,7 +100,7 @@ describe('Balances', () => {
 
   describe('#userEpic', () => {
 
-    it('should emit a new transaction', () => {
+    it('should emit a new withdraw transaction', () => {
 
       const actionMapping = {
         a: balanceActions.account('checking'),
@@ -116,7 +109,7 @@ describe('Balances', () => {
       };
 
       const expectMapping = {
-        d: newTransaction('checking', 10, -1)
+        d: newTransaction('WITHDRAW', 'checking', 10, -1)
       };
 
       const action$ = scheduler.createHotObservable('-a-b-c', actionMapping);
@@ -132,34 +125,87 @@ describe('Balances', () => {
       scheduler.flush();
     });
 
-    it('should use the latest balance', () => {
+    it('should emit a new deposit transaction', () => {
+      const actionMapping = {
+        a: balanceActions.account('savings'),
+        b: balanceActions.amount(10),
+        c: balanceActions.deposit()
+      };
+
+      const expectMapping = {
+        d: newTransaction('DEPOSIT', 'savings', 10, 1)
+      };
+
+      const action$ = scheduler.createHotObservable('-a-b-c', actionMapping);
+
+      scheduler.expectObservable(
+        userEpic(action$)
+      ).toBe(
+        '-----d',
+        expectMapping
+      );
 
+      scheduler.flush();
     });
   });
 
   describe('#interestEpic', () => {
     it('should accumulate interest', () => {
 
       const expectMapping = {
-        a: newTransaction('savings', (1), 1)
+        // Rounding error
+        a: newTransaction('DEPOSIT', 'savings', 1.0000000000000002, 1)
       };
 
-      const storeMapping = {
-        a: 365 * 10
+      const stubStore = {
+        getState() {
+          return {
+            accounts: {
+              savings: 365 * 10
+            }
+          };
+        }
       };
 
-      const balance$ = scheduler.createColdObservable('---a', storeMapping);
-      const trigger$ = scheduler.createHotObservable('---a');
-
       scheduler.expectObservable(
-        computeInterest(trigger$, balance$)
+        interestEpic(Rx.Observable.empty(), stubStore, scheduler)
       ).toBe(
-        '------a',
+        frames(15 * 100) + 'a',
         expectMapping
       );
+    });
+  });
+
+  describe('#loggingEpic', () => {
+    it('should log dispatch actions', () => {
+
+      const actionsMap = {
+        a: balanceActions.withdraw(),
+        b: balanceActions.account('savings'),
+        c: balanceActions.amount(10)
+      };
+
+      const messages = [];
+
+      const fakeConsole = {
+        log: (...args) => messages.push(args)
+      };
+
+      const action$ = scheduler.createHotObservable('-a-b-c', actionsMap);
+
+      scheduler.expectObservable(
+        loggingEpic(fakeConsole)(action$)
+      ).toBe('');
 
       scheduler.flush();
-    });
+
+      assertDeepEqual(messages, [
+        ['Dispatch [TRANSACTION_START]', actionsMap.a],
+        ['Dispatch [ACCOUNT_CHANGED]', actionsMap.b],
+        ['Dispatch [AMOUNT_CHANGED]', actionsMap.c]
+      ]);
+
+    })
   })
 
 });