feat(typing): review hour conversion work ✨

weareopensource · Mar 23, 2020 · 03473c8 · 03473c8
1 parent c601325
commit 03473c8
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/lib/helpers/typing/dates.js b/lib/helpers/typing/dates.js
@@ -35,7 +35,17 @@ exports.DATE_NEXT_DAY = (data) => {
    */
 exports.HOUR = (data, params, object) => {
   let date;
-  if (params && params.length > 0) date = moment(_.get(object, params[0])).set('hour', Number(data)).format();
-  date = moment(data).format();
+  // check time
+  let time = {};
+  if (params && params.length === 1) {
+    if (data.indexOf('h') > -1) time = { hour: data.split('h')[0], minute: data.split('h')[1] || 0, second: 0 };
+    if (data.indexOf('H') > -1) time = { hour: data.split('H')[0], minute: data.split('H')[1] || 0, second: 0 };
+    if (data.indexOf(':') > -1) time = { hour: data.split(':')[0], minute: data.split(':')[1] || 0, second: data.split(':')[2] || 0 };
+    date = moment(_.get(object, params[0]))
+      .set('hour', Number(time.hour))
+      .set('minute', Number(time.minute))
+      .set('second', Number(time.second))
+      .format();
+  } else date = moment(data).format();
   return date;
 };