getinfoforuser handles non-leader users

hackclub · Sep 18, 2019 · 7dd40bd · 7dd40bd
1 parent c693ad7
commit 7dd40bd
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -104,28 +104,38 @@ export const getInfoForUser = user =>
       airFind('Leaders', 'Slack ID', user)
         .then(leader => (results.leader = leader))
         // Then club from leader
-        .then(() =>
-          airFind('Clubs', `FIND("${results.leader.fields['ID']}", Leaders)`)
-        )
+        .then(() => {
+          if (!results.leader) return null
+
+          return airFind(
+            'Clubs',
+            `FIND("${results.leader.fields.ID}", Leaders)`
+          )
+        })
         .then(club => (results.club = club))
         // Then club's history from club
-        .then(() => airGet('History', 'Club', results.club.fields['ID']))
-        .then(history => {
+        .then(() => {
+          if (!results.club) return null
+
+          return airGet('History', 'Club', results.club.fields.ID)
+        })
+        .then(history => (results.rawHistory = history))
+        .then(() => {
+          if (!results.rawHistory) return null
+
           results.history = {
             lastMeetingDay: 'monday',
-            records: history,
-            meetings: history
-              .filter(h => h.fields['Attendance'])
+            records: results.rawHistory,
+            meetings: results.rawHistory
+              .filter(h => h.fields.Attendance)
               .sort(
-                (a, b) =>
-                  Date.parse(a.fields['Date']) - Date.parse(b.fields['Date'])
+                (a, b) => Date.parse(a.fields.Date) - Date.parse(b.fields.Date)
               ),
           }
-        })
-        .then(() => {
+
           if (results.history.meetings.length > 0) {
             const lastMeetingDay = new Date(
-              results.history.meetings[0].fields['Date']
+              results.history.meetings[0].fields.Date
             ).toLocaleDateString('en-us', {
               weekday: 'long',
               timeZone: results.slackUser.tz,