changes regarding error handling

src/controllers/event.js

@@ -1,5 +1,6 @@
 tsUtils = require("../lib/utils");
-const path = require('path')
+const path = require('path');
+const { teamsnapFailure, tsPromise } = require("../lib/utils");
 
 
 exports.helpers = {
@@ -23,7 +24,7 @@ exports.getEvents = async (req, res, next) => {
   const {user, team, layout} = req
   const bulkLoadTypes = ["event", "availabilitySummary"]
   req.promises.push(
-    teamsnap.bulkLoad(team.id, bulkLoadTypes , () => {tsUtils.teamsnapCallback;req.items = tsUtils.teamsnapLog('bulkLoad', types=bulkLoadTypes, team.id, req)})
+    tsPromise('bulkLoad', {teamId: team.id, types: bulkLoadTypes})
     .then(items=>tsUtils.groupTeamsnapItems(items))
     .then(items=>{
       items.events.forEach((event) => {
@@ -31,16 +32,25 @@ exports.getEvents = async (req, res, next) => {
       }
       )
       req.events = items.events;
-    }
-  )
+      }
+    )
+    .then(tsUtils.teamsnapLog('bulkLoad', types=bulkLoadTypes, team.id, req))
+    .catch((err) => {
+      teamsnapFailure(err,next)
+    })
   )
   await Promise.all(req.promises)
-  const context = {
-    title: "Events",
-    user, team, layout,
-    events: req.events,
-  };
-  res.render("event/list", context);
+
+  try {
+    const context = {
+      title: "Events",
+      user, team, layout,
+      events: req.events,
+    };
+    res.render("event/list", context);
+  } catch(e) {
+    next(e)
+  }
 };
 
 exports.getEvent = async (req, res, next) => {

src/controllers/eventsheet.js

@@ -5,9 +5,12 @@ exports.partials = path.join(__dirname, "../views/eventsheet/partials")
 
 exports.getEventSheet = async (req,res) =>{
   req.promises.push(
-    teamsnap.loadOpponents(req.team.id, (err, opponents)=>{
+    teamsnap.loadOpponents(
+      req.team.id, 
+      (err, opponents)=>{
       if (err) console.log("error in route/opponent.js", err);
-    }).then(opponents => {req.opponent=opponents.find(o=>o.id==req.event.opponentId);})
+      }
+    ).then(opponents => {req.opponent=opponents.find(o=>o.id==req.event.opponentId);})
   )
   await Promise.all(req.promises)
   req.promises.push(

src/controllers/team.js

@@ -1,21 +1,42 @@
+const { teamsnapCallback } = require("../lib/utils");
+
 utils = require("../lib/utils");
 
 exports.getTeams = async (req, res, next) => {
-  const {layout, user} = req
-  teams = await teamsnap.loadTeams((err, teams) => {
-      if (err) console.log("error in team.js", err);
-    })
-  context = { layout, title: "Teams", teams: teams.filter(t=>!t.isRetired), user };
-  res.render("team/list", context);
+  const {layout} = req
+  const {user_id} = req.params
+  promise = teamsnap.loadTeams({'userId':user_id}, 
+  (err, items) =>{
+    teamsnapCallback(err,items);
+    req.teams = items;
+  })
+  .then(() => tsUtils.teamsnapLog('loadTeams', types=['teams'], null, req))
+  .fail(
+    next
+  )
+  req.promises.push(promise)
+  await Promise.all(req.promises)
+  try {
+    const context = { layout, title: "Teams", teams: req.teams.filter(t=>!t.isRetired) };
+    res.render("team/list", context);
+  } catch (e){
+    next(e);
+  }
+  
 };
 
 exports.getTeamHome = async (req, res, next) => {
   await Promise.all(req.promises)
   const {user, team, team_preferences, upcoming_events, recent_events, layout} = req
-  context = { 
-    title: "Home", 
-    layout, team, user, team_preferences, upcoming_events, recent_events
-  };
 
-  res.render("team/home", context);
+  try {
+    context = { 
+      title: "Home", 
+      layout, team, user, team_preferences, upcoming_events, recent_events
+    };
+    res.render("team/home", context);
+  } catch (e) {
+    next (e);
+  }
+
 };