Fix deck not loading when user is missing; Fix other 404 deck pages

slidewiki · Dec 13, 2018 · bd5da8f · bd5da8f
1 parent 590b792
commit bd5da8f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 15 deletions.
diff --git a/actions/loadDeckView.js b/actions/loadDeckView.js
@@ -16,8 +16,7 @@ export default function loadDeckView(context, payload, done) {
 
     context.service.read('deck.content', payload, {timeout: 20 * 1000}, (err, res) => {
         if (err) {
-            console.log(err);
-            log.error(context, {filepath: __filename});
+            log.error(context, {filepath: __filename, message: err.message });
             context.executeAction(serviceUnavailable, payload, done);
             return;
         } else {

diff --git a/configs/routes.js b/configs/routes.js
@@ -409,11 +409,16 @@ export default {
                     context.executeAction(loadDeckStats, {deckId: payload.params.id}, callback);
                 }],
                 (err, result) => {
-                    if(err)console.log(err);
+                    if (err) {
+                        if (err.statusCode === 404) {
+                            return context.executeAction(notFoundError, payload, done);
+                        } else {
+                            return context.executeAction(serviceUnavailable, payload, done);
+                        }
+                    }
                     done();
                 }
             );
-
         }
     },
 
@@ -676,12 +681,18 @@ export default {
                     payload.params.sid = payload.params.slideID;//needs to be reset for loadPresentation
                     payload.params.language = payload.query.language;
                     context.executeAction(loadPresentation, payload, callback);
-                },
+                }],
                 (err, result) => {
-                    if(err) console.log(err);
+                    if (err) {
+                        if (err.statusCode === 404) {
+                            return context.executeAction(notFoundError, payload, done);
+                        } else {
+                            return context.executeAction(serviceUnavailable, payload, done);
+                        }
+                    }
                     done();
                 }
-            ]);
+            );
         }
     },
     presentationIE: {
@@ -703,12 +714,18 @@ export default {
                     // adding language to the params
                     payload.params.language = payload.query.language;
                     context.executeAction(loadPresentation, payload, callback);
-                },
+                }],
                 (err, result) => {
-                    if(err) console.log(err);
+                    if (err) {
+                        if (err.statusCode === 404) {
+                            return context.executeAction(notFoundError, payload, done);
+                        } else {
+                            return context.executeAction(serviceUnavailable, payload, done);
+                        }
+                    }
                     done();
                 }
-            ]);
+            );
         }
     },
     print: {
@@ -734,12 +751,18 @@ export default {
                     // adding language to the params
                     payload.params.language = payload.query.language;
                     context.executeAction(loadPresentation, payload, callback);
-                },
+                }],
                 (err, result) => {
-                    if(err) console.log(err);
+                    if (err) {
+                        if (err.statusCode === 404) {
+                            return context.executeAction(notFoundError, payload, done);
+                        } else {
+                            return context.executeAction(serviceUnavailable, payload, done);
+                        }
+                    }
                     done();
                 }
-            ]);
+            );
         }
     },
     oldSlugPresentation: {

diff --git a/services/deck.js b/services/deck.js
@@ -225,6 +225,8 @@ export default {
                     return userPromisesMap[user] = userPromisesMap[user] || rp.get({
                         uri: Microservices.user.uri + '/user/' + user.toString(),
                         json: true,
+                    }).catch((err) => {
+                        // ignore this for now, return nothing
                     });
                 });
                 return Promise.all(userPromises);
@@ -252,8 +254,8 @@ export default {
                 callback(null, {
                     deckData,
                     slidesData,
-                    creatorData: usersData[0],
-                    ownerData: usersData[1],
+                    creatorData: usersData[0] || {},
+                    ownerData: usersData[1] || {},
                     originCreatorData: usersData[2] || {},
                 });
             }).catch((err) => {