@rebilly/instruments 2.1.0-beta.0 → 2.1.1-beta.0

package/dist/functions/mount/fetch-data.js

@@ -105,69 +105,79 @@ exports.DataInstance = DataInstance;
 async function fetchData({
   state = null,
   riskMetadata = null,
-  summaryPayload = null
+  summaryPayload = null,
+  // Dependancy injectable functions
+  fetchInvoice = _invoices.fetchInvoice,
+  fetchTransaction = _transactions.fetchTransaction
 }) {
-  var _state$options2, _state$options3, _state$data, _state$data$transacti, _state$data2;
+  try {
+    var _state$options2, _state$options3, _state$data, _state$data$transacti, _state$data3;
+
+    let transaction = null;
+
+    if ((_state$options2 = state.options) !== null && _state$options2 !== void 0 && _state$options2.transactionId) {
+      transaction = await fetchTransaction({
+        data: {
+          id: state.options.transactionId
+        },
+        state
+      });
+      state.data.transaction = transaction;
+    }
 
-  let transaction = null;
+    let invoice = null;
 
-  if ((_state$options2 = state.options) !== null && _state$options2 !== void 0 && _state$options2.transactionId) {
-    transaction = await (0, _transactions.fetchTransaction)({
-      data: {
-        id: state.options.transactionId
-      },
-      state
-    });
-    state.data.transaction = transaction;
-  }
+    if ((_state$options3 = state.options) !== null && _state$options3 !== void 0 && _state$options3.invoiceId || (_state$data = state.data) !== null && _state$data !== void 0 && (_state$data$transacti = _state$data.transaction) !== null && _state$data$transacti !== void 0 && _state$data$transacti.hasInvoice) {
+      var _state$options4, _state$data2, _state$data2$transact;
 
-  let invoice = null;
+      invoice = await fetchInvoice({
+        data: {
+          id: ((_state$options4 = state.options) === null || _state$options4 === void 0 ? void 0 : _state$options4.invoiceId) || ((_state$data2 = state.data) === null || _state$data2 === void 0 ? void 0 : (_state$data2$transact = _state$data2.transaction) === null || _state$data2$transact === void 0 ? void 0 : _state$data2$transact.invoiceId)
+        },
+        state
+      });
+      state.data.invoice = invoice;
+    }
+
+    if (!riskMetadata) {
+      const {
+        riskMetadata: data
+      } = await (0, _riskDataCollector.collectData)();
+      riskMetadata = data;
+    }
 
-  if ((_state$options3 = state.options) !== null && _state$options3 !== void 0 && _state$options3.invoiceId || (_state$data = state.data) !== null && _state$data !== void 0 && (_state$data$transacti = _state$data.transaction) !== null && _state$data$transacti !== void 0 && _state$data$transacti.hasInvoice) {
-    invoice = await (0, _invoices.fetchInvoice)({
-      data: {
-        id: state.options.invoiceId
-      },
+    state.data = new DataInstance({
+      state,
+      invoice,
+      transaction,
+      riskMetadata
+    });
+    const [readyToPay, previewPurchase] = await Promise.all([((_state$data3 = state.data) === null || _state$data3 === void 0 ? void 0 : _state$data3.readyToPay) || (0, _readyToPay.fetchReadyToPay)({
+      riskMetadata,
+      state
+    }), state.options.items ? (0, _summary.fetchSummary)({
+      data: summaryPayload,
+      state
+    }) : null]);
+    const plans = await (0, _plans.fetchPlans)({
       state
     });
-    state.data.invoice = invoice;
-  }
-
-  if (!riskMetadata) {
-    const {
-      riskMetadata: data
-    } = await (0, _riskDataCollector.collectData)();
-    riskMetadata = data;
+    state.data.plans = plans;
+    const products = await (0, _products.fetchProducts)({
+      state
+    });
+    return new DataInstance({
+      state,
+      readyToPay,
+      previewPurchase,
+      plans,
+      products,
+      invoice,
+      transaction,
+      riskMetadata
+    });
+  } catch (error) {// console.log(error);
   }
 
-  state.data = new DataInstance({
-    state,
-    invoice,
-    transaction,
-    riskMetadata
-  });
-  const [readyToPay, previewPurchase] = await Promise.all([((_state$data2 = state.data) === null || _state$data2 === void 0 ? void 0 : _state$data2.readyToPay) || (0, _readyToPay.fetchReadyToPay)({
-    riskMetadata,
-    state
-  }), state.options.items ? (0, _summary.fetchSummary)({
-    data: summaryPayload,
-    state
-  }) : null]);
-  const plans = await (0, _plans.fetchPlans)({
-    state
-  });
-  state.data.plans = plans;
-  const products = await (0, _products.fetchProducts)({
-    state
-  });
-  return new DataInstance({
-    state,
-    readyToPay,
-    previewPurchase,
-    plans,
-    products,
-    invoice,
-    transaction,
-    riskMetadata
-  });
+  return new DataInstance({});
 }

package/dist/functions/mount/fetch-data.spec.js

@@ -2,43 +2,67 @@
 
 var _fetchData = require("./fetch-data");
 
-describe.skip('Fetch Summary Data function helper', () => {
-  class TestInstance {
-    constructor() {
-      this.storefront = jest.fn();
-      this.options = jest.fn();
-      this._fetchSummary = jest.fn(() => {
-        return new Promise(resolve => resolve({}));
-      });
-      this._fetchProducts = jest.fn();
-    }
+var _transactionModel = _interopRequireDefault(require("../../storefront/models/transaction-model"));
 
-  }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  it('should fetch all the data', async () => {
-    const instance = new TestInstance();
-    await (0, _fetchData.fetchData)({
-      riskMetadata: {},
-      state: instance
-    });
-    expect(fetchReadyToPay).toBeCalledTimes(1);
-    expect(instance._fetchSummary).toBeCalledTimes(1);
-    expect(instance._fetchPlans).toBeCalledTimes(1);
-    expect(instance._fetchProducts).toBeCalledTimes(1);
+describe('fetchData function', () => {
+  it('Should use correct invoice id for invoiceId', async () => {
+    const mockFetchInvoice = jest.fn();
+    const invoiceId = 'test-invoice-id';
+    const invoiceState = {
+      options: {
+        invoiceId
+      }
+    };
+    (0, _fetchData.fetchData)({
+      state: invoiceState,
+      fetchInvoice: mockFetchInvoice
+    });
+    expect(mockFetchInvoice).toBeCalledTimes(1);
+    expect(mockFetchInvoice).toBeCalledWith(expect.objectContaining({
+      data: {
+        id: invoiceId
+      }
+    }));
+  });
+  it('Should use correct invoice id for transaction with invoiceIds', async () => {
+    const mockFetchInvoice = jest.fn();
+    const invoiceId = 'test-invoice-id';
+    const invoiceState = {
+      options: {},
+      data: {
+        transaction: new _transactionModel.default({
+          invoiceIds: [invoiceId]
+        })
+      }
+    };
+    (0, _fetchData.fetchData)({
+      state: invoiceState,
+      fetchInvoice: mockFetchInvoice
+    });
+    expect(mockFetchInvoice).toBeCalledTimes(1);
+    expect(mockFetchInvoice).toBeCalledWith(expect.objectContaining({
+      data: {
+        id: invoiceId
+      }
+    }));
   });
-  it('should pass riskMetadata to ready to pay', async () => {
-    const testRiskMetadata = {};
-    const instance = new TestInstance();
-    await (0, _fetchData.fetchData)({
-      riskMetadata: testRiskMetadata,
-      state: instance
-    });
-    expect(instance._fetchReadyToPay).toBeCalledWith(testRiskMetadata);
-    expect(async () => {
-      await (0, _fetchData.fetchData)({
-        state: instance
-      });
-    }).rejects.toEqual(new Error('riskMetadata is required for FetchSummaryData'));
+  it('Should not fetch invoice for transaction with no invoice Ids', async () => {
+    const mockFetchInvoice = jest.fn();
+    const invoiceState = {
+      options: {},
+      data: {
+        transaction: new _transactionModel.default({
+          invoiceIds: []
+        })
+      }
+    };
+    (0, _fetchData.fetchData)({
+      state: invoiceState,
+      fetchInvoice: mockFetchInvoice
+    });
+    expect(mockFetchInvoice).toBeCalledTimes(0);
   });
 });
 describe('DataInstance', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebilly/instruments",
-  "version": "2.1.0-beta.0",
+  "version": "2.1.1-beta.0",
   "author": "Rebilly",
   "main": "dist/index.js",
   "license": "MIT",

package/src/functions/mount/fetch-data.js

@@ -3,8 +3,8 @@ import { fetchPlans } from '../../storefront/plans';
 import { fetchProducts } from '../../storefront/products';
 import { fetchReadyToPay } from '../../storefront/ready-to-pay';
 import { fetchSummary } from '../../storefront/summary';
-import { fetchInvoice } from '../../storefront/invoices';
-import { fetchTransaction } from '../../storefront/transactions';
+import { fetchInvoice as FetchInvoice } from '../../storefront/invoices';
+import { fetchTransaction as FetchTransaction } from '../../storefront/transactions';
 
 export class DataInstance {
   constructor({
@@ -86,53 +86,63 @@ export class DataInstance {
 export async function fetchData({
   state = null,
   riskMetadata = null,
-  summaryPayload = null
+  summaryPayload = null,
+
+  // Dependancy injectable functions
+  fetchInvoice = FetchInvoice,
+  fetchTransaction = FetchTransaction
 }) {
-  let transaction = null;
-  if (state.options?.transactionId) {
-    transaction = await fetchTransaction({data: {
-      id: state.options.transactionId
-    }, state});
-    state.data.transaction = transaction;
-  }
+  try {
+    let transaction = null;
+    if (state.options?.transactionId) {
+      transaction = await fetchTransaction({data: {
+        id: state.options.transactionId
+      }, state});
+      state.data.transaction = transaction;
+    }
 
-  let invoice = null;
-  if (state.options?.invoiceId || state.data?.transaction?.hasInvoice) {
-    invoice = await fetchInvoice({data: {
-      id: state.options.invoiceId
-    }, state});
-    state.data.invoice = invoice;
-  }
+    let invoice = null;
+    if (state.options?.invoiceId || state.data?.transaction?.hasInvoice) {
+      invoice = await fetchInvoice({data: {
+        id: state.options?.invoiceId || state.data?.transaction?.invoiceId
+      }, state});
+      state.data.invoice = invoice;
+    }
 
-  if (!riskMetadata) {
-    const { riskMetadata: data } = await collectData();
-    riskMetadata = data;
+    if (!riskMetadata) {
+      const { riskMetadata: data } = await collectData();
+      riskMetadata = data;
+    }
+
+    state.data = new DataInstance({
+      state,
+      invoice,
+      transaction,
+      riskMetadata
+    });
+
+    const [readyToPay, previewPurchase] = await Promise.all([
+      state.data?.readyToPay || fetchReadyToPay({ riskMetadata, state }),
+      state.options.items ? fetchSummary({ data: summaryPayload, state }) : null
+    ]);
+
+    const plans = await fetchPlans({ state });
+    state.data.plans = plans;
+    const products = await fetchProducts({ state });
+
+    return new DataInstance({
+      state,
+      readyToPay,
+      previewPurchase,
+      plans,
+      products,
+      invoice,
+      transaction,
+      riskMetadata
+    });
+  } catch(error) {
+    // console.log(error);
   }
 
-  state.data = new DataInstance({
-    state,
-    invoice,
-    transaction,
-    riskMetadata
-  });
-
-  const [readyToPay, previewPurchase] = await Promise.all([
-    state.data?.readyToPay || fetchReadyToPay({ riskMetadata, state }),
-    state.options.items ? fetchSummary({ data: summaryPayload, state }) : null
-  ]);
-
-  const plans = await fetchPlans({ state });
-  state.data.plans = plans;
-  const products = await fetchProducts({ state });
-
-  return new DataInstance({
-    state,
-    readyToPay,
-    previewPurchase,
-    plans,
-    products,
-    invoice,
-    transaction,
-    riskMetadata
-  });
+  return new DataInstance({});
 }

package/src/functions/mount/fetch-data.spec.js

@@ -1,46 +1,80 @@
 import { fetchData, DataInstance } from './fetch-data';
-
-describe.skip('Fetch Summary Data function helper', () => {
-  class TestInstance {
-    constructor() {
-      this.storefront = jest.fn();
-      this.options = jest.fn();
-
-      this._fetchSummary = jest.fn(() => {
-        return new Promise((resolve) => resolve({}));
-      });
-
-      this._fetchProducts = jest.fn();
+import TransactionModel from '../../storefront/models/transaction-model';
+
+describe('fetchData function', () => {
+  it('Should use correct invoice id for invoiceId', async () => {
+    const mockFetchInvoice = jest.fn();
+    const invoiceId = 'test-invoice-id';
+    const invoiceState = {
+      options: {
+        invoiceId
+      }
     }
-  }
-
-  it('should fetch all the data', async () => {
-    const instance = new TestInstance();
-    await fetchData({ riskMetadata: {}, state: instance });
-    expect(fetchReadyToPay).toBeCalledTimes(1);
-    expect(instance._fetchSummary).toBeCalledTimes(1);
-    expect(instance._fetchPlans).toBeCalledTimes(1);
-    expect(instance._fetchProducts).toBeCalledTimes(1);
+
+    fetchData({
+      state: invoiceState,
+      fetchInvoice: mockFetchInvoice
+    });
+    
+    expect(mockFetchInvoice).toBeCalledTimes(1);
+    expect(mockFetchInvoice).toBeCalledWith(
+      expect.objectContaining({
+        data:{
+          id: invoiceId
+        }
+      })
+    );
   });
 
-  it('should pass riskMetadata to ready to pay', async () => {
-    const testRiskMetadata = {};
-    const instance = new TestInstance();
+  it('Should use correct invoice id for transaction with invoiceIds', async () => {
+    const mockFetchInvoice = jest.fn();
+    const invoiceId = 'test-invoice-id';
+    const invoiceState = {
+      options: {},
+      data: {
+        transaction: new TransactionModel({
+          invoiceIds: [invoiceId]
+        }),
+      }
+    }
 
-    await fetchData({ riskMetadata: testRiskMetadata, state: instance });
+    fetchData({
+      state: invoiceState,
+      fetchInvoice: mockFetchInvoice
+    });
+    
+    expect(mockFetchInvoice).toBeCalledTimes(1);
+    expect(mockFetchInvoice).toBeCalledWith(
+      expect.objectContaining({
+        data:{
+          id: invoiceId
+        }
+      })
+    );
+  });
 
-    expect(instance._fetchReadyToPay).toBeCalledWith(testRiskMetadata);
+  it('Should not fetch invoice for transaction with no invoice Ids', async () => {
+    const mockFetchInvoice = jest.fn();
+    const invoiceState = {
+      options: {},
+      data: {
+        transaction: new TransactionModel({
+          invoiceIds: []
+        }),
+      }
+    }
 
-    expect(async () => {
-      await fetchData({ state: instance });
-    }).rejects.toEqual(
-      new Error('riskMetadata is required for FetchSummaryData')
-    );
+    fetchData({
+      state: invoiceState,
+      fetchInvoice: mockFetchInvoice
+    });
+    
+    expect(mockFetchInvoice).toBeCalledTimes(0);
+ 
   });
 });
 
 describe('DataInstance', () => {
-
   it ('Should correctly determine amountAndCurrency', () => {
     const expectedAmountAndCurrency = {
       amount: 10,
@@ -199,6 +233,6 @@ describe('DataInstance', () => {
       }
     });
     expect(fetchedData.summaryLineItems).toEqual(expectedSummaryLineItems);
-  })
+  });
 });