feat: get email service to send mail

.vscode/settings.json

@@ -91,6 +91,7 @@
     "Vachel",
     "Vallon",
     "VALLONS",
+    "vendia",
     "virtuals"
   ],
   "[dotenv]": {

common/git-hooks/post-merge

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Check if the merge was successful
 if [ "$1" -eq 0 ]; then

services/email-service/.env.dist

@@ -6,6 +6,7 @@ BASE_URL=
 APP_NAME=email-service
 ENVIROMENT=local
 
+EMAIL_ADDRESS=
 MONGO_DATABASE_URI=
 MONGO_DATABASE_USER=
 MONGO_DATABASE_PASSWORD=

services/email-service/bin/app.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import * as cdk from 'aws-cdk-lib';
-import { EmailServiceStack } from '../stacks/email-service.stack';
+import { MainStack } from '../stacks/main.stack';
 
 const app = new cdk.App();
-new EmailServiceStack(app, 'EmailServiceStack');
+new MainStack(app, 'EmailServiceMainStack');

services/email-service/openapi-spec.json

@@ -1,7 +1,7 @@
 {
   "openapi": "3.0.0",
   "paths": {
-    "/v1/health": {
+    "/health": {
       "get": {
         "operationId": "HealthController_check",
         "parameters": [],
@@ -104,7 +104,7 @@
         }
       }
     },
-    "/v1/email-message/user-account-created": {
+    "/email-message/user-account-created": {
       "post": {
         "operationId": "EmailMessageController_convert",
         "parameters": [
@@ -135,7 +135,7 @@
         "responses": { "201": { "description": "" } }
       }
     },
-    "/v1/email-message/user-forgotten-password-reset": {
+    "/email-message/user-forgotten-password-reset": {
       "post": {
         "operationId": "EmailMessageController_convertUserForgottenPasswordReset",
         "parameters": [
@@ -168,7 +168,7 @@
         "responses": { "201": { "description": "" } }
       }
     },
-    "/v1/email-message/stats": {
+    "/email-message/stats": {
       "get": {
         "operationId": "EmailMessageController_stats",
         "parameters": [],
@@ -183,7 +183,13 @@
     "contact": {}
   },
   "tags": [],
-  "servers": [],
+  "servers": [
+    { "url": "http://localhost:3000", "description": "Local" },
+    {
+      "url": "https://nx7uv2rfy4.execute-api.us-east-2.amazonaws.com/default/v1/email-message/",
+      "description": "Sandbox"
+    }
+  ],
   "components": {
     "schemas": {
       "UserAccountCreatedDto": {

services/email-service/src/index.ts

@@ -1,7 +1,7 @@
 import { NestFactory } from '@nestjs/core';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import serverlessExpress from '@vendia/serverless-express';
-import { ValidationPipe } from '@nestjs/common';
+import { ValidationPipe, VersioningType } from '@nestjs/common';
 import { Context, Handler } from 'aws-lambda';
 import express from 'express';
 
@@ -17,6 +17,11 @@ async function bootstrap() {
       new ExpressAdapter(expressApp),
     );
     app.enableCors();
+    app.enableVersioning({
+      type: VersioningType.HEADER,
+      header: 'Accept-Version',
+      defaultVersion: '1',
+    });
     app.useGlobalPipes(
       new ValidationPipe({
         transform: true,

services/email-service/src/main.ts

@@ -9,28 +9,34 @@ async function bootstrap() {
   const app = await NestFactory.create(AppModule);
 
   app.enableVersioning({
-    type: VersioningType.URI,
+    type: VersioningType.HEADER,
+    header: 'Accept-Version',
     defaultVersion: '1',
   });
 
+  app.useGlobalPipes(
+    new ValidationPipe({
+      transform: true,
+      transformOptions: { enableImplicitConversion: true },
+    }),
+  );
+
   const config = new DocumentBuilder()
     .setTitle('@cats-cradles/email-service')
     .setDescription('An API for the email service')
     .setVersion('1.0')
+    .addServer('http://localhost:3000', 'Local')
+    .addServer(
+      'https://nx7uv2rfy4.execute-api.us-east-2.amazonaws.com/default/v1/email-message/',
+      'Sandbox',
+    )
     .build();
   const document = SwaggerModule.createDocument(app, config);
   SwaggerModule.setup('api', app, document);
 
   // update the openapi-spec
   writeFileSync('./openapi-spec.json', JSON.stringify(document));
 
-  app.useGlobalPipes(
-    new ValidationPipe({
-      transform: true,
-      transformOptions: { enableImplicitConversion: true },
-    }),
-  );
-
   await app.listen(3000);
 }
 bootstrap();

services/email-service/src/models/email-message/email-message.schema.ts

@@ -23,7 +23,11 @@ export class EmailMessage {
   public data?: string;
 
   @IsEnum(StatusType)
-  @Prop()
+  @Prop({
+    type: String,
+    enum: Object.values(StatusType),
+    default: StatusType.OPEN,
+  }) // Use the enum
   public status: StatusType;
 
   @IsDateString()

services/email-service/src/modules/email-message/dto/template.dto.ts

@@ -4,10 +4,6 @@ import { Expose } from 'class-transformer';
 import { kebabCase } from 'lodash';
 
 export abstract class TemplateDto {
-  abstract subject: string;
-
-  abstract fromAddress: string;
-
   @IsEmail()
   @ApiProperty({
     description: 'The email recipient',

services/email-service/src/modules/email-message/dto/user-account-created.dto.ts

@@ -1,13 +1,9 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsString } from 'class-validator';
+import { IsEmail, IsString } from 'class-validator';
 import { Expose } from 'class-transformer';
 import { TemplateDto } from './template.dto';
 
 export class UserAccountCreatedDto extends TemplateDto {
-  readonly subject: 'User Account Created';
-
-  readonly fromAddress = '[email protected]';
-
   @IsString()
   @ApiProperty({
     description: 'The first name of the recipient',

services/email-service/src/modules/email-message/dto/user-forgotten-password-reset.dto.ts

@@ -1,13 +1,9 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsString, IsFQDN } from 'class-validator';
+import { IsString, IsFQDN, IsEmail } from 'class-validator';
 import { Expose } from 'class-transformer';
 import { TemplateDto } from './template.dto';
 
 export class UserForgottenPasswordResetDto extends TemplateDto {
-  readonly subject: 'Forgotten Password Reset';
-
-  readonly fromAddress = '[email protected]';
-
   @IsString()
   @ApiProperty({
     description: 'The username of the recipient',

services/email-service/src/modules/email-message/email-message.controller.ts

@@ -1,5 +1,10 @@
 import {
-  Get, Controller, Post, Body, Query,
+  Get,
+  Controller,
+  Post,
+  Body,
+  Query,
+  VERSION_NEUTRAL,
 } from '@nestjs/common';
 import { ApiBody, ApiQuery } from '@nestjs/swagger';
 import { UserAccountCreatedDto, UserForgottenPasswordResetDto } from './dto';
@@ -11,7 +16,7 @@ import { ActionType } from '../../models/email-message/action.type';
 import { EngineService } from './engine.service';
 import { QueueService } from './queue.service';
 
-@Controller({ path: 'email-message', version: ['1'] })
+@Controller({ path: 'email-message', version: ['1', VERSION_NEUTRAL] })
 export class EmailMessageController {
   constructor(
     private _engineService: EngineService,
@@ -25,11 +30,16 @@ export class EmailMessageController {
     @Body() data: UserAccountCreatedDto,
       @Query('action') action: ActionType,
   ): Promise<any> {
+    const defaultData = {
+      subject: 'Forgotten Password Reset',
+      fromAddress: '[email protected]',
+    };
+
     return this._engineService.process(
       action,
       UserAccountCreatedDto.slug,
       UserAccountCreatedTemplate,
-      data,
+      { ...data, ...defaultData },
     );
   }
 
@@ -40,11 +50,16 @@ export class EmailMessageController {
     @Body() data: UserForgottenPasswordResetDto,
       @Query('action') action: ActionType,
   ): Promise<any> {
+    const defaultData = {
+      subject: 'User Account Created',
+      fromAddress: '[email protected]',
+    };
+
     return this._engineService.process(
       action,
       UserForgottenPasswordResetDto.slug,
       UserForgottenPasswordResetTemplate,
-      data,
+      { ...data, ...defaultData },
     );
   }
 

services/email-service/src/modules/health/health.controller.ts

@@ -1,7 +1,7 @@
-import { Controller, Get } from '@nestjs/common';
+import { Controller, Get, VERSION_NEUTRAL } from '@nestjs/common';
 import { HealthCheckService, HealthCheck } from '@nestjs/terminus';
 
-@Controller('health')
+@Controller({ path: 'health', version: ['1', VERSION_NEUTRAL] })
 export class HealthController {
   constructor(private health: HealthCheckService) {}