Merge tag 'v0.6.1' into develop

chore(release): bump to v0.6.1

CHANGELOG.md

@@ -1,3 +1,15 @@
+#### 0.6.1 (2020-05-18)
+
+##### Chores
+
+* **deps:**
+  *  force latest version & audit fix ([9bcfd93f](https://github.com/codetanzania/ewea-reports/commit/9bcfd93f58bfd354724ddafd1f5208a70b2abb7b))
+  *  force latest version & audit fix ([83b70c55](https://github.com/codetanzania/ewea-reports/commit/83b70c554dc89e9630bfc06ba1d850f2afacd0a9))
+
+##### Refactors
+
+* **dispatch-aggregations:**  parse ms to object of days, hours etc ([d72a7bba](https://github.com/codetanzania/ewea-reports/commit/d72a7bba189deb9fd71cd3f722d1779a4c431ec1))
+
 #### 0.6.0 (2020-05-17)
 
 ##### Chores

es/index.js

@@ -1,11 +1,11 @@
 import { PREDEFINE_NAMESPACE_ADMINISTRATIVELEVEL, PREDEFINE_NAMESPACE_ADMINISTRATIVEAREA, PREDEFINE_NAMESPACE_PARTYGROUP, PREDEFINE_NAMESPACE_PARTYROLE, PREDEFINE_NAMESPACE_EVENTGROUP, PREDEFINE_NAMESPACE_EVENTTYPE, PREDEFINE_NAMESPACE_EVENTLEVEL, PREDEFINE_NAMESPACE_EVENTSEVERITY, PREDEFINE_NAMESPACE_EVENTCERTAINTY, PREDEFINE_NAMESPACE_EVENTSTATUS, PREDEFINE_NAMESPACE_EVENTURGENCY, PREDEFINE_NAMESPACE_EVENTRESPONSE } from '@codetanzania/ewea-internals';
-import { safeMergeObjects, pkg } from '@lykmapipo/common';
+import { safeMergeObjects, parseMs, pkg } from '@lykmapipo/common';
 import { getString, apiVersion as apiVersion$1 } from '@lykmapipo/env';
 import { connect } from '@lykmapipo/mongoose-common';
 import { mount } from '@lykmapipo/express-common';
 import { Router, start as start$1 } from '@lykmapipo/express-rest-actions';
 import { createModels } from '@lykmapipo/file';
-import { isFunction } from 'lodash';
+import { isFunction, mapValues, endsWith } from 'lodash';
 import { waterfall, parallel } from 'async';
 import { Party } from '@codetanzania/emis-stakeholder';
 import { DEFAULT_PREDEFINE_RELATION } from '@codetanzania/ewea-common';
@@ -1425,7 +1425,8 @@ const getEventAnalysis = (criteria, done) => {
   return waterfall(tasks, cb);
 };
 
-// TODO: parse time to human
+// TODO: extract utils
+// TODO: limit exports
 
 // start: constants
 // order: base to specific
@@ -1438,6 +1439,28 @@ const DEFAULT_RELATION_TYPE$1 = safeMergeObjects(DEFAULT_PREDEFINE_RELATION, {
   namespace: PREDEFINE_NAMESPACE_EVENTTYPE,
 });
 
+// start: helpers & utils
+// order: base to specific
+
+const normalizeOverview = (overview) => {
+  // ensure report
+  let report = safeMergeObjects(...overview);
+
+  // normalize time(wait, dispatch, cancel & resolve)
+  report = mapValues(report, (value, key) => {
+    const isTimeField = endsWith(key, 'Time');
+    if (isTimeField) {
+      const milliseconds = value || 0;
+      const parsedTime = parseMs(milliseconds);
+      return parsedTime;
+    }
+    return value;
+  });
+
+  // return normalized overview
+  return report;
+};
+
 // start: extra metric fields
 // order: base to specific
 
@@ -1766,7 +1789,7 @@ const getDispatchOverview = (criteria, done) => {
     const { overview } = safeMergeObjects(...result);
 
     // normalize result
-    const data = safeMergeObjects(...overview);
+    const data = normalizeOverview(overview);
 
     // return normalize result
     return next(null, data);
@@ -1823,7 +1846,7 @@ const getDispatchAnalysis = (criteria, done) => {
 
     // normalize result
     const data = safeMergeObjects({
-      overview: safeMergeObjects(...overview),
+      overview: normalizeOverview(overview),
       overall: { groups, types },
     });
 

lib/index.js

@@ -1427,7 +1427,8 @@ const getEventAnalysis = (criteria, done) => {
   return async.waterfall(tasks, cb);
 };
 
-// TODO: parse time to human
+// TODO: extract utils
+// TODO: limit exports
 
 // start: constants
 // order: base to specific
@@ -1440,6 +1441,28 @@ const DEFAULT_RELATION_TYPE$1 = common.safeMergeObjects(eweaCommon.DEFAULT_PREDE
   namespace: eweaInternals.PREDEFINE_NAMESPACE_EVENTTYPE,
 });
 
+// start: helpers & utils
+// order: base to specific
+
+const normalizeOverview = (overview) => {
+  // ensure report
+  let report = common.safeMergeObjects(...overview);
+
+  // normalize time(wait, dispatch, cancel & resolve)
+  report = lodash.mapValues(report, (value, key) => {
+    const isTimeField = lodash.endsWith(key, 'Time');
+    if (isTimeField) {
+      const milliseconds = value || 0;
+      const parsedTime = common.parseMs(milliseconds);
+      return parsedTime;
+    }
+    return value;
+  });
+
+  // return normalized overview
+  return report;
+};
+
 // start: extra metric fields
 // order: base to specific
 
@@ -1768,7 +1791,7 @@ const getDispatchOverview = (criteria, done) => {
     const { overview } = common.safeMergeObjects(...result);
 
     // normalize result
-    const data = common.safeMergeObjects(...overview);
+    const data = normalizeOverview(overview);
 
     // return normalize result
     return next(null, data);
@@ -1825,7 +1848,7 @@ const getDispatchAnalysis = (criteria, done) => {
 
     // normalize result
     const data = common.safeMergeObjects({
-      overview: common.safeMergeObjects(...overview),
+      overview: normalizeOverview(overview),
       overall: { groups, types },
     });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codetanzania/ewea-reports",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Common reports for EWEA",
   "main": "lib/index.js",
   "module": "es/index.js",