BRS-161: Expiry EventBridge fix (#29)

bcgov · Nov 20, 2021 · 32907fb · 32907fb
1 parent 8ee58d8
commit 32907fb
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 68 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,4 @@
+## DUP Pass state diagram
+The following is the state diagram for passes:
+
+![Pass State Diagram](https://raw.github.com/bcgov/parks-reso-api/main/docs/StateDiagramForPasses.svg)
diff --git a/docs/StateDiagramForPasses.svg b/docs/StateDiagramForPasses.svg
diff --git a/lambda/checkActivation/index.js b/lambda/checkActivation/index.js
@@ -9,7 +9,7 @@ exports.handler = async (event, context) => {
   };
 
   // Look for today's activations
-  let todaysDate = formatDate(new Date());
+  let todaysDate = new Date().toISOString().split('T')[0];
 
   try {
     queryObj.ExpressionAttributeValues = {};
@@ -45,14 +45,3 @@ exports.handler = async (event, context) => {
     return sendResponse(200, { msg: 'Activation Check Complete' }, context);
   }
 };
-
-function formatDate(d) {
-  let month = '' + (d.getMonth() + 1),
-    day = '' + d.getDate(),
-    year = d.getFullYear();
-
-  if (month.length < 2) month = '0' + month;
-  if (day.length < 2) day = '0' + day;
-
-  return [year, month, day].join('-');
-}
diff --git a/lambda/checkExpiry/index.js b/lambda/checkExpiry/index.js
@@ -2,61 +2,48 @@ const { runQuery, setStatus } = require('../dynamoUtil');
 const { sendResponse } = require('../responseUtil');
 
 exports.handler = async (event, context) => {
-    console.log('check expiry', event);
-
-    let queryObj = {
-      TableName: process.env.TABLE_NAME
-    };
-
-    // Look for today's expiries
-    let yesterdaysDate = formatDate(new Date())
-
-    try {
-      queryObj.ExpressionAttributeValues = {};
-      queryObj.ExpressionAttributeValues[':pk'] = { S: 'park' };
-      queryObj.KeyConditionExpression = 'pk =:pk';
-      console.log("queryObj:", queryObj);
-
-      const parkData = await runQuery(queryObj);
-
-      for(let i=0;i < parkData.length;i++) {
-        let passQuery = {
-          TableName: process.env.TABLE_NAME
-        };
-        passQuery.ExpressionAttributeNames = {
-          '#dateselector': 'date'
-        };
-        passQuery.ExpressionAttributeValues = {};
-        passQuery.ExpressionAttributeValues[':pk'] = { S: 'pass::' + parkData[i].sk };
-        passQuery.ExpressionAttributeValues[':yesterdaysDate'] = { S: yesterdaysDate };
-        passQuery.ExpressionAttributeValues[':reservedStatus'] = { S: 'reserved' };
-        passQuery.KeyConditionExpression = 'pk =:pk';
-        passQuery.FilterExpression = 'begins_with(#dateselector, :yesterdaysDate) AND passStatus =:reservedStatus';
-
-        console.log("passQuery:", passQuery);
-        const passData = await runQuery(passQuery);
-        console.log("passData:", passData);
-
-        await setStatus(passData, 'expired');
-      }
-      return sendResponse(200, {}, context);
-    } catch (err) {
-      console.log(err);
-      return sendResponse(200, {msg: 'Activation Check Complete'}, context);
+  console.log('check expiry', event);
+
+  let queryObj = {
+    TableName: process.env.TABLE_NAME
+  };
+
+  // Look for today's expiries
+  let yd = new Date();
+  yd.setDate(yd.getDate() - 1);
+  const yesterdaysDate = yd.toISOString().split('T')[0];
+
+  try {
+    queryObj.ExpressionAttributeValues = {};
+    queryObj.ExpressionAttributeValues[':pk'] = { S: 'park' };
+    queryObj.KeyConditionExpression = 'pk =:pk';
+    console.log("queryObj:", queryObj);
+
+    const parkData = await runQuery(queryObj);
+
+    for (let i = 0; i < parkData.length; i++) {
+      let passQuery = {
+        TableName: process.env.TABLE_NAME
+      };
+      passQuery.ExpressionAttributeNames = {
+        '#dateselector': 'date'
+      };
+      passQuery.ExpressionAttributeValues = {};
+      passQuery.ExpressionAttributeValues[':pk'] = { S: 'pass::' + parkData[i].sk };
+      passQuery.ExpressionAttributeValues[':yesterdaysDate'] = { S: yesterdaysDate };
+      passQuery.ExpressionAttributeValues[':activeStatus'] = { S: 'active' };
+      passQuery.KeyConditionExpression = 'pk =:pk';
+      passQuery.FilterExpression = 'begins_with(#dateselector, :yesterdaysDate) AND passStatus =:activeStatus';
+
+      console.log("passQuery:", passQuery);
+      const passData = await runQuery(passQuery);
+      console.log("passData:", passData);
+
+      await setStatus(passData, 'expired');
     }
+    return sendResponse(200, {}, context);
+  } catch (err) {
+    console.log(err);
+    return sendResponse(200, { msg: 'Activation Check Complete' }, context);
+  }
 }
-
-
-
-function formatDate(d) {
-  let month = '' + (d.getMonth() + 1),
-      day = '' + (d.getDate() - 1), // We need yesterday's date to check for moving active -> expired
-      year = d.getFullYear();
-
-  if (month.length < 2)
-      month = '0' + month;
-  if (day.length < 2) 
-      day = '0' + day;
-
-  return [year, month, day].join('-');
-}