Merge pull request #238 from camroots/issue-229-temperature-download-gaps

Issue 229 temperature download gaps

Author: mark-prins

.yalc/msupply-ble-service/lib/commonjs/Bluetooth/BleService.js

@@ -86,5 +86,5 @@
   "dependencies": {
     "buffer": "^6.0.3"
   },
-  "yalcSig": "976a57bfd8696017226d857b4c611eb5"
+  "yalcSig": "f06204769ad5acab7172181527ad3cd0"
 }

.yalc/msupply-ble-service/lib/commonjs/Bluetooth/BleService.js.map

@@ -408,8 +408,8 @@ export class BleService {
         return result;
       } catch (e) {
         this.logger.error(`${macAddress} Error downloading logs! ${e.message}`);
+        throw new Error(`downloadLogs ${e.message}`);
       }
-      return [] as SensorLog[];
     }
   };
 

.yalc/msupply-ble-service/lib/module/Bluetooth/BleService.js

@@ -1 +1 @@
-976a57bfd8696017226d857b4c611eb5
+f06204769ad5acab7172181527ad3cd0

.yalc/msupply-ble-service/lib/module/Bluetooth/BleService.js.map

@@ -134,22 +134,25 @@ function* tryDownloadForSensor({
       yield put(DownloadAction.downloadStart(sensorId));
 
       const { macAddress, logInterval, logDelay, programmedDate } = sensor;
-      const logs = yield call(
-        btService.downloadLogsWithRetries,
-        macAddress,
-        DOWNLOAD_RETRIES,
-        null
-      );
-      logger.info(`${sensorId} logs downloaded: ${logs.length}`);
+
       const mostRecentLogTime = yield call(sensorManager.getMostRecentLogTime, sensorId);
 
       const numberOfLogsToSave = yield call(
         downloadManager.calculateNumberOfLogsToSave,
         Math.max(mostRecentLogTime + logInterval, logDelay, programmedDate),
         logInterval
       );
-
+      if (!numberOfLogsToSave) return logger.debug(`${sensorId} No logs to save`);
       logger.debug(`${sensorId} ${numberOfLogsToSave} logs to save`);
+
+      const logs = yield call(
+        btService.downloadLogsWithRetries,
+        macAddress,
+        DOWNLOAD_RETRIES,
+        null
+      );
+      logger.info(`${sensorId} logs downloaded: ${logs.length}`);
+
       const sensorLogs = yield call(
         downloadManager.createLogs,
         logs,

.yalc/msupply-ble-service/package.json

@@ -2,7 +2,7 @@
   "version": "v1",
   "packages": {
     "msupply-ble-service": {
-      "signature": "976a57bfd8696017226d857b4c611eb5",
+      "signature": "f06204769ad5acab7172181527ad3cd0",
       "file": true,
       "replaced": "link:../msupply-ble-service"
     }