api route for checking in teams

Author: Joshua Zhou

app.js

@@ -126,7 +126,7 @@ app.use("/", indexRouter);
 app.use("/api", apiRouter);
 
 //Custom error handler
-app.use((err, req, res, next) => {
+app.use((err, req, res) => {
     // log the error...
     const status = err.status ? err.status : 500;
     const message = err.message ? err.message : "Internal Server Error";

controllers/checkin.controller.js

@@ -1,24 +1,84 @@
 "use strict";
 
 const Services = {
-    Sheets: require('../services/sheets.service')
+    Sheets: require('../services/sheets.service'),
+    Hacker: require('../services/hacker.service'),
+    Team: require('../services/team.service'),
+    Account: require('../services/account.service')
 };
 
 /**
  * @function submitCheckin
- * @param {{body: {formData: Object}}} req
+ * @param {{body: {formData: Object}, user: {id: string}}} req
  * @param {*} res
  * @return {JSON} Success status
  * @description Handles the check-in form submission and adds data to Google Sheets
+ * Automatically fetches team member emails from the logged-in user's team
  */
 async function submitCheckin(req, res) {
     try {
-        await Services.Sheets.appendCheckinData(req.body.formData);
+        // Get logged-in hacker
+        const hacker = await Services.Hacker.findByAccountId(req.user.id);
+        
+        if (!hacker) {
+            return res.status(404).json({
+                message: "Hacker not found",
+                data: {}
+            });
+        }
+
+        // Check hacker has a team
+        if (!hacker.teamId) {
+            return res.status(400).json({
+                message: "You must be part of a team to submit check-in",
+                data: {}
+            });
+        }
+
+        // Fetch team data
+        const team = await Services.Team.findById(hacker.teamId);
+        
+        if (!team) {
+            return res.status(404).json({
+                message: "Team not found",
+                data: {}
+            });
+        }
+
+        // Fetch all team member emails
+        const teamMemberEmails = [];
+        for (const memberId of team.members) {
+            const memberHacker = await Services.Hacker.findById(memberId);
+            if (memberHacker) {
+                const memberAccount = await Services.Account.findById(memberHacker.accountId);
+                if (memberAccount) {
+                    teamMemberEmails.push(memberAccount.email);
+                }
+            }
+        }
+
+        // Prepare data for Google Sheets with team member emails
+        const teamIdString = team._id ? team._id.toString() : hacker.teamId.toString();
+        
+        const checkinData = {
+            teamMember1: teamMemberEmails[0] || '',
+            teamMember2: teamMemberEmails[1] || '',
+            teamMember3: teamMemberEmails[2] || '',
+            teamMember4: teamMemberEmails[3] || '',
+            prizeCategories: req.body.formData.prizeCategories,
+            sponsorChallenges: req.body.formData.sponsorChallenges,
+            workshopsAttended: req.body.formData.workshopsAttended,
+            teamId: teamIdString
+        };
+
+        await Services.Sheets.appendCheckinData(checkinData);
+        
         return res.status(200).json({
             message: "Check-in data successfully submitted",
             data: {}
         });
     } catch (error) {
+        console.error('Checkin submission error:', error);
         return res.status(500).json({
             message: "Error submitting check-in data",
             data: {}

routes/api/checkin.js

@@ -16,20 +16,22 @@ const Middleware = {
  * @api {post} /api/hacker/checkin Submit check-in form data
  * @apiName SubmitCheckin
  * @apiGroup Checkin
- * @apiVersion 1.0.0
+ * @apiVersion 2.0.0
+ *
+ * @apiDescription Submits check-in form for the logged-in hacker's team.
+ * Team member emails are automatically fetched from the team.
+ * Hacker must be part of a team to submit.
  *
  * @apiParam {Object} formData The check-in form data
- * @apiParam {String} formData.teamMember1 First team member's name
- * @apiParam {String} [formData.teamMember2] Second team member's name
- * @apiParam {String} [formData.teamMember3] Third team member's name
- * @apiParam {String} [formData.teamMember4] Fourth team member's name
  * @apiParam {String[]} formData.prizeCategories Array of prize categories
  * @apiParam {String[]} formData.sponsorChallenges Array of sponsor challenges
  * @apiParam {String[]} formData.workshopsAttended Array of workshops attended
  *
  * @apiSuccess {String} message Success message
  *
  * @apiError {String} message Error message
+ * @apiError (400) {String} message "You must be part of a team to submit check-in"
+ * @apiError (404) {String} message "Hacker not found" or "Team not found"
  */
 router.post(
     "/checkin",

services/sheets.service.js

@@ -55,14 +55,15 @@ class SheetsService {
                 formData.teamMember4 || '',
                 Array.isArray(formData.prizeCategories) ? formData.prizeCategories.join(', ') : '',
                 Array.isArray(formData.sponsorChallenges) ? formData.sponsorChallenges.join(', ') : '',
-                Array.isArray(formData.workshopsAttended) ? formData.workshopsAttended.join(', ') : ''
+                Array.isArray(formData.workshopsAttended) ? formData.workshopsAttended.join(', ') : '',
+                formData.teamId || '' // Add teamId as the 9th column
             ]];
 
             Logger.info('Formatted data for spreadsheet:', values);
 
             const request = {
                 spreadsheetId: this.spreadsheetId,
-                range: 'Sheet1!A:H', // Adjust range as needed
+                range: 'Sheet1!A:I', // Updated to include column I for teamId
                 valueInputOption: 'USER_ENTERED',
                 insertDataOption: 'INSERT_ROWS',
                 resource: {