@becollective/utils 1.5.2 → 1.5.5

package/bundle.js

@@ -38,7 +38,7 @@ var password = {
   }
 };
 
-var moment = require('moment');
+var moment = require('moment-timezone');
 /**
  * Get current age based on the given birth date
  * @param {string} dateOfBirth
@@ -87,6 +87,16 @@ var datesByThemselves = function datesByThemselves(a, b) {
   if (!a.from) return 1;
   return moment(a.from) - moment(b.from);
 };
+var getShiftText = function getShiftText(from, to, timezone) {
+  try {
+    if (!from || !to || !timezone) return '';
+    var startToTimezone = moment(from).tz(timezone);
+    var endToTimezone = moment(to).tz(timezone);
+    return "".concat(moment(startToTimezone).format('dddd, DD MMMM YYYY, h:mma'), "-").concat(moment(endToTimezone).format('h:mma'));
+  } catch (e) {
+    return '';
+  }
+};
 
 var _require = require('@becollective/constants'),
     currencies = _require.currencies; // We should probably throw and error on bad input instead of falling back to a default.
@@ -148,8 +158,8 @@ var _TYPE_MAP;
 var _require$1 = require('@becollective/constants'),
     opportunities = _require$1.opportunities;
 
-var opportunityTypes = opportunities.typesMap;
-var TYPE_MAP = (_TYPE_MAP = {}, _defineProperty(_TYPE_MAP, opportunityTypes.roleFlexible, 'One-Off Task'), _defineProperty(_TYPE_MAP, opportunityTypes.roleFixed, 'Shift(s)'), _defineProperty(_TYPE_MAP, opportunityTypes.ongoing, 'Ongoing'), _TYPE_MAP);
+var opportunityTypes = opportunities.typesMapV2;
+var TYPE_MAP = (_TYPE_MAP = {}, _defineProperty(_TYPE_MAP, opportunityTypes.shift, 'Shifts'), _defineProperty(_TYPE_MAP, opportunityTypes.flexible, 'Flexible'), _TYPE_MAP);
 var readableOpportunityType = function readableOpportunityType(type) {
   return TYPE_MAP[type] || null;
 };
@@ -199,6 +209,7 @@ var util = {
   },
   readableOpportunityType: readableOpportunityType,
   getTimeInfo: getTimeInfo,
-  getHomeLocalityFromLocationList: getHomeLocalityFromLocationList
+  getHomeLocalityFromLocationList: getHomeLocalityFromLocationList,
+  getShiftText: getShiftText
 };
 module.exports = util;

package/index.js

@@ -1,5 +1,5 @@
 import { password } from './src/password';
-import { isUnderSixteen, getAge, datesByThemselves } from './src/date-time';
+import { isUnderSixteen, getAge, datesByThemselves, getShiftText } from './src/date-time';
 import { getCurrencyFromCurrencyCode, makeMoneyString } from './src/money';
 import { readableOpportunityType } from './src/opportunity';
 import { getTimeInfo } from './src/opportunityUser';
@@ -17,6 +17,7 @@ const util = {
   readableOpportunityType,
   getTimeInfo,
   getHomeLocalityFromLocationList,
+  getShiftText,
 };
 
 module.exports = util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becollective/utils",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "description": "Common utilities",
   "main": "bundle.js",
   "scripts": {
@@ -19,9 +19,10 @@
     "rollup-plugin-node-resolve": "^3.4.0"
   },
   "dependencies": {
-    "@becollective/constants": "^3.6.3",
+    "@becollective/constants": "^3.11.0",
     "lodash": "^4.17.15",
-    "moment": "^2.24.0"
+    "moment": "^2.24.0",
+    "moment-timezone": "^0.5.26"
   },
   "jest": {
     "testMatch": [

package/src/date-time.js

@@ -1,4 +1,4 @@
-const moment = require('moment');
+const moment = require('moment-timezone');
 
 /**
  * Get current age based on the given birth date
@@ -42,3 +42,14 @@ export const datesByThemselves = (a, b) => {
   if (!a.from) return 1;
   return moment(a.from) - moment(b.from);
 };
+
+export const getShiftText = (from, to, timezone) => {
+  try {
+    if (!from || !to || !timezone) return '';
+    const startToTimezone = moment(from).tz(timezone);
+    const endToTimezone = moment(to).tz(timezone);
+    return `${moment(startToTimezone).format('dddd, DD MMMM YYYY, h:mma')}-${moment(endToTimezone).format('h:mma')}`;
+  } catch (e) {
+    return '';
+  }
+};

package/src/date-time.test.js

@@ -1,4 +1,4 @@
-const { isUnderSixteen, getAge } = require('../bundle.js');
+const { isUnderSixteen, getAge, getShiftText } = require('../bundle.js');
 const moment = require('moment');
 
 describe('getAge', () => {
@@ -54,3 +54,19 @@ describe('isUnderSixteen', () => {
     expect(isUnderSixteen('not-valid')).toBe(false);
   });
 });
+
+describe('getShiftText', () => {
+  const from = new Date(Date.UTC(2020, 6, 30, 0, 0, 0));
+  const to = new Date(Date.UTC(2020, 6, 30, 5, 30, 0));
+  const melbourne = 'Australia/Melbourne';
+  const auckland = 'Pacific/Auckland';
+  test('get shift text with melbourne timezone', () => {
+    expect(getShiftText(from, to,melbourne)).toBe("Thursday, 30 July 2020, 10:00am-3:30pm");
+  });
+  test('get shift text with auckland timezone', () => {
+    expect(getShiftText(from, to,auckland)).toBe("Thursday, 30 July 2020, 12:00pm-5:30pm");
+  });
+  test('with empty data', () => {
+    expect(getShiftText()).toBe('');
+  });
+});

package/src/opportunity.js

@@ -1,10 +1,9 @@
 const { opportunities } = require('@becollective/constants');
-const { typesMap: opportunityTypes } = opportunities;
+const { typesMapV2: opportunityTypes } = opportunities;
 
 const TYPE_MAP = {
-  [opportunityTypes.roleFlexible]: 'One-Off Task',
-  [opportunityTypes.roleFixed]: 'Shift(s)',
-  [opportunityTypes.ongoing]: 'Ongoing',
+  [opportunityTypes.shift]: 'Shifts',
+  [opportunityTypes.flexible]: 'Flexible',
 };
 
 export const readableOpportunityType = type => TYPE_MAP[type] || null;