Account for period that overlaps years

Author: 01painadam

components/widgets/fires/fires-ranked/selectors.js

@@ -38,23 +38,40 @@ export const getYears = createSelector([getLatestDate], latest => {
   return years;
 });
 
+export const getFilterWeeks = createSelector([getLatestDate, getOptionsSelected], (latest, options) => {
+  const period = options.weeks && options.weeks.value || 4;
+  const endWeek = moment(latest).isoWeek();
+  const startWeek = moment(latest).subtract(period, 'weeks').isoWeek();
+  return {startWeek, endWeek};
+});
+
 export const getStatsByAdmin = createSelector(
-  [getData, getYears, getAdm1, getLocation],
-  (data, years, adm1, location) => {
+  [getData, getYears, getAdm1, getLocation, getFilterWeeks],
+  (data, years, adm1, location, filterWeeks) => {
     if (isEmpty(data) || isEmpty(years)) {
       return null;
     }
     let matchKey = 'iso';
     if (location.value !== 'global') matchKey = adm1 ? 'adm2' : 'adm1';
     const alertsByAdm = groupBy(data, matchKey);
-
+    const {startWeek, endWeek} = filterWeeks;
     const filteredAlertsByAdmin = Object.entries(alertsByAdm).map(
       ([adm, adminAlerts]) => {
-        const countsArray = years.map(year => {
-          const filteredYear = adminAlerts.filter(el => el.year === year);
-          return filteredYear.length > 0 ? sumBy(filteredYear, 'count') : 0;
-        });
-
+        let countsArray = [];
+        if (startWeek < endWeek) {
+          countsArray = years.map(year => {
+            const filteredYear = adminAlerts.filter(el => el.year === year);
+            return filteredYear.length > 0 ? sumBy(filteredYear, 'count') : 0;
+          });
+        }
+        else {
+          // i.e. the period goes into previous year
+          countsArray = years.map(year => {
+            // in the case that the period goes over the year line we need to filter differently.
+            const filteredYear = adminAlerts.filter(el => (el.year === year && el.week <= endWeek) || (el.year === year-1 && el.week > startWeek));
+            return filteredYear.length > 0 ? sumBy(filteredYear, 'count') : 0;
+          });
+        }
         const stdDevCounts = stdDevData(countsArray);
         const meanCounts = mean(countsArray);
         const currentYearCounts = countsArray[countsArray.length - 1];
@@ -65,7 +82,6 @@ export const getStatsByAdmin = createSelector(
         return { id: adm, significance, currentYearCounts };
       }
     );
-
     return filteredAlertsByAdmin;
   }
 );

services/analysis-cached.js

@@ -34,7 +34,7 @@ const SQL_QUERIES = {
   fires:
     'SELECT {location}, alert__year, alert__week, SUM(alert__count) AS alert__count, confidence__cat FROM data {WHERE} GROUP BY {location}, alert__year, alert__week',
   firesGrouped:
-    'SELECT {location}, alert__year, alert__week, SUM(alert__count) AS alert__count, confidence__cat FROM data {WHERE} AND ({dateFilter}) GROUP BY {location}, alert__year',
+    'SELECT {location}, alert__year, alert__week, SUM(alert__count) AS alert__count, confidence__cat FROM data {WHERE} AND ({dateFilter}) GROUP BY {location}, alert__year, alert__week',
   firesWithin:
     'SELECT {location}, alert__week, alert__year, SUM(alert__count) AS alert__count, confidence__cat FROM data {WHERE} AND alert__year >= {alert__year} AND alert__week >= 1 GROUP BY alert__year, alert__week ORDER BY alert__week DESC, alert__year DESC',
   nonGlobalDatasets:
@@ -250,11 +250,11 @@ export const getWeeksFilter = ({ weeks, latest }) => {
     const yf = d.endYear || '';
     const wf = d.endWeek || '';
 
-    return `${acc} ${i === 0 ? '' : 'OR '}(alert__year = ${
+    return `${acc} ${i === 0 ? '' : 'OR '}((alert__year = ${
       yi
-    } AND alert__week > ${wi}) AND (alert__year = ${yf} AND alert__week <= ${
+    } AND alert__week > ${wi}) ${wi < wf ? 'AND' : 'OR'} (alert__year = ${yf} AND alert__week <= ${
       wf
-    })`;
+    }))`;
   }, '');
 };
 
@@ -736,6 +736,7 @@ export const fetchVIIRSAlertsGrouped = params => {
     data: {
       data: response.data.data.map(d => ({
         ...d,
+        week: parseInt(d.alert__week, 10),
         year: parseInt(d.alert__year, 10),
         count: d.alert__count,
         alerts: d.alert__count