chore: add more logging

theapexlab · Oct 25, 2023 · 0c8fdd0 · 0c8fdd0
1 parent c505765
commit 0c8fdd0
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -68,7 +68,7 @@ jobs:
 
       - name: Set secrets
         run: |
-          npx sst secrets set SLACK_LOG_LEVEL debug --stage ${{ env.STAGE }}
+          npx sst secrets set SLACK_LOG_LEVEL "${{ secrets.SLACK_LOG_LEVEL_TEST }}" --stage ${{ env.STAGE }}
           npx sst secrets set SLACK_BOT_TOKEN "${{ secrets.SLACK_BOT_TOKEN_TEST }}" --stage ${{ env.STAGE }}
           npx sst secrets set SLACK_SIGNING_SECRET "${{ secrets.SLACK_SIGNING_SECRET_TEST }}" --stage ${{ env.STAGE }}
           npx sst secrets set CORE_SLACK_CHANNEL_ID "${{ secrets.CORE_SLACK_CHANNEL_ID_TEST }}" --stage ${{ env.STAGE }}

diff --git a/package.json b/package.json
@@ -33,7 +33,6 @@
     "@typescript-eslint/parser": "^6.7.5",
     "aws-cdk-lib": "2.95.1",
     "constructs": "10.2.69",
-    "dotenv": "^16.3.1",
     "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-define-config": "^1.24.1",

diff --git a/packages/functions/events/askBirthday.ts b/packages/functions/events/askBirthday.ts
@@ -4,9 +4,12 @@ import { handleEvent } from "@/utils/eventBridge/handleEvent";
 
 export const handler = handleEvent("askBirthday", async ({ user, eventId }) => {
   try {
+    console.log(`ASK_BIRTHDAY: ${user} ${eventId}`);
+
     const userInfo = await getUserInfo(user);
 
     if (!userInfo.user || userInfo.user.is_bot) {
+      console.log("ASK_BIRTHDAY: User is a bot, ignoring");
       return;
     }
 

diff --git a/packages/functions/events/botJoined.ts b/packages/functions/events/botJoined.ts
@@ -6,6 +6,8 @@ export const handler = handleEvent(
   "botJoined",
   async ({ channel, eventId }) => {
     try {
+      console.log(`BOT_JOINED: ${channel} ${eventId}`);
+
       const users = await getChannelMembers(channel);
 
       for (const user of users) {

diff --git a/packages/functions/events/memberJoinedChannel.ts b/packages/functions/events/memberJoinedChannel.ts
@@ -7,7 +7,14 @@ import { publishEvent } from "@/utils/eventBridge/publishEvent";
 
 export const handler = handleEvent("memberJoinedChannel", async (event) => {
   try {
+    console.log(
+      `MEMBER_JOINED_CHANNEL: ${event.channel} ${event.user} ${event.eventId}`,
+    );
+
     if (event.channel !== Config.CORE_SLACK_CHANNEL_ID) {
+      console.log(
+        `MEMBER_JOINED_CHANNEL: Ignoring event from channel ${event.channel}`,
+      );
       return;
     }
 

diff --git a/packages/functions/utils/eventBridge/publishEvent.ts b/packages/functions/utils/eventBridge/publishEvent.ts
@@ -10,8 +10,10 @@ const client = new EventBridgeClient({});
 export const publishEvent = <T extends EventType>(
   event: T,
   payload: Events[T],
-) =>
-  client.send(
+) => {
+  console.log("Publishing event", event, payload);
+
+  return client.send(
     new PutEventsCommand({
       Entries: [
         {
@@ -23,3 +25,4 @@ export const publishEvent = <T extends EventType>(
       ],
     }),
   );
+};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/slackEvents.test.ts b/tests/integration/slackEvents.test.ts
@@ -53,7 +53,7 @@ describe("Slack events", () => {
     expect(chat.messages![0].text).toEqual(
       "Please share your birthday with us! :birthday:",
     );
-  }, 20_000);
+  }, 60_000);
 
   it("Should send DM to all users when bot joins the channel", async () => {
     const eventId = "E002";
@@ -74,5 +74,5 @@ describe("Slack events", () => {
     expect(chat.messages![0].text).toEqual(
       "Please share your birthday with us! :birthday:",
     );
-  }, 20_000);
+  }, 60_000);
 });
diff --git a/tests/utils/waitForDm.ts b/tests/utils/waitForDm.ts
@@ -30,7 +30,7 @@ export const waitForDm = async (app: App, eventId: string) =>
       return chat;
     },
     {
-      timeout: 15_000,
+      timeout: 60_000,
       interval: 1_000,
     },
   );