Merge pull request #8 from es92/one-submission-per-email-option

add option for one submission per email

Author: Onurbon

dist/googlesheet.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.fetchSpreadsheetData = fetchSpreadsheetData;
 var _axios = _interopRequireDefault(require("axios"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-async function fetchSpreadsheetData(url, pieChartColumnNames = [], filterEmails) {
+async function fetchSpreadsheetData(url, pieChartColumnNames = [], filterEmails, oneSubmissionPerEmail) {
   // extract the spreadsheet id from the url
   const regex = /\/spreadsheets\/d\/([a-zA-Z0-9-_]+)/;
   const matches = url.match(regex);
@@ -22,11 +22,12 @@ async function fetchSpreadsheetData(url, pieChartColumnNames = [], filterEmails)
   // extract the columns and rows
   const columns = json.table.cols.map(x => x.label);
   let rows = json.table.rows.map(x => x.c.map(y => y?.v));
+  const emailColumn = columns.indexOf("Email Address");
 
   // filter out rows with forbidden email addresses
   if (filterEmails) {
     rows = rows.filter(row => {
-      const email = row[columns.indexOf("Email Address")];
+      const email = row[emailColumn];
       return filterEmails.includes(email);
     });
   }
@@ -63,15 +64,24 @@ async function fetchSpreadsheetData(url, pieChartColumnNames = [], filterEmails)
       }))
     };
   });
-
-  // extract the comments
-  const data = rows.map((row, id) => ({
-    id: String(id),
-    comment: commentColumns.map(({
-      name,
-      index
-    }) => `> ${name}\n\n${row[index] || "(not answered)"}`).join("\n\n")
-  }));
+  const emailToData = {};
+  rows.forEach((row, id) => {
+    emailToData[row[emailColumn]] ??= [];
+    emailToData[row[emailColumn]].push({
+      id: String(id),
+      comment: commentColumns.map(({
+        name,
+        index
+      }) => `> ${name}\n\n${row[index] || "(not answered)"}`).join("\n\n")
+    });
+  });
+  let data;
+  if (oneSubmissionPerEmail) {
+    data = Object.values(emailToData).map(v => v[v.length - 1]);
+  } else {
+    data = Object.values(emailToData).flat();
+  }
+  console.log(data);
   return {
     data,
     pieCharts

dist/server.js

@@ -25,10 +25,11 @@ app.post("/generate", async (req, res) => {
       const {
         data,
         pieCharts
-      } = await (0, _googlesheet.fetchSpreadsheetData)(config.googleSheet.url, config.googleSheet.pieChartColumns, config.googleSheet.filterEmails);
+      } = await (0, _googlesheet.fetchSpreadsheetData)(config.googleSheet.url, config.googleSheet.pieChartColumns, config.googleSheet.filterEmails, config.googleSheet.oneSubmissionPerEmail);
       config.data = (0, _utils.formatData)(data);
       config.pieCharts = pieCharts;
     }
+    throw new Error('test');
     if (!config.data) {
       throw new Error("Missing data");
     }

src/googlesheet.ts

@@ -4,7 +4,8 @@ import { SourceRow, PieChart } from "./types";
 export async function fetchSpreadsheetData(
   url: string,
   pieChartColumnNames: string[] = [],
-  filterEmails?: string[]
+  filterEmails?: string[],
+  oneSubmissionPerEmail?: boolean
 ): Promise<{ data: SourceRow[]; pieCharts: PieChart[] }> {
   // extract the spreadsheet id from the url
   const regex = /\/spreadsheets\/d\/([a-zA-Z0-9-_]+)/;
@@ -24,10 +25,12 @@ export async function fetchSpreadsheetData(
     x.c.map((y: any) => y?.v)
   );
 
+  const emailColumn = columns.indexOf("Email Address")
+
   // filter out rows with forbidden email addresses
   if (filterEmails) {
     rows = rows.filter((row) => {
-      const email = row[columns.indexOf("Email Address")];
+      const email = row[emailColumn];
       return filterEmails.includes(email);
     });
   }
@@ -57,14 +60,26 @@ export async function fetchSpreadsheetData(
   });
 
   // extract the comments
-  const data = rows.map((row, id) => ({
-    id: String(id),
-    comment: commentColumns
-      .map(
-        ({ name, index }) => `> ${name}\n\n${row[index] || "(not answered)"}`
-      )
-      .join("\n\n"),
-  }));
+  const emailToData = {};
+
+  rows.forEach((row, id) => {
+    emailToData[row[emailColumn]] ??= [];
+    emailToData[row[emailColumn]].push({
+      id: String(id),
+      comment: commentColumns
+        .map(
+          ({ name, index }) => `> ${name}\n\n${row[index] || "(not answered)"}`
+        )
+        .join("\n\n"),
+    });
+  });
+
+  let data;
+  if (oneSubmissionPerEmail) {
+    data = Object.values(emailToData).map((v) => v[v.length-1])
+  } else {
+    data = Object.values(emailToData).flat();
+  }
 
   return { data, pieCharts };
 }

src/server.ts

@@ -24,7 +24,8 @@ app.post("/generate", async (req, res) => {
       const { data, pieCharts } = await fetchSpreadsheetData(
         config.googleSheet.url,
         config.googleSheet.pieChartColumns,
-        config.googleSheet.filterEmails
+        config.googleSheet.filterEmails,
+        config.googleSheet.oneSubmissionPerEmail,
       );
       config.data = formatData(data);
       config.pieCharts = pieCharts;