Merge pull request #19 from metaversecloud-com/dev

Add urlSlug to addNewRowToGoogleSheets

Author: LinaBell

src/controllers/handleClaimCell.ts

@@ -193,6 +193,7 @@ export const handleClaimCell = async (req: Request, res: Response) => {
             displayName,
             identityId,
             event: "completions",
+            urlSlug,
           },
         ]);
       }

src/routes.ts

@@ -24,6 +24,7 @@ router.get("/system/health", (req, res) => {
       GOOGLESHEETS_CLIENT_EMAIL: process.env.CLIENT_EMAIL ? "SET" : "UNSET",
       GOOGLESHEETS_SHEET_ID: process.env.SHEET_ID ? "SET" : "UNSET",
       GOOGLESHEETS_PRIVATE_KEY: process.env.PRIVATE_KEY ? "SET" : "UNSET",
+      GOOGLESHEETS_SHEET_RANGE: process.env.GOOGLESHEETS_SHEET_RANGE ? "SET" : "UNSET",
     },
   });
 });

src/utils/addNewRowToGoogleSheets.ts

@@ -5,6 +5,7 @@ type SSAEvent = {
   identityId: string;
   displayName: string;
   event: string;
+  urlSlug: string;
 };
 
 // Configure the Google Sheets client
@@ -21,11 +22,11 @@ const sheetsClient = sheets.sheets({ version: "v4", auth });
 export const addNewRowToGoogleSheets = async (SSAEvents: SSAEvent[]) => {
   try {
     // Only execute this function if we have GOOGLESHEETS_SHEET_ID in the environment variables.
-    if (!process.env.GOOGLESHEETS_SHEET_ID) {
-      return;
-    }
+    if (!process.env.GOOGLESHEETS_SHEET_ID) return;
+
+    const data = [];
     for (const row of SSAEvents) {
-      const { identityId, displayName, event } = row;
+      const { identityId, displayName, event, urlSlug } = row;
 
       const now = new Date();
       const formattedDate = now.toISOString().split("T")[0];
@@ -38,19 +39,20 @@ export const addNewRowToGoogleSheets = async (SSAEvents: SSAEvent[]) => {
         displayName,
         "TicTacToe",
         event,
+        urlSlug,
       ];
-
-      // @ts-ignore
-      await sheetsClient.spreadsheets.values.append({
-        spreadsheetId: process.env.GOOGLESHEETS_SHEET_ID,
-        range: "Sheet1",
-        valueInputOption: "RAW",
-        insertDataOption: "INSERT_ROWS",
-        resource: {
-          values: [dataRowToBeInsertedInGoogleSheets],
-        },
-      });
+      data.push(dataRowToBeInsertedInGoogleSheets);
     }
+
+    await sheetsClient.spreadsheets.values.append({
+      spreadsheetId: process.env.GOOGLESHEETS_SHEET_ID,
+      range: process.env.GOOGLESHEETS_SHEET_RANGE || "Sheet1",
+      valueInputOption: "RAW",
+      insertDataOption: "INSERT_ROWS",
+      requestBody: {
+        values: [...data],
+      },
+    });
   } catch (error) {
     console.error(JSON.stringify(error));
   }