From 573f2e473217f505717ceb5e1db7f6ed0c418c27 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 29 Jun 2018 20:03:45 +0200 Subject: [PATCH] fix preening when history entries are null --- website/server/libs/preening.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/server/libs/preening.js b/website/server/libs/preening.js index 527cca6dff..34f769815d 100644 --- a/website/server/libs/preening.js +++ b/website/server/libs/preening.js @@ -41,6 +41,7 @@ export function preenHistory (history, isSubscribed, timezoneOffset = 0, dayStar // Keep uncompressed entries (modifies history and returns removed items) let newHistory = _.remove(history, entry => { + if (!entry) return true; // sometimes entries are `null` const entryDate = moment(entry.date).zone(timezoneOffset); if (entryDate.hour() < dayStart) entryDate.subtract(1, 'day'); return entryDate.isSame(cutOff) || entryDate.isAfter(cutOff); @@ -49,6 +50,7 @@ export function preenHistory (history, isSubscribed, timezoneOffset = 0, dayStar // Date after which to begin compressing data by year let monthsCutOff = cutOff.subtract(isSubscribed ? 12 : 10, 'months').startOf('day'); let aggregateByMonth = _.remove(history, entry => { + if (!entry) return true; // sometimes entries are `null` const entryDate = moment(entry.date).zone(timezoneOffset); if (entryDate.hour() < dayStart) entryDate.subtract(1, 'day'); return entryDate.isSame(monthsCutOff) || entryDate.isAfter(monthsCutOff);