From bd2518bb3825cd70d2f47c3810970e6f9a671e04 Mon Sep 17 00:00:00 2001
From: Vins <vincent.alamelle@smart-chain.fr>
Date: Tue, 25 Jul 2023 10:04:26 +0200
Subject: [PATCH] Set mailchimp api key correctly

---
 src/common/config/variables/Variables.ts                 | 4 ++++
 src/services/common/MailchimpService/MailchimpService.ts | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/common/config/variables/Variables.ts b/src/common/config/variables/Variables.ts
index 41ee2912..d391818e 100644
--- a/src/common/config/variables/Variables.ts
+++ b/src/common/config/variables/Variables.ts
@@ -60,6 +60,9 @@ export class BackendVariables {
 	@IsNotEmpty()
 	public readonly REFRESH_TOKEN_SECRET!: string;
 
+	@IsNotEmpty()
+	public readonly MAILCHIMP_API_KEY!: string;
+
 	public constructor() {
 		dotenv.config();
 		this.DATABASE_PORT = process.env["DATABASE_PORT"]!;
@@ -80,6 +83,7 @@ export class BackendVariables {
 		this.PINATA_GATEWAY = process.env["PINATA_GATEWAY"]!;
 		this.ACCESS_TOKEN_SECRET = process.env["ACCESS_TOKEN_SECRET"]!;
 		this.REFRESH_TOKEN_SECRET = process.env["REFRESH_TOKEN_SECRET"]!;
+		this.MAILCHIMP_API_KEY = process.env["MAILCHIMP_API_KEY"]!;
 	}
 	public async validate(groups?: string[]) {
 		const validationOptions = groups ? { groups } : undefined;
diff --git a/src/services/common/MailchimpService/MailchimpService.ts b/src/services/common/MailchimpService/MailchimpService.ts
index f3a8e11b..a14b0b9b 100644
--- a/src/services/common/MailchimpService/MailchimpService.ts
+++ b/src/services/common/MailchimpService/MailchimpService.ts
@@ -3,13 +3,13 @@ import BaseService from "@Services/BaseService";
 import { Emails } from "@prisma/client";
 import { Service } from "typedi";
 import MailchimpClient from "@mailchimp/mailchimp_transactional";
+import { BackendVariables } from "@Common/config/variables/Variables";
 
 @Service()
 export default class MailchimpService extends BaseService {
-	// private static readonly mailchimp = new Mailchimp(process.env.MAILCHIMP_API_KEY);
 	private static readonly from = "vincent.alamelle@smart-chain.fr";
 
-	constructor(private emailRepository: EmailRepository) {
+	constructor(private emailRepository: EmailRepository, protected variables: BackendVariables) {
 		super();
 	}
 
@@ -84,7 +84,7 @@ export default class MailchimpService extends BaseService {
 	}
 
 	private async sendEmail(email: Emails) {
-		const apiKey = process.env["MAILCHIMP_API_KEY"];
+		const apiKey = this.variables.MAILCHIMP_API_KEY;
 		const mailchimpApiClient = MailchimpClient(apiKey!);
 
 		await mailchimpApiClient.messages.sendTemplate({