removing all instances of old measure table

Enterprise-CMCS · Sep 20, 2024 · af6c516 · af6c516
1 parent ee41519
commit af6c516
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/services/app-api/handlers/coreSets/delete.ts b/services/app-api/handlers/coreSets/delete.ts
@@ -52,7 +52,7 @@ const deleteDependentMeasures = async (
       TableName: process.env.measureTable!,
       Key: {
         compoundKey: `${state}${year}${coreSet}`,
-        coreSet: coreSet,
+        measure: measure,
       },
     };
 

diff --git a/services/app-api/handlers/measures/tests/create.test.ts b/services/app-api/handlers/measures/tests/create.test.ts
@@ -15,7 +15,6 @@ jest.mock("../../../libs/authorization", () => ({
 }));
 
 const event = { ...testEvent };
-process.env.measureTableName = "SAMPLE TABLE";
 
 describe("Test Create Measure Handler", () => {
   beforeEach(() => {

diff --git a/services/app-api/handlers/measures/tests/get.test.ts b/services/app-api/handlers/measures/tests/get.test.ts
@@ -31,7 +31,6 @@ jest.mock("../../dynamoUtils/convertToDynamoExpressionVars", () => ({
 }));
 
 const event = { ...testEvent };
-process.env.measureTableName = "SAMPLE TABLE";
 process.env.measureTable = "SAMPLE TABLE";
 
 describe("Test Get Measure Handlers", () => {

diff --git a/services/app-api/storage/table.test.ts b/services/app-api/storage/table.test.ts
@@ -61,7 +61,7 @@ const mockCombinedRate = {
 
 describe("Test database helper functions", () => {
   beforeAll(() => {
-    process.env.measureTableName = "local-measures";
+    process.env.measureTable = "local-measure";
     process.env.rateTableName = "local-rates";
   });
 
@@ -72,10 +72,10 @@ describe("Test database helper functions", () => {
 
     expect(result).toBe(mockMeasure);
     expect(dynamodbLib.get).toHaveBeenCalledWith({
-      TableName: "local-measures",
+      TableName: "local-measure",
       Key: {
-        compoundKey: "CO2024ACSZZZ-AD",
-        coreSet: "ACS",
+        compoundKey: "CO2024ACS",
+        measure: "ZZZ-AD",
       },
     });
   });

diff --git a/services/app-api/storage/table.ts b/services/app-api/storage/table.ts
@@ -5,10 +5,10 @@ import { RateParameters, CombinedRatesPayload } from "../types";
 export const getMeasureFromTable = async (parameters: RateParameters) => {
   const { state, year, coreSet, measure } = parameters;
   return await dynamoDb.get<Types.Measure>({
-    TableName: process.env.measureTableName,
+    TableName: process.env.measureTable,
     Key: {
-      compoundKey: `${state}${year}${coreSet}${measure}`,
-      coreSet: coreSet,
+      compoundKey: `${state}${year}${coreSet}`,
+      measure: measure,
     },
   });
 };

diff --git a/services/database/scripts/transformMeasureTable.ts b/services/database/scripts/transformMeasureTable.ts
@@ -6,15 +6,20 @@ import {
 } from "@aws-sdk/lib-dynamodb";
 import prompt from "prompt-sync";
 
+/***
+ * Run with `npx tsx transformMeasureTable.ts`
+ */
 const transformMeasureTable = async () => {
   let stage = "local";
-  const isLocal = !!process.env.DYNAMODB_URL;
-  const dbClient = buildClient(isLocal);
   const p = prompt();
+  const runLocally = p("Do you want to run this script locally? Y/N: ");
+  const isLocal = runLocally === "Y" ? true : false;
   if (!isLocal) {
-    stage = p("What environment would you like to modify: ");
+    stage = p("What environment are we running on (e.g. master, val, prod)? ");
   }
 
+  const dbClient = buildClient(isLocal);
+
   const oldTable = `${stage}-measures`;
   const newTable = `${stage}-measure`;
   console.log(`Processing table ${oldTable}`);

diff --git a/services/uploads/src/dynamoSync/handler.js b/services/uploads/src/dynamoSync/handler.js
@@ -27,7 +27,7 @@ const uploadFileToS3 = async (filePath, scanResult) => {
 
 const syncDynamoToS3 = handler(async (_event, _context) => {
   console.log("Syncing Dynamo to Uploads");
-  const measureResults = await scanAll(process.env.measureTableName);
+  const measureResults = await scanAll(process.env.measureTable);
   const coreSetResults = await scanAll(process.env.coreSetTableName);
   const rateResults = await scanAll(process.env.rateTableName);