chore(release): compile latest source & release notes

CodeTanzania · Mar 25, 2021 · 3f8e339 · 3f8e339
1 parent 0ab04ec
commit 3f8e339
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+#### 0.5.1 (2021-03-25)
+
+##### Bug Fixes
+
+*  re-structure account response ([0ab04ec6](https://github.com/CodeTanzania/majifix-int-dawasco/commit/0ab04ec639e94055a7813c623f79db093bdef020))
+
 #### 0.5.0 (2021-03-24)
 
 ##### Chores

diff --git a/es/index.js b/es/index.js
@@ -640,12 +640,11 @@ const getAccount = (optns) => {
       // spread api rsults
       spread((account = {}, bills = []) => {
         // prepare normalized account
-        const myAccount = {
+        let myAccount = {
           account: {},
           customer: {},
           bills: [],
           accessors: [],
-          fetchedAt: new Date(),
         };
 
         // merge account results
@@ -671,6 +670,19 @@ const getAccount = (optns) => {
         myBills = orderBy([].concat(myBills), 'period.billedAt', 'desc');
         myAccount.bills = myBills;
 
+        // re-shape results
+        myAccount = mergeObjects(
+          {},
+          myAccount.account,
+          {
+            accessors: myAccount.accessors,
+            bills: myAccount.bills,
+          },
+          {
+            fetchedAt: new Date(),
+          }
+        );
+
         // return normalized account
         return myAccount;
       })

diff --git a/lib/index.js b/lib/index.js
@@ -642,12 +642,11 @@ const getAccount = (optns) => {
       // spread api rsults
       httpClient.spread((account = {}, bills = []) => {
         // prepare normalized account
-        const myAccount = {
+        let myAccount = {
           account: {},
           customer: {},
           bills: [],
           accessors: [],
-          fetchedAt: new Date(),
         };
 
         // merge account results
@@ -673,6 +672,19 @@ const getAccount = (optns) => {
         myBills = lodash.orderBy([].concat(myBills), 'period.billedAt', 'desc');
         myAccount.bills = myBills;
 
+        // re-shape results
+        myAccount = common.mergeObjects(
+          {},
+          myAccount.account,
+          {
+            accessors: myAccount.accessors,
+            bills: myAccount.bills,
+          },
+          {
+            fetchedAt: new Date(),
+          }
+        );
+
         // return normalized account
         return myAccount;
       })

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codetanzania/majifix-int-dawasco",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "DAWASCO - MajiFix Integration helpers",
   "main": "lib/index.js",
   "module": "es/index.js",