fix validation error when saving campaigns: IsUndefined validator cor…

…rectly throwed an error when sending null (#36) * fix validation error when saving campaigns: IsUndefined validator throwed an correctly throwed an error when sending null * update scheduledAt logic to remove the previous scheduledAt when sending null and keeping it when sending undefined
vivid-planet · Feb 8, 2024 · f6b4226 · f6b4226
1 parent 6e4ceb4
commit f6b4226
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx
@@ -68,7 +68,7 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope, previe
 
     type EmailCampaignState = Omit<GQLEmailCampaignFormFragment, "content" | "targetGroup"> & {
         [key in keyof typeof rootBlocks]: BlockState<(typeof rootBlocks)[key]>;
-    } & { targetGroup: string | null };
+    } & { targetGroup?: string };
 
     const stackApi = useStackApi();
     const stackSwitchApi = useStackSwitchApi();
@@ -102,23 +102,21 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope, previe
                 content: EmailCampaignContentBlock.input2State(emailCampaign.content),
                 scheduledAt: emailCampaign?.scheduledAt ? new Date(emailCampaign.scheduledAt) : null,
                 sendingState: emailCampaign?.sendingState,
-                targetGroup: emailCampaign?.targetGroup?.id ?? null,
+                targetGroup: emailCampaign?.targetGroup?.id,
             };
         },
         state2Output: (state) => ({
             ...state,
             content: EmailCampaignContentBlock.state2Output(state.content),
-            targetGroup: state.targetGroup ?? null,
             scheduledAt: state.targetGroup ? state.scheduledAt ?? null : null,
             sendingState: undefined,
         }),
         defaultState: {
             title: "",
             subject: "",
             content: EmailCampaignContentBlock.defaultValues(),
-            scheduledAt: null,
-            targetGroup: null,
             sendingState: "DRAFT",
+            scheduledAt: undefined,
         },
     });
 

diff --git a/packages/api/src/email-campaign/dto/email-campaign-input.factory.ts b/packages/api/src/email-campaign/dto/email-campaign-input.factory.ts
@@ -1,5 +1,5 @@
 import { Block, BlockInputInterface, isBlockInputInterface } from "@comet/blocks-api";
-import { IsUndefinable, RootBlockInputScalar } from "@comet/cms-api";
+import { IsNullable, IsUndefinable, RootBlockInputScalar } from "@comet/cms-api";
 import { Type } from "@nestjs/common";
 import { Field, ID, InputType, PartialType } from "@nestjs/graphql";
 import { Transform } from "class-transformer";
@@ -8,7 +8,7 @@ import { IsDate, IsNotEmpty, IsString, IsUUID, MinDate, ValidateNested } from "c
 export interface EmailCampaignInputInterface {
     title: string;
     subject: string;
-    scheduledAt?: Date;
+    scheduledAt?: Date | null;
     content: BlockInputInterface;
     targetGroup?: string;
 }
@@ -31,11 +31,12 @@ export class EmailCampaignInputFactory {
             @Field()
             subject: string;
 
-            @IsUndefinable()
+            @IsUndefinable() // When sending undefined, the previous scheduledAt value will be kept
+            @IsNullable() // When sending null, the scheduledAt value will be removed
             @IsDate()
             @MinDate(new Date())
             @Field(() => Date, { nullable: true })
-            scheduledAt?: Date;
+            scheduledAt?: Date | null;
 
             @IsUndefinable()
             @Field(() => ID, { nullable: true })

diff --git a/packages/api/src/email-campaign/email-campaign.resolver.ts b/packages/api/src/email-campaign/email-campaign.resolver.ts
@@ -100,6 +100,7 @@ export function createEmailCampaignsResolver({
                 scope,
                 targetGroup: targetGroupInput ? Reference.create(await this.targetGroupRepository.findOneOrFail(targetGroupInput)) : undefined,
                 content: input.content.transformToBlockData(),
+                scheduledAt: input.scheduledAt ?? undefined,
             });
 
             await this.entityManager.flush();
@@ -128,7 +129,6 @@ export function createEmailCampaignsResolver({
             wrap(campaign).assign({
                 ...input,
                 content: input.content ? input.content.transformToBlockData() : undefined,
-                scheduledAt: input.scheduledAt ?? null,
             });
 
             await this.entityManager.flush();
@@ -143,8 +143,7 @@ export function createEmailCampaignsResolver({
                     throw new Error("Cannot update email campaign that has already been sent.");
                 }
 
-                hasScheduleRemoved = input.scheduledAt == null && brevoEmailCampaign.scheduledAt !== null;
-
+                hasScheduleRemoved = input.scheduledAt === null && brevoEmailCampaign.scheduledAt !== null;
                 if (hasScheduleRemoved && !(sendingState === SendingState.DRAFT)) {
                     await this.campaignsService.suspendEmailCampaign(campaign.brevoId);
                 }