feat: align new and existing e2e tests

Author: mcgarrye

api/prisma/seed-helpers/multiselect-question-factory.ts

@@ -16,35 +16,62 @@ export const multiselectQuestionFactory = (
     optOut?: boolean;
     multiselectQuestion?: Partial<Prisma.MultiselectQuestionsCreateInput>;
   },
+  version2 = false,
 ): Prisma.MultiselectQuestionsCreateInput => {
   const previousMultiselectQuestion = optionalParams?.multiselectQuestion || {};
+  const name = optionalParams?.multiselectQuestion?.name || randomName();
   const text = optionalParams?.multiselectQuestion?.text || randomName();
-  return {
-    text: text,
-    subText: `sub text for ${text}`,
-    description: `description of ${text}`,
-    links: [],
-    options: multiselectOptionFactory(randomInt(1, 3)),
-    optOutText: optionalParams?.optOut ? "I don't want this preference" : null,
-    hideFromListing: false,
+  const baseFields = {
     applicationSection:
       optionalParams?.multiselectQuestion?.applicationSection ||
       multiselectAppSectionAsArray[
         randomInt(multiselectAppSectionAsArray.length)
       ],
-
-    // TODO: Temporary until after MSQ refactor
-    isExclusive: optionalParams?.multiselectQuestion?.isExclusive ?? false,
-    multiselectOptions: undefined,
-    name: text,
-    status: MultiselectQuestionsStatusEnum.draft,
-
-    ...previousMultiselectQuestion,
+    hideFromListing: false,
     jurisdiction: {
       connect: {
         id: jurisdictionId,
       },
     },
+    links: [],
+  };
+
+  const v1Fields = {
+    description: `description of ${text}`,
+    isExclusive: false,
+    name: text,
+    options: multiselectOptionFactory(randomInt(1, 3)),
+    optOutText: optionalParams?.optOut ? "I don't want this preference" : null,
+    status: MultiselectQuestionsStatusEnum.draft,
+    subText: `sub text for ${text}`,
+    text: text,
+  };
+  const v2Fields = {
+    description: `description of ${name}`,
+    isExclusive: optionalParams?.multiselectQuestion?.isExclusive ?? false,
+    multiselectOptions: {
+      createMany: {
+        data: multiselectOptionFactoryV2(randomInt(1, 3)),
+      },
+    },
+    name: name,
+    subText: `sub text for ${name}`,
+    status: MultiselectQuestionsStatusEnum.draft,
+    // TODO: Can be removed after MSQ refactor
+    text: name,
+  };
+
+  if (version2) {
+    return {
+      ...v2Fields,
+      ...previousMultiselectQuestion,
+      ...baseFields,
+    };
+  }
+  return {
+    ...v1Fields,
+    ...previousMultiselectQuestion,
+    ...baseFields,
   };
 };
 
@@ -58,3 +85,11 @@ const multiselectOptionFactory = (
     collectAddress: index % 2 === 0,
   }));
 };
+
+const multiselectOptionFactoryV2 = (numberToMake: number) => {
+  if (!numberToMake) return [];
+  return [...new Array(numberToMake)].map((_, index) => ({
+    name: randomNoun(),
+    ordinal: index,
+  }));
+};

api/src/dtos/multiselect-questions/multiselect-option-update.dto.ts

@@ -1,9 +1,22 @@
-import { OmitType } from '@nestjs/swagger';
+import { ApiPropertyOptional, OmitType } from '@nestjs/swagger';
 import { MultiselectOption } from './multiselect-option.dto';
+import { Expose } from 'class-transformer';
+import { IsString, IsUUID } from 'class-validator';
+import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
 
 export class MultiselectOptionUpdate extends OmitType(MultiselectOption, [
+  // TODO: Temporarily optional until after MSQ refactor
+  'id',
   'createdAt',
   'updatedAt',
   'untranslatedName',
   'untranslatedText',
-]) {}
+]) {
+  @Expose()
+  @IsString({ groups: [ValidationsGroupsEnum.default] })
+  @IsUUID(4, { groups: [ValidationsGroupsEnum.default] })
+  // TODO: Temporarily optional until after MSQ refactor
+  // @IsDefined({ groups: [ValidationsGroupsEnum.default] })
+  @ApiPropertyOptional()
+  id?: string;
+}

api/src/dtos/multiselect-questions/multiselect-question.dto.ts

@@ -94,13 +94,12 @@ class MultiselectQuestion extends AbstractDTO {
   @ApiPropertyOptional()
   optOutText?: string;
 
-  // TODO: Temporarily optional until after MSQ refactor
   @Expose()
-  // @IsDefined({ groups: [ValidationsGroupsEnum.default] })
+  @IsDefined({ groups: [ValidationsGroupsEnum.default] })
   @IsEnum(MultiselectQuestionsStatusEnum, {
     groups: [ValidationsGroupsEnum.default],
   })
-  @ApiPropertyOptional({
+  @ApiProperty({
     enum: MultiselectQuestionsStatusEnum,
     enumName: 'MultiselectQuestionsStatusEnum',
     example: 'draft',

api/src/modules/multiselect-question.module.ts

@@ -1,4 +1,5 @@
 import { Logger, Module } from '@nestjs/common';
+import { SchedulerRegistry } from '@nestjs/schedule';
 import { PermissionModule } from './permission.module';
 import { PrismaModule } from './prisma.module';
 import { MultiselectQuestionController } from '../controllers/multiselect-question.controller';
@@ -7,7 +8,7 @@ import { MultiselectQuestionService } from '../services/multiselect-question.ser
 @Module({
   imports: [PrismaModule, PermissionModule],
   controllers: [MultiselectQuestionController],
-  providers: [Logger, MultiselectQuestionService],
+  providers: [Logger, MultiselectQuestionService, SchedulerRegistry],
   exports: [MultiselectQuestionService],
 })
 export class MultiselectQuestionModule {}

api/src/services/multiselect-question.service.ts

@@ -22,9 +22,9 @@ import { FeatureFlagEnum } from '../enums/feature-flags/feature-flags-enum';
 import { MultiselectQuestionFilterKeys } from '../enums/multiselect-questions/filter-key-enum';
 import { MultiselectQuestionViews } from '../enums/multiselect-questions/view-enum';
 import { buildFilter } from '../utilities/build-filter';
+import { startCronJob } from '../utilities/cron-job-starter';
 import { doJurisdictionHaveFeatureFlagSet } from '../utilities/feature-flag-utilities';
 import { mapTo } from '../utilities/mapTo';
-import { startCronJob } from 'src/utilities/cron-job-starter';
 
 export const includeViews: Partial<
   Record<MultiselectQuestionViews, Prisma.MultiselectQuestionsInclude>
@@ -530,6 +530,17 @@ export class MultiselectQuestionService {
   async activateMany(
     multiselectQuestions: MultiselectQuestion[],
   ): Promise<SuccessDTO> {
+    if (
+      multiselectQuestions.some(
+        (multiselectQuestion) =>
+          multiselectQuestion.status === MultiselectQuestionsStatusEnum.draft ||
+          multiselectQuestion.status === MultiselectQuestionsStatusEnum.retired,
+      )
+    ) {
+      throw new BadRequestException(
+        'only multiselect questions in visible, active or toRetire status can be associated with a listing being published',
+      );
+    }
     // What if one fails?
     for (const multiselectQuestion of multiselectQuestions) {
       if (