Merge pull request #208 from mattzcarey/feat/lambda-welcome-email

feat: add welcome email to add user lambda

.github/workflows/pr.yml

@@ -16,6 +16,7 @@ jobs:
       BASE_SHA: ${{ github.event.pull_request.base.sha }}
       GITHUB_SHA: ${{ github.sha }}
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+      CLOUDFLARE_WORKER_HEALTH_URL: ${{ secrets.CLOUDFLARE_WORKER_HEALTH_URL }}
 
     steps:
       - uses: actions/checkout@v2
@@ -35,6 +36,9 @@ jobs:
 
       - name: Run unit tests
         run: npm run test-unit
+
+      - name: Run integration tests
+        run: npm run test-integ
 
       - name: Run prompt tests
         run: npm run test -- --ci=github --model=gpt-3.5-turbo

jest.config.js

@@ -2,4 +2,5 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  testRegex: '/src/.*.test.ts',
 };

package.json

@@ -11,6 +11,7 @@
     "start": "ts-node ./src/index.ts review",
     "test": "ts-node ./src/index.ts test",
     "test-unit": "dotenv -e .env jest",
+    "test-integ": "jest -c services/tests/jest.config.js",
     "build": "node utils/build.js",
     "postbuild": "node utils/shebang.js && chmod +x ./dist/index.js"
   },

services/tests/emailWorker.integ.test.ts

@@ -0,0 +1,13 @@
+import * as dotenv from 'dotenv';
+
+dotenv.config({ path: './services/tests/.env' });
+
+describe("CloudFlare email worker health test", () => {
+  test("Should return 200 after successfully hitting the CloudFlare health endpoint", async() => {
+    const res =  await fetch(process.env.CLOUDFLARE_WORKER_HEALTH_URL ?? "", {
+      method: "GET",
+    });
+
+    expect(res.status).toEqual(200);
+  });
+});

services/tests/jest.config.js

@@ -0,0 +1,6 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testRegex: '/services/tests/.*.integ.test.ts',
+};

services/web-app/README.md

@@ -26,9 +26,11 @@ Open [http://localhost:3000](http://localhost:3000) with your browser to see the
 Involves starting our SST dev environment.
 
 ```bash
-npx sst dev
+npx sst dev --stage <stage>
 ```
 
+Remember to use the same stage for both your SST and CDK stack.
+
 Next in a separate terminal:
 
 ```bash

services/web-app/functions/add-user/index.ts

@@ -0,0 +1,89 @@
+import { DynamoDBStreamEvent } from "aws-lambda";
+import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
+import { PutCommand, DynamoDBDocumentClient } from "@aws-sdk/lib-dynamodb";
+import fetch from "node-fetch";
+import { getVariableFromSSM } from "../../../core/functions/helpers/getVariable";
+import { Config } from "sst/node/config";
+
+const client = new DynamoDBClient({});
+const docClient = DynamoDBDocumentClient.from(client);
+
+const postEmail = async(email: string, name: string) => {
+  const url  = await getVariableFromSSM(process.env.CLOUDFLARE_WORKER_URL_NAME) ?? "";
+  return await fetch(url.concat("api/email"), {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "Authorization": await getVariableFromSSM(
+        process.env.CLOUDFLARE_WORKER_TOKEN_NAME ?? ""
+      ),
+    },
+    body: JSON.stringify({
+      "to": {"email": email, "name": name },
+      "from": { "email": "[email protected]", "name": "Matt from Orion Tools" },
+      "subject": "Welcome to Code Review GPT",
+      "html": "<p>Thanks for signing up for Orion tools. We aim to make the best AI powered dev tools. We hope you enjoy using our code review product. <br/>Here is a <a href=\"https://github.com/mattzcarey/code-review-gpt\">link</a> to the repo, give it a star. Here is a <a href=\"https://join.slack.com/t/orion-tools/shared_invite/zt-20x79nfgm-UGIHK1uWGQ59JQTpODYDwg\">link</a> to our slack community.</p>"
+    }),
+  });
+};
+
+export const main = async (event: DynamoDBStreamEvent) => {
+  if (event.Records == null) {
+    return Promise.resolve({
+      statusCode: 400,
+      body: "The request does not contain a any dynamodb records as expected.",
+    });
+  }
+
+  try {
+    if (event.Records[0].dynamodb?.NewImage) {
+      const record = event.Records[0].dynamodb?.NewImage;
+      const userId = record.id['S'];
+      const name = record.name['S'];
+      const email = record.email['S'];
+      const pictureUrl = record.image['S'];
+
+      if (userId === undefined || name === undefined || email === undefined || pictureUrl === undefined) {
+        return Promise.resolve({
+          statusCode: 400,
+          body: "The request record does not contain the expected data.",
+        });
+      }
+
+      const res = await postEmail(email, name);
+      if (!res.ok) {
+        console.error("Failed to send welcome email due to this status code: ", res.status);
+      }
+
+      const command = new PutCommand({
+        TableName: `${process.env.SST_STAGE}-crgpt-data`,
+        Item: {
+          PK: `USERID#${userId}`,
+          SK: "ROOT",
+          userId: userId,
+          name: name,
+          email: email,
+          pictureUrl: pictureUrl,
+        },
+      });
+      await docClient.send(command);
+
+      return Promise.resolve({
+        statusCode: 200,
+        body: "Successfully added new user to the user db",
+      });
+    } else {
+      return Promise.resolve({
+        statusCode: 400,
+        body: "Dynamodb record did not contain any new users",
+      });
+    }
+  } catch (err) {
+    console.error(err);
+
+    return Promise.resolve({
+      statusCode: 500,
+      body: "Error when updating user.",
+    });
+  }
+};

services/web-app/package.json

@@ -31,6 +31,8 @@
     "typescript": "5.1.6"
   },
   "devDependencies": {
+    "@types/aws-lambda": "^8.10.119",
+    "@types/node-fetch": "^2.6.4",
     "aws-cdk-lib": "2.84.0",
     "constructs": "10.1.156",
     "sst": "^2.22.10"

services/web-app/sst.config.ts

@@ -1,7 +1,6 @@
 import { Tags } from "aws-cdk-lib";
 import { SSTConfig } from "sst";
 import { Config, NextjsSite, Table } from "sst/constructs";
-import { getStage } from '../core/helpers';
 
 export default {
   config(_input) {
@@ -34,11 +33,12 @@ export default {
         consumers: {
           consumer1: {
             function: {
-              handler: "src/functions/add-user/index.main",
-              permissions: ["dynamodb"],
+              handler: "/functions/add-user/index.main",
+              permissions: ["dynamodb", "ssm"],
               environment: {
-                STAGE: getStage(),
-              }
+                CLOUDFLARE_WORKER_TOKEN_NAME: "CLOUDFLARE_WORKER_TOKEN",
+                CLOUDFLARE_WORKER_URL_NAME: "CLOUDFLARE_WORKER_URL",
+              },
             },
             filters: [
               {