🏗️🗃️ UnifiedDataLoader rewrite

www/__tests__/commHelper.test.ts

@@ -1,5 +1,5 @@
 import { mockLogger } from '../__mocks__/globalMocks';
-import { fetchUrlCached } from '../js/commHelper';
+import { fetchUrlCached } from '../js/services/commHelper';
 
 mockLogger();
 

www/__tests__/unifiedDataLoader.test.ts

@@ -0,0 +1,157 @@
+import { mockLogger } from '../__mocks__/globalMocks';
+import { combineWithDedup, combinedPromises } from '../js/services/unifiedDataLoader';
+import { ServerData } from '../js/types/serverData';
+
+mockLogger();
+
+const testOne: ServerData<any> = {
+  data: '',
+  metadata: {
+    key: '',
+    platform: '',
+    write_ts: 1, // the only value checked by combineWithDedup
+    time_zone: '',
+    write_fmt_time: '',
+    write_local_dt: null,
+  },
+};
+
+const testTwo = JSON.parse(JSON.stringify(testOne));
+testTwo.metadata.write_ts = 2;
+const testThree = JSON.parse(JSON.stringify(testOne));
+testThree.metadata.write_ts = 3;
+const testFour = JSON.parse(JSON.stringify(testOne));
+testFour.metadata.write_ts = 4;
+
+describe('combineWithDedup can', () => {
+  it('work with empty arrays', () => {
+    expect(combineWithDedup([], [])).toEqual([]);
+    expect(combineWithDedup([], [testOne])).toEqual([testOne]);
+    expect(combineWithDedup([testOne, testTwo], [])).toEqual([testOne, testTwo]);
+  });
+  it('work with arrays of len 1', () => {
+    expect(combineWithDedup([testOne], [testOne])).toEqual([testOne]);
+    expect(combineWithDedup([testOne], [testTwo])).toEqual([testOne, testTwo]);
+  });
+  it('work with arrays of len > 1', () => {
+    expect(combineWithDedup([testOne], [testOne, testTwo])).toEqual([testOne, testTwo]);
+    expect(combineWithDedup([testOne], [testTwo, testTwo])).toEqual([testOne, testTwo]);
+    expect(combineWithDedup([testOne, testTwo], [testTwo, testTwo])).toEqual([testOne, testTwo]);
+    expect(combineWithDedup([testOne, testTwo, testThree], [testOne, testTwo])).toEqual([
+      testOne,
+      testTwo,
+      testThree,
+    ]);
+  });
+});
+
+// combinedPromises tests
+const promiseGenerator = (values: Array<ServerData<any>>) => {
+  return Promise.resolve(values);
+};
+const badPromiseGenerator = (input: string) => {
+  return Promise.reject(input);
+};
+
+it('throws an error on an empty input', async () => {
+  expect(() => {
+    combinedPromises([], combineWithDedup);
+  }).toThrow();
+});
+
+it('catches when all promises fails', async () => {
+  expect(combinedPromises([badPromiseGenerator('')], combineWithDedup)).rejects.toEqual(['']);
+  expect(
+    combinedPromises(
+      [badPromiseGenerator('bad'), badPromiseGenerator('promise')],
+      combineWithDedup,
+    ),
+  ).rejects.toEqual(['bad', 'promise']);
+  expect(
+    combinedPromises(
+      [badPromiseGenerator('very'), badPromiseGenerator('bad'), badPromiseGenerator('promise')],
+      combineWithDedup,
+    ),
+  ).rejects.toEqual(['very', 'bad', 'promise']);
+
+  expect(
+    combinedPromises([badPromiseGenerator('bad'), promiseGenerator([testOne])], combineWithDedup),
+  ).resolves.toEqual([testOne]);
+  expect(
+    combinedPromises([promiseGenerator([testOne]), badPromiseGenerator('bad')], combineWithDedup),
+  ).resolves.toEqual([testOne]);
+});
+
+it('work with arrays of len 1', async () => {
+  const promiseArrayOne = [promiseGenerator([testOne])];
+  const promiseArrayTwo = [promiseGenerator([testOne, testTwo])];
+  const testResultOne = await combinedPromises(promiseArrayOne, combineWithDedup);
+  const testResultTwo = await combinedPromises(promiseArrayTwo, combineWithDedup);
+
+  expect(testResultOne).toEqual([testOne]);
+  expect(testResultTwo).toEqual([testOne, testTwo]);
+});
+
+it('works with arrays of len 2', async () => {
+  const promiseArrayOne = [promiseGenerator([testOne]), promiseGenerator([testTwo])];
+  const promiseArrayTwo = [promiseGenerator([testOne, testTwo]), promiseGenerator([testThree])];
+  const promiseArrayThree = [promiseGenerator([testOne]), promiseGenerator([testTwo, testThree])];
+  const promiseArrayFour = [
+    promiseGenerator([testOne, testTwo]),
+    promiseGenerator([testThree, testFour]),
+  ];
+  const promiseArrayFive = [
+    promiseGenerator([testOne, testTwo]),
+    promiseGenerator([testTwo, testThree]),
+  ];
+
+  const testResultOne = await combinedPromises(promiseArrayOne, combineWithDedup);
+  const testResultTwo = await combinedPromises(promiseArrayTwo, combineWithDedup);
+  const testResultThree = await combinedPromises(promiseArrayThree, combineWithDedup);
+  const testResultFour = await combinedPromises(promiseArrayFour, combineWithDedup);
+  const testResultFive = await combinedPromises(promiseArrayFive, combineWithDedup);
+
+  expect(testResultOne).toEqual([testOne, testTwo]);
+  expect(testResultTwo).toEqual([testOne, testTwo, testThree]);
+  expect(testResultThree).toEqual([testOne, testTwo, testThree]);
+  expect(testResultFour).toEqual([testOne, testTwo, testThree, testFour]);
+  expect(testResultFive).toEqual([testOne, testTwo, testThree]);
+});
+
+it('works with arrays of len >= 2', async () => {
+  const promiseArrayOne = [
+    promiseGenerator([testOne]),
+    promiseGenerator([testTwo]),
+    promiseGenerator([testThree]),
+  ];
+  const promiseArrayTwo = [
+    promiseGenerator([testOne]),
+    promiseGenerator([testTwo]),
+    promiseGenerator([testTwo]),
+  ];
+  const promiseArrayThree = [
+    promiseGenerator([testOne]),
+    promiseGenerator([testTwo]),
+    promiseGenerator([testThree, testFour]),
+  ];
+  const promiseArrayFour = [
+    promiseGenerator([testOne]),
+    promiseGenerator([testTwo, testThree]),
+    promiseGenerator([testFour]),
+  ];
+
+  const testResultOne = await combinedPromises(promiseArrayOne, combineWithDedup);
+  const testResultTwo = await combinedPromises(promiseArrayTwo, combineWithDedup);
+  const testResultThree = await combinedPromises(promiseArrayThree, combineWithDedup);
+  const testResultFour = await combinedPromises(promiseArrayFour, combineWithDedup);
+
+  expect(testResultOne).toEqual([testOne, testTwo, testThree]);
+  expect(testResultTwo).toEqual([testOne, testTwo]);
+  expect(testResultThree).toEqual([testOne, testTwo, testThree, testFour]);
+  expect(testResultFour).toEqual([testOne, testTwo, testThree, testFour]);
+});
+
+/*
+  TO-DO: Once getRawEnteries can be tested via end-to-end testing, we will be able to 
+  test getUnifiedDataForInterval as well. 
+*/

www/index.html

@@ -1,22 +1,18 @@
 <!doctype html>
 <html>
   <head>
-    <meta charset="utf-8" />
-    <meta
-      name="viewport"
-      content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width, viewport-fit=cover" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self' data: gap: https://ssl.gstatic.com https://api.ionicjs.com https://pro-deploy.ionicjs.com https://nominatim.openstreetmap.org https://raw.githubusercontent.com emission: 'unsafe-eval'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' https://tile.openstreetmap.org 'unsafe-inline' data: 'unsafe-eval'" />
+    <meta charset="utf-8">
+    <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width, viewport-fit=cover">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com https://api.ionicjs.com https://pro-deploy.ionicjs.com https://nominatim.openstreetmap.org https://raw.githubusercontent.com emission: 'unsafe-eval'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' https://tile.openstreetmap.org 'unsafe-inline' data: 'unsafe-eval'">
     <title></title>
-
+ 
     <!-- cordova script (this will be a 404 in the browser) -->
     <script type="text/javascript" src="cordova.js"></script>
   </head>
-
+ 
   <body ng-app="emission">
     <!-- <ion-nav-view></ion-nav-view> -->
-    <div id="appRoot" class="fill-container" style="width: 100vw; height: 100vh"></div>
+    <div id="appRoot" class="fill-container" style="width: 100vw; height: 100vh;"></div>
   </body>
   <script src="dist/bundle.js"></script>
 </html>

www/js/config/dynamicConfig.ts

@@ -1,7 +1,6 @@
 import i18next from 'i18next';
 import { displayError, logDebug, logWarn } from '../plugin/logger';
-import { getAngularService } from '../angular-react-helper';
-import { fetchUrlCached } from '../commHelper';
+import { fetchUrlCached } from '../services/commHelper';
 import { storageClear, storageGet, storageSet } from '../plugin/storage';
 
 export const CONFIG_PHONE_UI = 'config/app_ui_config';

www/js/control/ControlSyncHelper.tsx

@@ -9,7 +9,7 @@ import SettingRow from './SettingRow';
 import AlertBar from './AlertBar';
 import moment from 'moment';
 import { addStatEvent, statKeys } from '../plugin/clientStats';
-import { updateUser } from '../commHelper';
+import { updateUser } from '../services/commHelper';
 
 /*
  * BEGIN: Simple read/write wrappers

www/js/controllers.js

@@ -87,29 +87,4 @@ angular
       );
       console.log('SplashCtrl invoke finished');
     },
-  )
-
-  .controller('ChatsCtrl', function ($scope, Chats) {
-    // With the new view caching in Ionic, Controllers are only called
-    // when they are recreated or on app start, instead of every page change.
-    // To listen for when this page is active (for example, to refresh data),
-    // listen for the $ionicView.enter event:
-    //
-    //$scope.$on('$ionicView.enter', function(e) {
-    //});
-
-    $scope.chats = Chats.all();
-    $scope.remove = function (chat) {
-      Chats.remove(chat);
-    };
-  })
-
-  .controller('ChatDetailCtrl', function ($scope, $stateParams, Chats) {
-    $scope.chat = Chats.get($stateParams.chatId);
-  })
-
-  .controller('AccountCtrl', function ($scope) {
-    $scope.settings = {
-      enableFriends: true,
-    };
-  });
+  );

www/js/diary/LabelTab.tsx

@@ -27,7 +27,7 @@ import { SurveyOptions } from '../survey/survey';
 import { getLabelOptions } from '../survey/multilabel/confirmHelper';
 import { displayError } from '../plugin/logger';
 import { useTheme } from 'react-native-paper';
-import { getPipelineRangeTs } from '../commHelper';
+import { getPipelineRangeTs } from '../services/commHelper';
 
 let labelPopulateFactory, labelsResultMap, notesResultMap, showPlaces;
 const ONE_DAY = 24 * 60 * 60; // seconds

www/js/diary/services.js

@@ -1,10 +1,10 @@
 'use strict';
 
 import angular from 'angular';
-import { getBaseModeByKey, getBaseModeOfLabeledTrip } from './diaryHelper';
 import { SurveyOptions } from '../survey/survey';
 import { getConfig } from '../config/dynamicConfig';
-import { getRawEntries } from '../commHelper';
+import { getRawEntries } from '../services/commHelper';
+import { getUnifiedDataForInterval } from '../services/unifiedDataLoader';
 
 angular
   .module('emission.main.diary.services', ['emission.plugin.logger', 'emission.services'])

www/js/diary/timelineHelper.ts

@@ -1,7 +1,7 @@
 import moment from 'moment';
-import { getAngularService } from '../angular-react-helper';
 import { displayError, logDebug } from '../plugin/logger';
 import { getBaseModeByKey, getBaseModeOfLabeledTrip } from './diaryHelper';
+import { getUnifiedDataForInterval } from '../services/unifiedDataLoader';
 import i18next from 'i18next';
 
 const cachedGeojsons = new Map();
@@ -154,15 +154,14 @@ export function getLocalUnprocessedInputs(pipelineRange, labelsFactory, notesFac
  * @returns Promise an array with 1) results for labels and 2) results for notes
  */
 export function getAllUnprocessedInputs(pipelineRange, labelsFactory, notesFactory) {
-  const UnifiedDataLoader = getAngularService('UnifiedDataLoader');
   const tq = getUnprocessedInputQuery(pipelineRange);
+  const getMethod = window['cordova'].plugins.BEMUserCache.getMessagesForInterval;
+
   const labelsPromises = labelsFactory.MANUAL_KEYS.map((key) =>
-    UnifiedDataLoader.getUnifiedMessagesForInterval(key, tq, true).then(
-      labelsFactory.extractResult,
-    ),
+    getUnifiedDataForInterval(key, tq, getMethod).then(labelsFactory.extractResult),
   );
   const notesPromises = notesFactory.MANUAL_KEYS.map((key) =>
-    UnifiedDataLoader.getUnifiedMessagesForInterval(key, tq, true).then(notesFactory.extractResult),
+    getUnifiedDataForInterval(key, tq, getMethod).then(notesFactory.extractResult),
   );
   return getUnprocessedResults(labelsFactory, notesFactory, labelsPromises, notesPromises);
 }

www/js/metrics/MetricsTab.tsx

@@ -16,7 +16,7 @@ import Carousel from '../components/Carousel';
 import DailyActiveMinutesCard from './DailyActiveMinutesCard';
 import CarbonTextCard from './CarbonTextCard';
 import ActiveMinutesTableCard from './ActiveMinutesTableCard';
-import { getAggregateData, getMetrics } from '../commHelper';
+import { getAggregateData, getMetrics } from '../services/commHelper';
 
 export const METRIC_LIST = ['duration', 'mean_speed', 'count', 'distance'] as const;
 

www/js/onboarding/SaveQrPage.tsx

@@ -3,14 +3,13 @@ import { View, StyleSheet } from 'react-native';
 import { ActivityIndicator, Button, Surface, Text } from 'react-native-paper';
 import { registerUserDone, setRegisterUserDone, setSaveQrDone } from './onboardingHelper';
 import { AppContext } from '../App';
-import { getAngularService } from '../angular-react-helper';
 import { displayError, logDebug } from '../plugin/logger';
 import { useTranslation } from 'react-i18next';
 import QrCode, { shareQR } from '../components/QrCode';
 import { onboardingStyles } from './OnboardingStack';
 import { preloadDemoSurveyResponse } from './SurveyPage';
 import { storageSet } from '../plugin/storage';
-import { registerUser } from '../commHelper';
+import { registerUser } from '../services/commHelper';
 import { resetDataAndRefresh } from '../config/dynamicConfig';
 import { markConsented } from '../splash/startprefs';
 import i18next from 'i18next';