Changes to email again

Author: shaply

packages/db-service/src/modules/email/email.controller.ts

@@ -56,12 +56,7 @@ export class EmailController implements EmailDbServiceController {
       environment: config.environment,
       sendgridKey: config.sendgridApiKey,
       senders: [],
-      domains: (config.domains ?? []).map((d) => ({
-        domain: d.domain.domain,
-        subdomain: d.domain.subdomain,
-        sendgridId: d.domain.sendgridId,
-        projects: [],
-      })),
+      domains: [],
     };
   }
 

packages/db-service/src/modules/email/email.service.ts

@@ -158,16 +158,9 @@ export class EmailService {
 
   async getEmailServiceConfig(
     input: Prisma.EmailServiceConfigWhereUniqueInput,
-  ) {
+  ): Promise<EmailServiceConfig> {
     return this.prisma.emailServiceConfig.findUnique({
       where: input,
-      include: {
-        domains: {
-          include: {
-            domain: true,
-          },
-        },
-      },
     });
   }
 

packages/email-service/src/modules/email/email.service.ts

@@ -15,6 +15,10 @@ const { EMAIL_DB_SERVICE_NAME } = EmailProto;
 @Injectable()
 export class EmailService implements OnModuleInit {
   private emailService: EmailProto.EmailDbServiceClient;
+  private testDomains: Map<
+    string,
+    EmailProto.AuthenticatedDomain[]
+  > = new Map();
   constructor(@Inject(EMAIL_DB_SERVICE_NAME) private emailClient: ClientGrpc) {}
 
   onModuleInit() {
@@ -71,13 +75,26 @@ export class EmailService implements OnModuleInit {
     const sendGridUrl = 'https://api.sendgrid.com/v3/whitelabel/domains';
 
     if (process.env['NODE_ENV'] == 'test') {
-      await lastValueFrom(this.emailService.createEmailDomain({
+      const configKey = `${req.configId}:${req.configEnvironment}`;
+      const domains = this.testDomains.get(configKey) ?? [];
+      domains.push({
+        id: 0,
         domain: req.domain,
-        subdomain: req.subdomain,
-        sendgridId: 0,
-        configId: req.configId,
-        configEnvironment: req.configEnvironment,
-      }));
+        subdomain: req.subdomain ?? undefined,
+        valid: false,
+      });
+      this.testDomains.set(configKey, domains);
+
+      lastValueFrom(
+        this.emailService.createEmailDomain({
+          domain: req.domain,
+          subdomain: req.subdomain,
+          sendgridId: 0,
+          configId: req.configId,
+          configEnvironment: req.configEnvironment,
+        }),
+      ).catch(() => {});
+
       return {
         statusCode: 201,
         id: 0,
@@ -390,13 +407,9 @@ export class EmailService implements OnModuleInit {
     }
 
     if (process.env['NODE_ENV'] == 'test') {
+      const configKey = `${req.configId}:${req.configEnvironment}`;
       return {
-        domains: (config.domains ?? []).map((d) => ({
-          id: d.sendgridId,
-          domain: d.domain,
-          subdomain: d.subdomain ?? undefined,
-          valid: false,
-        })),
+        domains: this.testDomains.get(configKey) ?? [],
       };
     }