updates to teamsnapCallback

src/routes/eventsheet.js

@@ -5,6 +5,7 @@ const {loadEvent} = require("./event");
 const {loadRecentAndUpcomingEvents} = require("../middlewares/bulkload")
 const router = express.Router();
 const tsUtils = require('../lib/utils')
+const {teamsnapCallback} = require('../lib/utils')
 const multer = require("multer");
 const upload = multer()
 
@@ -18,19 +19,25 @@ const loadEvents = async (req,res,next) => {
   const eventIds = [...recent_events.map(e=>e.id), event_id, ...upcoming_events.map(e=>e.id)]
   // if (!req.event_lineup){
     bulkLoadTypes = ['event','eventLineup', 'eventLineupEntry']
-    req.promises.push(teamsnap.bulkLoad({teamId: team_id, types: bulkLoadTypes, scopeTo:'event', event__id:eventIds}, null, tsUtils.teamsnapCallback)
+    req.promises.push(
+      teamsnap.bulkLoad(
+        {teamId: team_id, types: bulkLoadTypes, scopeTo:'event', event__id:eventIds}, 
+        null, 
+        (err, items) => {teamsnapCallback(err, items, {req, source:"loadEvents", method:'bulkLoad'})}
+        )
     .then(items => tsUtils.groupTeamsnapItems(items, bulkLoadTypes))
     .then(items => {
-                    tsUtils.teamsnapLog('bulkLoad', types=bulkLoadTypes, team_id, req);
                     req.timeline.events = items.events;
                     req.timeline.event_lineups = items.eventLineups;
                     req.timeline.event_lineup_entries = items.eventLineupEntries;
                     })
                     )
-    tsUtils.teamsnapLog('loadAvailabilites', types=['availabilities'], team_id, req);
     
     req.promises.push(
-      teamsnap.loadAvailabilities({eventId: eventIds}).then(availabilities => {
+      teamsnap.loadAvailabilities(
+        {eventId: eventIds},
+        (err, items) => {teamsnapCallback(err, items, {req, source:"loadEvents", method:'loadAvailabilities'})}
+        ).then(availabilities => {
         req.timeline.availabilities = availabilities
       }
       )
@@ -53,7 +60,7 @@ const linksForEventSheet = async (req, res, next) => {
 }
 
 router.use("/:team_id([0-9]+)/event/:event_id([0-9]+)/sheet", loadEventLineup)
-router.get("/:team_id([0-9]+)/event/:event_id([0-9]+)/lineup/:event_lineup_id([0-9]+)/sheet", loadEventLineup, loadRecentAndUpcomingEvents, loadEvents, eventsSheetController.getEventSheet)
+router.get("/:team_id([0-9]+)/event/:event_id([0-9]+)/lineup/:event_lineup_id([0-9]+)/sheet", loadRecentAndUpcomingEvents, loadEvents, eventsSheetController.getEventSheet)
 
 // Routes
 router.get("/:team_id([0-9]+)/event/:event_id([0-9]+)/sheet", async (req,res) => {