set folderId to optional in environmental variables and handle undefi…

…ned folderId
vivid-planet · Dec 9, 2024 · c799c55 · c799c55
1 parent 4ee2760
commit c799c55
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.env b/.env
@@ -85,4 +85,4 @@ NEXT_PUBLIC_CAMPAIGN_IS_PREVIEW=false
 REDIRECT_URL_FOR_IMPORT=$SITE_URL
 BREVO_ALLOWED_REDIRECT_URL=http://${DEV_DOMAIN:-localhost}${WORKAROUND_DOTENV_ISSUE}:${SITE_PORT}
 CAMPAIGNS_FRONTEND_URL=http://${DEV_DOMAIN:-localhost}${WORKAROUND_DOTENV_ISSUE}:${SITE_PORT} # doesn't work, TODO: add actual mailing frontend
-BREVO_FOLDER_ID=457
+BREVO_FOLDER_ID=
diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts
@@ -148,7 +148,7 @@ export class AppModule {
                                     sender: { name: config.brevo.sender.name, email: config.brevo.sender.email },
                                     allowedRedirectUrl: config.brevo.allowedRedirectUrl,
                                     redirectUrlForImport: config.brevo.redirectUrlForImport,
-                                    folderId: config.brevo.folderId,
+                                    folderId: config.brevo.folderId ?? 1,
                                 };
                             } else {
                                 return {
@@ -157,7 +157,7 @@ export class AppModule {
                                     sender: { name: config.brevo.sender.name, email: config.brevo.sender.email },
                                     allowedRedirectUrl: config.brevo.allowedRedirectUrl,
                                     redirectUrlForImport: config.brevo.redirectUrlForImport,
-                                    folderId: config.brevo.folderId,
+                                    folderId: config.brevo.folderId ?? 1, // folderId is required, folder #1 is created by default
                                 };
                             }
                         },

diff --git a/demo/api/src/config/environment-variables.ts b/demo/api/src/config/environment-variables.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { BlobStorageConfig } from "@comet/cms-api";
+import { BlobStorageConfig, IsUndefinable } from "@comet/cms-api";
 import { Transform, Type } from "class-transformer";
 import { IsBase64, IsBoolean, IsEmail, IsInt, IsNumber, IsOptional, IsString, MinLength, ValidateIf } from "class-validator";
 
@@ -144,6 +144,7 @@ export class EnvironmentVariables {
     CAMPAIGN_BASIC_AUTH_PASSWORD: string;
 
     @IsNumber()
+    @IsUndefinable()
     @Type(() => Number)
-    BREVO_FOLDER_ID: number;
+    BREVO_FOLDER_ID?: number;
 }
diff --git a/packages/api/src/brevo-api/brevo-api-contact.service.ts b/packages/api/src/brevo-api/brevo-api-contact.service.ts
@@ -191,7 +191,7 @@ export class BrevoApiContactsService {
         try {
             const contactList = {
                 name: title,
-                folderId: folderId ?? 1, // folderId is required, folder #1 is created by default
+                folderId: folderId,
             };
 
             const data = await this.getContactsApi(scope).createList(contactList);