feat(api): compilation issues fixed

novuhq · Oct 29, 2024 · f8b76bf · f8b76bf
1 parent cc591c6
commit f8b76bf
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 69 deletions.
diff --git a/apps/api/src/app/environments-v1/usecases/output-renderers/index.ts b/apps/api/src/app/environments-v1/usecases/output-renderers/index.ts
@@ -5,5 +5,5 @@ export * from './push-output-renderer.usecase';
 export * from './sms-output-renderer.usecase';
 export * from './in-app-output-renderer.usecase';
 export * from './email-schema-expander.usecase';
-export { HydrateEmailSchemaUseCase } from './hydrate-email-schema-use-case.service';
+export { HydrateEmailSchemaUseCase } from './hydrate-email-schema.usecase';
 export { HydrateEmailSchemaCommand } from './hydrate-email-schema.command';
diff --git a/apps/api/src/app/workflows-v2/generate-preview.e2e.ts b/apps/api/src/app/workflows-v2/generate-preview.e2e.ts
@@ -79,75 +79,99 @@ describe('Generate Preview', () => {
       });
     });
     describe('email specific features', () => {
-      it('show -> should hide element based on payload', async () => {
-        const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
-        const previewResponseDto = await generatePreview(
-          workflowId,
-          stepUuid,
-          {
-            validationStrategies: [],
-            controlValues: stepTypeTo[StepTypeEnum.EMAIL],
-            payloadValues: { params: { isPayedUser: 'false' } },
-          },
-          'email'
-        );
-        expect(previewResponseDto.result!.preview).to.exist;
-
-        const preview = previewResponseDto.result!.preview.body;
-        expect(preview).to.not.contain('should be the fallback value');
-      });
-    });
-    it('show -> should show element based on payload - string', async () => {
-      const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
-      const previewResponseDto = await generatePreview(
-        workflowId,
-        stepUuid,
-        {
-          validationStrategies: [],
-          controlValues: stepTypeTo[StepTypeEnum.EMAIL],
-          payloadValues: { params: { isPayedUser: 'true' } },
-        },
-        'email'
-      );
-      expect(previewResponseDto.result!.preview).to.exist;
+      describe('show', () => {
+        it('show -> should hide element based on payload', async () => {
+          const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
+          const previewResponseDto = await generatePreview(
+            workflowId,
+            stepUuid,
+            {
+              validationStrategies: [],
+              controlValues: stepTypeTo[StepTypeEnum.EMAIL],
+              payloadValues: { params: { isPayedUser: 'false' } },
+            },
+            'email'
+          );
+          expect(previewResponseDto.result!.preview).to.exist;
 
-      const preview = previewResponseDto.result!.preview.body;
-      expect(preview).to.contain('should be the fallback value');
-    });
-    it('show -> should show element based on payload - boolean', async () => {
-      const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
-      const previewResponseDto = await generatePreview(
-        workflowId,
-        stepUuid,
-        {
-          validationStrategies: [],
-          controlValues: stepTypeTo[StepTypeEnum.EMAIL],
-          payloadValues: { params: { isPayedUser: true } },
-        },
-        'email'
-      );
-      expect(previewResponseDto.result!.preview).to.exist;
+          const preview = previewResponseDto.result!.preview.body;
+          expect(preview).to.not.contain('should be the fallback value');
+        });
+        it('show -> should show element based on payload - string', async () => {
+          const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
+          const previewResponseDto = await generatePreview(
+            workflowId,
+            stepUuid,
+            {
+              validationStrategies: [],
+              controlValues: stepTypeTo[StepTypeEnum.EMAIL],
+              payloadValues: { params: { isPayedUser: 'true' } },
+            },
+            'email'
+          );
+          expect(previewResponseDto.result!.preview).to.exist;
 
-      const preview = previewResponseDto.result!.preview.body;
-      expect(preview).to.contain('should be the fallback value');
-    });
+          const preview = previewResponseDto.result!.preview.body;
+          expect(preview).to.contain('should be the fallback value');
+        });
+        it('show -> should show element based on payload - boolean', async () => {
+          const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
+          const previewResponseDto = await generatePreview(
+            workflowId,
+            stepUuid,
+            {
+              validationStrategies: [],
+              controlValues: stepTypeTo[StepTypeEnum.EMAIL],
+              payloadValues: { params: { isPayedUser: true } },
+            },
+            'email'
+          );
+          expect(previewResponseDto.result!.preview).to.exist;
 
-    it('show -> should show element if payload is missing', async () => {
-      const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
-      const previewResponseDto = await generatePreview(
-        workflowId,
-        stepUuid,
-        {
-          validationStrategies: [],
-          controlValues: stepTypeTo[StepTypeEnum.EMAIL],
-          payloadValues: { params: { isPayedUser: 'true' } },
-        },
-        'email'
-      );
-      expect(previewResponseDto.result!.preview).to.exist;
+          const preview = previewResponseDto.result!.preview.body;
+          expect(preview).to.contain('should be the fallback value');
+        });
+        it('show -> should show element if payload is missing', async () => {
+          const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
+          const previewResponseDto = await generatePreview(
+            workflowId,
+            stepUuid,
+            {
+              validationStrategies: [],
+              controlValues: stepTypeTo[StepTypeEnum.EMAIL],
+              payloadValues: { params: { isPayedUser: 'true' } },
+            },
+            'email'
+          );
+          expect(previewResponseDto.result!.preview).to.exist;
 
-      const preview = previewResponseDto.result!.preview.body;
-      expect(preview).to.contain('should be the fallback value');
+          const preview = previewResponseDto.result!.preview.body;
+          expect(preview).to.contain('should be the fallback value');
+        });
+      });
+      describe('for', () => {
+        it('should populate for if payload exist with actual values', async () => {
+          const { stepUuid, workflowId } = await createWorkflowAndReturnId(StepTypeEnum.EMAIL);
+          const body1 = 'ball is round';
+          const body2 = 'square is square';
+          const previewResponseDto = await generatePreview(
+            workflowId,
+            stepUuid,
+            {
+              validationStrategies: [],
+              controlValues: stepTypeTo[StepTypeEnum.EMAIL],
+              payloadValues: { items: [{ body: body1 }, { body: body2 }] },
+            },
+            'email'
+          );
+          expect(previewResponseDto.result!.preview).to.exist;
+          const preview = previewResponseDto.result!.preview.body;
+          expect(preview).not.to.contain('{{item.body}}1');
+          expect(preview).not.to.contain('{{item.body}}1');
+          expect(preview).to.contain(body1);
+          expect(preview).to.contain(body2);
+        });
+      });
     });
 
     describe('Missing Required ControlValues', () => {
@@ -206,6 +230,7 @@ function buildDtoNoPayload(stepTypeEnum: StepTypeEnum): GeneratePreviewRequestDt
     controlValues: stepTypeTo[stepTypeEnum],
   };
 }
+
 function buildDtoWithPayload(stepTypeEnum: StepTypeEnum): GeneratePreviewRequestDto {
   return {
     validationStrategies: [],
@@ -237,6 +262,7 @@ function buildEmailControlValuesPayload(): EmailStepControlSchemaDto {
     emailEditor: JSON.stringify(fullCodeSnippet),
   };
 }
+
 function buildInAppControlValues(): InAppOutput {
   return {
     subject: `Hello, World! ${PLACEHOLDER_SUBJECT_INAPP}`,
@@ -284,6 +310,7 @@ function buildChatControlValuesPayload() {
     body: 'Hello, World!',
   };
 }
+
 const FOR_ITEM_VALUE_PLACEHOLDER = '{#item.body#}';
 const TEST_SHOW_VALUE = 'TEST_SHOW_VALUE';
 const stepTypeTo = {

diff --git a/...p/workflows-v2/usecases/placeholder-enrichment/payload-preview-value-generator.usecase.ts b/...p/workflows-v2/usecases/placeholder-enrichment/payload-preview-value-generator.usecase.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { TransformPlaceholderMapUseCase } from './transform-placeholder.usecase';
 import { AddKeysToPayloadBasedOnHydrationStrategyCommand } from './add-keys-to-payload-based-on-hydration-strategy-command';
-import { HydrateEmailSchemaUseCase } from '../../../environments-v1/usecases/output-renderers/hydrate-email-schema.usecase';
+import { HydrateEmailSchemaUseCase } from '../../../environments-v1/usecases/output-renderers';
 
 @Injectable()
 export class CreateMockPayloadForSingleControlValueUseCase {

diff --git a/...api/src/app/workflows-v2/usecases/placeholder-enrichment/transform-placeholder.usecase.ts b/...api/src/app/workflows-v2/usecases/placeholder-enrichment/transform-placeholder.usecase.ts
@@ -1,5 +1,14 @@
-import { PlaceholderMap } from './collect-placeholders-from-tip-tap-schema.usecase';
-
+export type PlaceholderMap = {
+  for?: {
+    [key: string]: string[];
+  };
+  show?: {
+    [key: string]: any[];
+  };
+  regular?: {
+    [key: string]: any[];
+  };
+};
 export class TransformPlaceholderMapCommand {
   input: PlaceholderMap;
 }

diff --git a/apps/api/src/app/workflows-v2/workflow.module.ts b/apps/api/src/app/workflows-v2/workflow.module.ts
@@ -23,6 +23,8 @@ import { GeneratePreviewUsecase } from './usecases/generate-preview/generate-pre
 import { CreateMockPayloadForSingleControlValueUseCase } from './usecases/placeholder-enrichment/payload-preview-value-generator.usecase';
 import { ExtractDefaultsUsecase } from './usecases/get-default-values-from-schema/extract-defaults.usecase';
 import { TransformPlaceholderMapUseCase } from './usecases/placeholder-enrichment/transform-placeholder.usecase';
+import { ConstructPayloadFromPlaceholdersWithDefaultsUseCase } from './usecases/generate-preview/construct-payload-from-placeholders-with-defaults-use-case.service';
+import { HydrateEmailSchemaUseCase } from '../environments-v1/usecases/output-renderers';
 
 @Module({
   imports: [SharedModule, MessageTemplateModule, ChangeModule, AuthModule, BridgeModule, IntegrationModule],
@@ -45,6 +47,8 @@ import { TransformPlaceholderMapUseCase } from './usecases/placeholder-enrichmen
     CreateMockPayloadForSingleControlValueUseCase,
     ExtractDefaultsUsecase,
     TransformPlaceholderMapUseCase,
+    ConstructPayloadFromPlaceholdersWithDefaultsUseCase,
+    HydrateEmailSchemaUseCase,
   ],
 })
 export class WorkflowModule implements NestModule {