Merge pull request #4049 from QuantiModo/feature/refreshNotifications

qm.notifications.post instead of get

Author: mikepsinn

src/js/popup.js

@@ -243,7 +243,7 @@ function updateQuestion(variableName){
             qmLog.error("Asking " + questionText + "!", "qmPopup.trackingReminderNotification is: " + JSON.stringify(qmPopup.trackingReminderNotification),
                 {trackingReminderNotification: qmPopup.trackingReminderNotification});
         }
-        if (qmPopup.trackingReminderNotification.valence === "positive" || 
+        if (qmPopup.trackingReminderNotification.valence === "positive" ||
             qmPopup.trackingReminderNotification.valence === "negative") {
             numericRatingButtons().style.display = "none";
             faceRatingButtons().style.display = "block";
@@ -312,7 +312,7 @@ document.addEventListener('DOMContentLoaded', function(){
     }else{
         qmLog.pushDebug("popup addEventListener: Calling hidePopup...");
         hidePopup();
-        qm.notifications.refreshNotifications(updateQuestion, qm.notifications.closePopup);
+        qm.notifications.post(updateQuestion, qm.notifications.closePopup);
     }
     qmLog.pushDebug("popup addEventListener: calling setFaceButtonListeners...");
     setFaceButtonListeners();

src/js/qmHelpers.js

@@ -5517,7 +5517,7 @@ var qm = {
         refreshIfEmpty: function(successHandler, errorHandler){
             if(!qm.notifications.getNumberInGlobalsOrLocalStorage()){
                 qm.qmLog.info('No notifications in local storage');
-                qm.notifications.refreshNotifications(successHandler, errorHandler);
+                qm.notifications.post(successHandler, errorHandler);
                 return true;
             }
             qm.qmLog.info(qm.notifications.getNumberInGlobalsOrLocalStorage() + ' notifications in local storage');
@@ -5528,7 +5528,7 @@ var qm = {
             qm.qmLog.info("qm.notifications.refreshIfEmptyOrStale");
             if(!qm.notifications.getNumberInGlobalsOrLocalStorage() || qm.notifications.getSecondsSinceLastNotificationsRefresh() > 3600){
                 qm.qmLog.info('Refreshing notifications because empty or last refresh was more than an hour ago');
-                qm.notifications.refreshNotifications(callback);
+                qm.notifications.post(callback);
             }else{
                 qm.qmLog.info('Not refreshing notifications because last refresh was last than an hour ago and we have notifications in local storage');
                 if(callback){
@@ -5620,39 +5620,16 @@ var qm = {
             }else{
                 console.info('No rating notifications for popup');
                 qm.notifications.getLastNotificationsRefreshTime();
-                qm.notifications.refreshNotifications();
+                qm.notifications.post();
                 return null;
             }
         },
         deleteByVariableName: function(variableName){
             return qm.storage.deleteByProperty(qm.items.trackingReminderNotifications, 'variableName', variableName);
         },
         promise: null,
-        refreshNotifications: function(successHandler, errorHandler, options){
-            var route = qm.apiPaths.trackingReminderNotificationsPast;
-            qm.api.getRequestUrl(route, function(url){
-                // Can't use QM SDK in service worker
-                qm.api.getViaXhrOrFetch(url, function(response){
-                    if(!response){
-                        qm.qmLog.error("No response from " + url);
-                        if(errorHandler){
-                            errorHandler("No response from " + url);
-                        }
-                        return;
-                    }
-                    if(response.status === 401){
-                        qm.chrome.showSignInNotification();
-                    }else{
-                        qm.storage.setTrackingReminderNotifications(response.data);
-                        if(successHandler){
-                            successHandler(response.data);
-                        }
-                    }
-                })
-            }, options);
-        },
         refreshAndShowPopupIfNecessary: function(notificationParams){
-            qm.notifications.refreshNotifications(notificationParams, function(trackingReminderNotifications){
+            qm.notifications.post(function(response){
                 var uniqueNotification = qm.notifications.getMostRecentUniqueNotificationNotInSyncQueue();
                 function objectLength(obj){
                     var result = 0;
@@ -5664,6 +5641,7 @@ var qm = {
                     }
                     return result;
                 }
+                var trackingReminderNotifications = qm.notifications.getFromGlobalsOrLocalStorage();
                 var numberOfWaitingNotifications = objectLength(trackingReminderNotifications);
                 if(uniqueNotification){
                     function getChromeRatingNotificationParams(trackingReminderNotification){
@@ -5769,7 +5747,7 @@ var qm = {
             if(!successHandler){
                 return null;
             }
-            qm.notifications.refreshNotifications(function(notifications){
+            qm.notifications.post(function(response){
                 var notification = qm.notifications.getMostRecentNotification();
                 if(notification){
                     successHandler(notification);
@@ -5854,6 +5832,7 @@ var qm = {
                     var measurements = response.measurements;
                     if(!measurements && response.data){measurements = response.data.measurements;}
                     if(measurements){qm.measurements.addMeasurementsToMemory(measurements);}
+                    qm.storage.setTrackingReminderNotifications(response.data.trackingReminderNotifications);
                     if(successHandler){successHandler(response);}
                 }, function(response){
                     if(!response.success){