Moved idb back into sw.

app/js/dbhelper.js

@@ -27,7 +27,7 @@ class DBHelper {
    * Fetch all restaurants.
    */
   static fetchRestaurants(callback) {
-    console.log(`In fetchRestaurants - callback: ${callback}`);
+    //console.log(`In fetchRestaurants - callback: ${callback}`);
     let requestURL = DBHelper.DATABASE_URL;
     // console.log(`Request URL: ${requestURL}`);
     // Fetch restaurant data from server
@@ -304,7 +304,7 @@ class DBHelper {
         console.log("In addToUpdateQueue catch, error: ", error.message);
       })
       // TODO : attempt push of updates
-      .then(DBHelper.pushUpdates());
+      //.then(DBHelper.pushUpdates());
   }
 
   /*
@@ -337,7 +337,7 @@ class DBHelper {
                     // Recursive call to push next update record. Will retrun in next call if empty.
                     .then(function() {
                       console.log("Record deleted, calling next...");
-                      DBHelper.pushUpdates();
+                      //DBHelper.pushUpdates();
                     })
                 })
             })
@@ -372,7 +372,7 @@ class DBHelper {
 
   /*
    * Function to check idb for restaurant information 
-   */
+   *
   static idbRestaurantRequest() {
     return dbPromise.then(function(db) {
       return db.transaction('restaurantData').objectStore('restaurantData').get(id);
@@ -393,7 +393,7 @@ class DBHelper {
 
   /*
    * Function to check idb for review information
-   */
+   *
   static idbReviewRequest() {
     return dbPromise.then(function(db) {
       return db.transaction('reviewData').objectStore('reviewData').index('restaurant_id').getAll(id);
@@ -420,6 +420,6 @@ class DBHelper {
       return new Response(JSON.stringify(endResponse));
     })
     .catch(function(error) {  console.log(`In apiFetch catch-reviewData, error: ${error.message}`);  })
-  }
+  }*/
 
 }

app/js/main.js

@@ -79,7 +79,7 @@ window.initMap = () => {
     scrollwheel: false
   });
   updateRestaurants();
-  DBHelper.pushUpdates();
+  //DBHelper.pushUpdates();
 }
 
 /*

app/js/restaurant_info.js

@@ -18,7 +18,7 @@ window.initMap = () => {
       DBHelper.mapMarkerForRestaurant(self.restaurant, self.map);
     }
   });
-  DBHelper.pushUpdates();
+  //DBHelper.pushUpdates();
 }
 
 /*

app/js/swregister.js

@@ -1,6 +1,6 @@
 // Registering the Service Worker
 if ('serviceWorker' in navigator) {
-  navigator.serviceWorker.register('/sw.js')
+  navigator.serviceWorker.register('sw.js')
     .then(function(registration) {
       console.log('Registration successful, scope is: ', registration.scope);
     })

app/sw.js

@@ -3,20 +3,22 @@
  */
 
 // Include DBHelper functions for fetching restaurants and putting in indexedDB
-self.importScripts('js/dbhelper.js', 'js/idb.js');
+// self.importScripts('js/dbhelper.js', 'js/idb.js');
+ self.importScripts('js/idb.js');
+// import idb from "idb";
 
 // Cache Information
-var myCache     = 'restaurantReview_301';
+var myCache     = 'restaurantReview_302';
 var cacheFiles  = [
-  '/index.html',
-  '/restaurant.html',
-  '/css/styles.css',
-  '/img/',
-  '/js/dbhelper.js',
-  '/js/main.js',
-  '/js/restaurant_info.js',
-  '/js/swregister.js' ,
-  '/js/idb.js'
+  'index.html',
+  'restaurant.html',
+  'css/styles.css',
+  'img/',
+  'js/dbhelper.js',
+  'js/main.js',
+  'js/restaurant_info.js',
+  'js/swregister.js' ,
+  'js/idb.js'
 ];
 
 // IDB Information
@@ -78,11 +80,49 @@ function apiFetch(event, id) {
 
   // Restaurant Request 
   if(event.request.url.indexOf('restaurants') > -1) {
-    event.respondWith(DBHelper.idbRestaurantRequest());
+    event.respondWith(dbPromise.then(function(db) {
+      return db.transaction('restaurantData').objectStore('restaurantData').get(id);
+    })
+    .then(function(data) {
+      return (data && data.data) || fetch(event.request)
+        .then(function(response) {
+          return dbPromise
+            .then(function(db) {
+              db.transaction('restaurantData', 'readwrite').objectStore('restaurantData').put({ id: id, data: response.json() });
+              return response.json();
+            });
+        });
+    })
+    .then(function(endResponse) { return new Response(JSON.stringify(endResponse)); })
+    .catch(function(error)      { console.log(`In DBHelper.idbRestaurantRequest, error: ${error.message}`); }));
   }
 
   // Review Request 
-  event.respondWith(DBHelper.idbReviewRequest());
+  event.respondWith(dbPromise.then(function(db) {
+    return db.transaction('reviewData').objectStore('reviewData').index('restaurant_id').getAll(id);
+  })
+  .then(function(data) {
+    return (data && data.data) || fetch(event.request)
+      .then(function(response) {
+        return dbPromise
+          .then(function(db) {
+            let store = db.transaction('reviewData', 'readwrite').objectStore('reviewData');
+            let r = response.json();
+            r.forEach(function(review) {
+              store.put({id: review.id, 'restaurant_id': review.restaurant_id, data: review});
+            })
+            return r;
+          });
+      });
+  })
+  .then(function(endResponse) {
+    if(endResponse[0].data) {
+      let formatted = endResponse.map(review => review.data);
+      return new Response(JSON.stringify(formatted));
+    }
+    return new Response(JSON.stringify(endResponse));
+  })
+  .catch(function(error) {  console.log(`In apiFetch catch-reviewData, error: ${error.message}`);  }));
 }
 
 function cacheFetch(event, request) {