Remove Jellyfish (UPLOAD-1, UPLOAD-1399)

app/actions/async.js

@@ -115,7 +115,8 @@ export function doAppInit(opts, servicesToInit) {
     log('Initializing device');
     device.init({
       api,
-      version: opts.namedVersion
+      version: opts.namedVersion,
+      uploaderDestination: opts.uploaderDestination,
     }, function(deviceError, deviceResult){
       if (deviceError) {
         return dispatch(sync.initializeAppFailure(deviceError));
@@ -429,10 +430,6 @@ export function doDeviceUpload(driverId, opts = {}, utc) {
         errorMessage = 'E_BLUETOOTH_PAIR';
       }
 
-      if (targetDevice.powerOnlyWarning) {
-        errorMessage = 'E_USB_CABLE';
-      }
-
       device.upload(
         driverId,
         opts,

app/constants/errorMessages.js

@@ -19,11 +19,7 @@
 // and these error constants are a dependency through lib/core/api.js
 
 module.exports = {
-  E_CARELINK_CREDS: 'Check your CareLink username and password',
-  E_CARELINK_UNSUPPORTED: 'Tidepool does not support Minimed pumps 522, 722 or older, or the newer 6-series pumps. Sorry... If you are no longer using an unsupported pump and still get this message, create a new CareLink account and try uploading again.',
-  E_CARELINK_UPLOAD: 'Error processing & uploading CareLink data',
   E_DEVICE_UPLOAD: 'Something went wrong during device upload',
-  E_FETCH_CARELINK: 'Something went wrong trying to fetch CareLink data',
   E_FILE_EXT: 'Please choose a file ending in ',
   E_HID_CONNECTION: 'Hmm, your device doesn\'t appear to be connected',
   E_INIT: 'Error during app initialization',

app/containers/App.js

@@ -130,9 +130,15 @@ export class App extends Component {
       ? JSON.parse(localStore.getItem('selectedEnv'))
       : null;
 
-    this.props.async.fetchInfo(() => {
+    this.props.async.fetchInfo((err, info) => {
+      if (err) {
+        this.log('fetchInfo error:', err);
+      }
       this.props.async.doAppInit(
-        _.assign({ environment: this.state.server }, config, selectedEnv),
+        _.assign({
+          environment: this.state.server,
+          uploaderDestination: info.versions?.uploaderDestination,
+        }, config, selectedEnv),
         {
           api: api,
           device,

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tidepool-uploader",
   "productName": "tidepool-uploader",
-  "version": "2.59.1-ultra-plus-flex.3",
+  "version": "2.59.1-remove-jellyfish.2",
   "description": "Tidepool Project Universal Uploader",
   "main": "./main.prod.js",
   "author": {

lib/commonFunctions.js

@@ -22,7 +22,7 @@ var annotate = require('./eventAnnotations');
 var api = require('./core/api.js');
 var rollbar =require('../app/utils/rollbar');
 var isBrowser = typeof window !== 'undefined';
-var moment = require('moment');
+var _ = require('lodash');
 
 var GLUCOSE_MM = 18.01559;
 
@@ -177,3 +177,126 @@ exports.addDurationToDeviceTime = function (event, duration) {
 };
 
 exports.fixFloatingPoint = (n) => Math.floor(n * 100 + 0.5) / 100;
+
+Number.prototype.toFixedNumber = function(significant){
+  var pow = Math.pow(10,significant);
+  return +( Math.round(this*pow) / pow );
+};
+
+exports.updateDuration = function(event, lastEvent) {
+
+  const withAnnotation = function(event) {
+    if(_.find(event.annotations || [], function(ann) {
+        return ann.code === 'final-basal/fabricated-from-schedule' ||
+               ann.code === 'basal/unknown-duration' ||
+               ann.code === 'status/incomplete-tuple' ||
+               ann.code === 'bolus/extended-in-progress' ||
+               ann.code === 'tandem/pumpSettingsOverride/estimated-duration';
+      })) {
+      return true;
+    }
+    return false;
+  };
+
+  let updatedDuration = Date.parse(event.time) - Date.parse(lastEvent.time);
+
+  if (event.extended && event.duration) {
+    // for extended boluses we don't have to calculate the duration
+    updatedDuration = event.duration;
+  }
+
+  if (updatedDuration >= 0) {
+    debug('Updating duration of last event from previous upload');
+    if((lastEvent.subType !== 'pumpSettingsOverride') && lastEvent.duration > 0) {
+      lastEvent.expectedDuration = lastEvent.duration;
+    }
+    lastEvent.duration = updatedDuration;
+
+    if (withAnnotation(lastEvent)) {
+      // if the event was previously annotated because of the missing event,
+      // we can now remove the annotations
+      lastEvent = _.omit(lastEvent, 'annotations');
+    }
+
+    return lastEvent;
+  } else {
+    return null;
+  }
+};
+
+exports.stripUnwantedFields = function(record) {
+  const stripped = _.omit(record,
+    'createdTime', 'id', 'guid', 'modifiedTime', 'revision', 'uploadId',
+    '_active', '_deduplicator', '_id', '_schemaVersion', '_userId',
+  );
+
+  debug(`Last ${stripped.type} (${stripped.subType || stripped.deliveryType}) from previous upload was: ${JSON.stringify(stripped, null, 4)}`);
+  return stripped;
+};
+
+exports.updatePreviousDurations = async function(data, cfg, cb) {
+
+
+  try {
+    // update last basal
+    const lastBasal = this.stripUnwantedFields(await api.getLatestRecord(cfg.groupId, cfg.deviceInfo.deviceId, 'basal'));
+    let datum = _.find(data.post_records, {type: 'basal'});
+    if (datum != null) {
+      const updatedBasal = this.updateDuration(datum, lastBasal);
+      if (updatedBasal) {
+        data.post_records.push(updatedBasal);
+      }
+    }
+
+    // update last suspend event
+    if (lastBasal.deliveryType === 'suspend') {
+      const lastDeviceEvent = this.stripUnwantedFields(await api.getLatestRecord(cfg.groupId, cfg.deviceInfo.deviceId, 'deviceEvent', 'status'));
+      if (lastDeviceEvent.subType === 'status') {
+        const index = _.findIndex(data.post_records, {type: 'deviceEvent', subType: 'status'});
+        datum = data.post_records[index];
+
+        if (index > -1) {
+          const updatedStatus = this.updateDuration(datum, lastDeviceEvent);
+
+          if (updatedStatus) {
+            updatedStatus.reason.resumed = datum.reason.resumed;
+
+            if (lastDeviceEvent.payload && lastDeviceEvent.payload.reason != null) {
+              updatedStatus.payload.suspended = lastDeviceEvent.payload.reason;
+              delete updatedStatus.payload.reason;
+            }
+            if (datum.payload && datum.payload.reason != null) {
+              updatedStatus.payload.resumed = datum.payload.reason;
+            }
+
+            data.post_records.push(updatedStatus);
+            data.post_records.splice(index, 1); // remove resume event that is now combined
+          }
+        }
+      }
+    }
+
+    // update last pump settings override
+    const lastPumpSettingsOverride = this.stripUnwantedFields(await api.getLatestRecord(cfg.groupId, cfg.deviceInfo.deviceId, 'deviceEvent', 'pumpSettingsOverride'));
+
+    const index = _.findIndex(data.post_records, {type: 'deviceEvent', subType: 'pumpSettingsOverride'});
+    datum = data.post_records[index];
+    if (datum != null) {
+      if (annotate.isAnnotated(lastPumpSettingsOverride, 'tandem/pumpSettingsOverride/estimated-duration')) {
+        const updatedOverride = this.updateDuration(datum, lastPumpSettingsOverride);
+        if (updatedOverride) {
+          data.post_records.push(updatedOverride);
+        } else {
+          debug('Not updating pump settings override as duration could not be calculated');
+        }
+      }
+      if (datum.overrideType === 'normal') {
+        // remove override active at beginning that was stopped
+        data.post_records.splice(index, 1);
+      }
+    }
+    return cb (null, data);
+  } catch (error) {
+    return cb (error);
+  }
+};