From a533b3fb421895b7de446042e23d1273707e321e Mon Sep 17 00:00:00 2001 From: Hyunzee Date: Sat, 25 Feb 2023 20:10:26 -0800 Subject: [PATCH 1/4] Sending email test --- .../implementations/__tests__/sendEmail.test.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 backend/typescript/services/implementations/__tests__/sendEmail.test.ts diff --git a/backend/typescript/services/implementations/__tests__/sendEmail.test.ts b/backend/typescript/services/implementations/__tests__/sendEmail.test.ts new file mode 100644 index 0000000..9c00af2 --- /dev/null +++ b/backend/typescript/services/implementations/__tests__/sendEmail.test.ts @@ -0,0 +1,11 @@ +import EmailService from "../emailService"; +import IEmailService from "../../interfaces/emailService"; +import nodemailerConfig from "../../../nodemailer.config"; + +const emailService: IEmailService = new EmailService(nodemailerConfig); + +describe("sendEmail", () => { + it("sendEmail", async () => { + await emailService.sendEmail("hyunzeekim@uwblueprint.org", "test", "testing"); + }); +}); From 11aeb1444923a15dff70f1fbf376b8b2323dadb3 Mon Sep 17 00:00:00 2001 From: aaggarwal10 Date: Sat, 25 Feb 2023 21:11:34 -0800 Subject: [PATCH 2/4] Email Test Passes --- backend/typescript/models/user.model.ts | 2 +- backend/typescript/nodemailer.config.ts | 2 ++ backend/typescript/package.json | 2 +- .../services/implementations/__tests__/sendEmail.test.ts | 6 +++++- backend/typescript/yarn.lock | 7 ++++++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/backend/typescript/models/user.model.ts b/backend/typescript/models/user.model.ts index 051764f..3cb36ce 100644 --- a/backend/typescript/models/user.model.ts +++ b/backend/typescript/models/user.model.ts @@ -15,7 +15,7 @@ export default class User extends Model { @Column({ type: DataType.STRING }) auth_id!: string; - @Column({ type: DataType.INTEGER }) + @Column({ type: DataType.INTEGER, primaryKey: true }) id!: number; @Column({ type: DataType.ENUM("User", "Admin") }) diff --git a/backend/typescript/nodemailer.config.ts b/backend/typescript/nodemailer.config.ts index 35ddd37..4e1dc02 100644 --- a/backend/typescript/nodemailer.config.ts +++ b/backend/typescript/nodemailer.config.ts @@ -1,5 +1,7 @@ +import dotenv from "dotenv"; import { NodemailerConfig } from "./types"; +dotenv.config(); const config: NodemailerConfig = { service: "gmail", auth: { diff --git a/backend/typescript/package.json b/backend/typescript/package.json index fbb1954..314b7f3 100644 --- a/backend/typescript/package.json +++ b/backend/typescript/package.json @@ -24,7 +24,7 @@ "apollo-server-express": "^2.22.2", "cookie-parser": "^1.4.5", "cors": "^2.8.5", - "dotenv": "^8.2.0", + "dotenv": "^16.0.3", "express": "^4.17.1", "firebase-admin": "^9.5.0", "graphql": "^15.5.0", diff --git a/backend/typescript/services/implementations/__tests__/sendEmail.test.ts b/backend/typescript/services/implementations/__tests__/sendEmail.test.ts index 9c00af2..f31a2d0 100644 --- a/backend/typescript/services/implementations/__tests__/sendEmail.test.ts +++ b/backend/typescript/services/implementations/__tests__/sendEmail.test.ts @@ -6,6 +6,10 @@ const emailService: IEmailService = new EmailService(nodemailerConfig); describe("sendEmail", () => { it("sendEmail", async () => { - await emailService.sendEmail("hyunzeekim@uwblueprint.org", "test", "testing"); + await emailService.sendEmail( + "hyunzeekim@uwblueprint.org", + "test", + "testing", + ); }); }); diff --git a/backend/typescript/yarn.lock b/backend/typescript/yarn.lock index f8d4985..37c3d97 100644 --- a/backend/typescript/yarn.lock +++ b/backend/typescript/yarn.lock @@ -2655,11 +2655,16 @@ dot-prop@^5.2.0: dependencies: is-obj "^2.0.0" -dotenv@*, dotenv@^8.2.0: +dotenv@*: version "8.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== +dotenv@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" + integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== + dottie@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154" From 904994283d290bcf86d5b3794db9f01f59c80fce Mon Sep 17 00:00:00 2001 From: Hyunzee Date: Sat, 11 Mar 2023 12:07:52 -0800 Subject: [PATCH 3/4] Remove detect open handles --- backend/typescript/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/typescript/package.json b/backend/typescript/package.json index 314b7f3..cd06eb6 100644 --- a/backend/typescript/package.json +++ b/backend/typescript/package.json @@ -4,7 +4,7 @@ "description": "", "main": "server.ts", "scripts": { - "test": "jest --runInBand --forceExit --detectOpenHandles", + "test": "jest --runInBand --forceExit", "dev": "nodemon -L", "lint": "eslint . --ext .ts,.js", "fix": "eslint . --ext .ts,.js --fix", From 4c97ce1dc82959355c459684dd2f2af280323709 Mon Sep 17 00:00:00 2001 From: Hyunzee Date: Sat, 11 Mar 2023 12:17:31 -0800 Subject: [PATCH 4/4] Update test --- .../services/implementations/__tests__/sendEmail.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/typescript/services/implementations/__tests__/sendEmail.test.ts b/backend/typescript/services/implementations/__tests__/sendEmail.test.ts index f31a2d0..2a95ca3 100644 --- a/backend/typescript/services/implementations/__tests__/sendEmail.test.ts +++ b/backend/typescript/services/implementations/__tests__/sendEmail.test.ts @@ -8,8 +8,8 @@ describe("sendEmail", () => { it("sendEmail", async () => { await emailService.sendEmail( "hyunzeekim@uwblueprint.org", - "test", - "testing", + "Test subject", + "Test body", ); }); });