From 64932aaa9c66c85e147bd8aa2747290d2a3faec1 Mon Sep 17 00:00:00 2001 From: steven huang <114288160+stevenh17@users.noreply.github.com> Date: Sat, 7 Oct 2023 19:13:53 -0700 Subject: [PATCH 1/4] Can see different tables now with ugly dropdown --- services/members/handler.js | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/services/members/handler.js b/services/members/handler.js index 35a32302..644f09a8 100644 --- a/services/members/handler.js +++ b/services/members/handler.js @@ -7,6 +7,12 @@ import docClient from "../../lib/docClient"; const { MEMBERS2024_TABLE } = require("../../constants/tables"); +const { + MEMBERS2022_TABLE +} = require("../../constants/tables"); +const { + MEMBERSHIPS2021_TABLE +} = require("../../constants/tables"); export const create = async (event, ctx, callback) => { const timestamp = new Date().getTime(); @@ -39,7 +45,7 @@ export const create = async (event, ctx, callback) => { updatedAt: timestamp }, TableName: - MEMBERS2024_TABLE + + MEMBERS2024_TABLE + (process.env.ENVIRONMENT ? process.env.ENVIRONMENT : ""), ConditionExpression: "attribute_not_exists(id)" }; @@ -95,7 +101,23 @@ export const get = async (event, ctx, callback) => { export const getAll = async (event, ctx, callback) => { try { // scan the table - const members = await db.scan(MEMBERS2024_TABLE); + const year = event.queryStringParameters.year; + + // Get the table name based on the year from query param + let tableName; + switch (year) { + case "2021": + tableName = MEMBERSHIPS2021_TABLE; + break; + case "2022": + tableName = MEMBERS2022_TABLE; + break; + case "2024": + tableName = MEMBERS2024_TABLE; + break; + } + const members = await db.scan(tableName); + // const members = await db.scan(MEMBERS2024_TABLE); // re-organize the response let response = { From 07d308a131d17aced39e1d13b4a046678a96eb74 Mon Sep 17 00:00:00 2001 From: steven huang <114288160+stevenh17@users.noreply.github.com> Date: Thu, 12 Oct 2023 19:44:55 -0700 Subject: [PATCH 2/4] Added 2023 membership table --- constants/tables.js | 1 + services/members/handler.js | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/constants/tables.js b/constants/tables.js index e9be69b1..ed3f27f1 100644 --- a/constants/tables.js +++ b/constants/tables.js @@ -1,6 +1,7 @@ export const EVENTS_TABLE = "biztechEvents"; export const MEMBERSHIPS2021_TABLE = "biztechMemberships2021"; export const MEMBERS2022_TABLE = "biztechMembers2022"; +export const MEMBERS2023_TABLE = "biztechMembers2023" export const MEMBERS2024_TABLE = "biztechMembers2024"; export const PRIZES_TABLE = "biztechPrizes"; export const STICKERS_TABLE = "biztechStickers"; diff --git a/services/members/handler.js b/services/members/handler.js index 644f09a8..d4633fc9 100644 --- a/services/members/handler.js +++ b/services/members/handler.js @@ -7,6 +7,9 @@ import docClient from "../../lib/docClient"; const { MEMBERS2024_TABLE } = require("../../constants/tables"); +const { + MEMBERS2023_TABLE +} = require("../../constants/tables"); const { MEMBERS2022_TABLE } = require("../../constants/tables"); @@ -106,15 +109,18 @@ export const getAll = async (event, ctx, callback) => { // Get the table name based on the year from query param let tableName; switch (year) { - case "2021": - tableName = MEMBERSHIPS2021_TABLE; - break; - case "2022": - tableName = MEMBERS2022_TABLE; - break; - case "2024": - tableName = MEMBERS2024_TABLE; - break; + case "2021": + tableName = MEMBERSHIPS2021_TABLE; + break; + case "2022": + tableName = MEMBERS2022_TABLE; + break; + case "2023": + tableName = MEMBERS2023_TABLE; + break; + case "2024": + tableName = MEMBERS2024_TABLE; + break; } const members = await db.scan(tableName); // const members = await db.scan(MEMBERS2024_TABLE); From 73cdfea2afb29e0a1f5358203a0377559dbb64c5 Mon Sep 17 00:00:00 2001 From: steven huang <114288160+stevenh17@users.noreply.github.com> Date: Sun, 22 Oct 2023 17:15:42 -0700 Subject: [PATCH 3/4] idk why needs to commit again --- constants/tables.js | 2 +- services/members/handler.js | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/constants/tables.js b/constants/tables.js index ed3f27f1..4396dc2b 100644 --- a/constants/tables.js +++ b/constants/tables.js @@ -1,7 +1,7 @@ export const EVENTS_TABLE = "biztechEvents"; export const MEMBERSHIPS2021_TABLE = "biztechMemberships2021"; export const MEMBERS2022_TABLE = "biztechMembers2022"; -export const MEMBERS2023_TABLE = "biztechMembers2023" +export const MEMBERS2023_TABLE = "biztechMembers2023"; export const MEMBERS2024_TABLE = "biztechMembers2024"; export const PRIZES_TABLE = "biztechPrizes"; export const STICKERS_TABLE = "biztechStickers"; diff --git a/services/members/handler.js b/services/members/handler.js index d4633fc9..ab843063 100644 --- a/services/members/handler.js +++ b/services/members/handler.js @@ -109,18 +109,18 @@ export const getAll = async (event, ctx, callback) => { // Get the table name based on the year from query param let tableName; switch (year) { - case "2021": - tableName = MEMBERSHIPS2021_TABLE; - break; - case "2022": - tableName = MEMBERS2022_TABLE; - break; - case "2023": - tableName = MEMBERS2023_TABLE; - break; - case "2024": - tableName = MEMBERS2024_TABLE; - break; + case "2021": + tableName = MEMBERSHIPS2021_TABLE; + break; + case "2022": + tableName = MEMBERS2022_TABLE; + break; + case "2023": + tableName = MEMBERS2023_TABLE; + break; + case "2024": + tableName = MEMBERS2024_TABLE; + break; } const members = await db.scan(tableName); // const members = await db.scan(MEMBERS2024_TABLE); From 5684a576fcace12bd13101eed14ccc19e1262e35 Mon Sep 17 00:00:00 2001 From: steven huang <114288160+stevenh17@users.noreply.github.com> Date: Thu, 23 Nov 2023 16:51:48 -0800 Subject: [PATCH 4/4] included environemnt in query --- services/members/handler.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/services/members/handler.js b/services/members/handler.js index ab843063..784df0b9 100644 --- a/services/members/handler.js +++ b/services/members/handler.js @@ -110,18 +110,27 @@ export const getAll = async (event, ctx, callback) => { let tableName; switch (year) { case "2021": - tableName = MEMBERSHIPS2021_TABLE; + tableName = + MEMBERSHIPS2021_TABLE + + (process.env.ENVIRONMENT ? process.env.ENVIRONMENT : ""); break; case "2022": - tableName = MEMBERS2022_TABLE; + tableName = + MEMBERS2022_TABLE + + (process.env.ENVIRONMENT ? process.env.ENVIRONMENT : ""); break; case "2023": - tableName = MEMBERS2023_TABLE; + tableName = + MEMBERS2023_TABLE + + (process.env.ENVIRONMENT ? process.env.ENVIRONMENT : ""); break; case "2024": - tableName = MEMBERS2024_TABLE; + tableName = + MEMBERS2024_TABLE + + (process.env.ENVIRONMENT ? process.env.ENVIRONMENT : ""); break; } + const members = await db.scan(tableName); // const members = await db.scan(MEMBERS2024_TABLE);