Merge pull request #346 from ubc-biztech/dev

Dev
ubc-biztech · Mar 8, 2024 · c2d0efe · c2d0efe
2 parents c26ee74 + cb33228
commit c2d0efe
Show file tree

Hide file tree

Showing 17 changed files with 188 additions and 69 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/services/events/package-lock.json b/services/events/package-lock.json
diff --git a/services/hello/package-lock.json b/services/hello/package-lock.json
diff --git a/services/members/handler.js b/services/members/handler.js
@@ -39,7 +39,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)"
   };

diff --git a/services/members/package-lock.json b/services/members/package-lock.json
diff --git a/services/members/serverless.yml b/services/members/serverless.yml
@@ -87,16 +87,16 @@ functions:
               type: COGNITO_USER_POOLS
               arn: arn:aws:cognito-idp:us-west-2:432714361962:userpool/us-west-2_w0R176hhp
   memberDelete:
-      handler: handler.del
-      events:
-        - http:
-            path: members/{email}
-            method: delete
-            request:
-              path:
-                email: true
-            cors: true
-            authorizer:
-              name: ${self:service}-authorizer
-              type: COGNITO_USER_POOLS
-              arn: arn:aws:cognito-idp:us-west-2:432714361962:userpool/us-west-2_w0R176hhp
+    handler: handler.del
+    events:
+      - http:
+          path: members/{email}
+          method: delete
+          request:
+            path:
+              email: true
+          cors: true
+          authorizer:
+            name: ${self:service}-authorizer
+            type: COGNITO_USER_POOLS
+            arn: arn:aws:cognito-idp:us-west-2:432714361962:userpool/us-west-2_w0R176hhp
diff --git a/services/payments/handler.js b/services/payments/handler.js
@@ -385,15 +385,15 @@ export const cancel = async (event, ctx, callback) => {
   } = data;
   if (paymentType === "Event") {
     try {
-      const eventIDAndYear = eventID + ";" + year;
+      // const eventIDAndYear = eventID + ";" + year;
 
-      const res = await db.deleteOne(email, USER_REGISTRATIONS_TABLE, {
-        ["eventID;year"]: eventIDAndYear
-      });
+      // const res = await db.deleteOne(email, USER_REGISTRATIONS_TABLE, {
+      //   ["eventID;year"]: eventIDAndYear
+      // });
 
       const response = helpers.createResponse(200, {
-        message: "Registration entry Deleted!",
-        response: res
+        message: "Cancel webhook disabled",
+        response: {}
       });
 
       callback(null, response);

diff --git a/services/payments/package-lock.json b/services/payments/package-lock.json
diff --git a/services/prizes/package-lock.json b/services/prizes/package-lock.json
diff --git a/services/qr/package-lock.json b/services/qr/package-lock.json