feat: geocoding refactor

api/prisma/migrations/42_application_selection_on_delete/migration.sql

@@ -0,0 +1,11 @@
+-- DropForeignKey
+ALTER TABLE "application_selection_options" DROP CONSTRAINT "application_selection_options_application_selection_id_fkey";
+
+-- DropForeignKey
+ALTER TABLE "application_selections" DROP CONSTRAINT "application_selections_application_id_fkey";
+
+-- AddForeignKey
+ALTER TABLE "application_selection_options" ADD CONSTRAINT "application_selection_options_application_selection_id_fkey" FOREIGN KEY ("application_selection_id") REFERENCES "application_selections"("id") ON DELETE CASCADE ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE "application_selections" ADD CONSTRAINT "application_selections_application_id_fkey" FOREIGN KEY ("application_id") REFERENCES "applications"("id") ON DELETE CASCADE ON UPDATE NO ACTION;

api/prisma/schema.prisma

@@ -182,7 +182,7 @@ model ApplicationSelectionOptions {
   isGeocodingVerified       Boolean?              @map("is_geocoding_verified")
   multiselectOptionId       String                @map("multiselect_option_id") @db.Uuid
   addressHolderAddress      Address?              @relation("application_selection_address", fields: [addressHolderAddressId], references: [id], onDelete: NoAction, onUpdate: NoAction)
-  applicationSelections     ApplicationSelections @relation(fields: [applicationSelectionId], references: [id], onDelete: NoAction, onUpdate: NoAction)
+  applicationSelection      ApplicationSelections @relation(fields: [applicationSelectionId], references: [id], onDelete: Cascade, onUpdate: NoAction)
   multiselectOption         MultiselectOptions    @relation(fields: [multiselectOptionId], references: [id], onDelete: NoAction, onUpdate: NoAction)
 
   @@map("application_selection_options")
@@ -195,7 +195,7 @@ model ApplicationSelections {
   applicationId         String                        @map("application_id") @db.Uuid
   hasOptedOut           Boolean?                      @map("has_opted_out")
   multiselectQuestionId String                        @map("multiselect_question_id") @db.Uuid
-  application           Applications                  @relation(fields: [applicationId], references: [id], onDelete: NoAction, onUpdate: NoAction)
+  application           Applications                  @relation(fields: [applicationId], references: [id], onDelete: Cascade, onUpdate: NoAction)
   multiselectQuestion   MultiselectQuestions          @relation(fields: [multiselectQuestionId], references: [id], onDelete: NoAction, onUpdate: NoAction)
   selections            ApplicationSelectionOptions[]
 

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

@@ -91,5 +91,6 @@ const multiselectOptionFactoryV2 = (numberToMake: number) => {
   return [...new Array(numberToMake)].map((_, index) => ({
     name: randomNoun(),
     ordinal: index,
+    shouldCollectAddress: index % 2 === 0,
   }));
 };

api/src/dtos/addresses/address-update.dto.ts

@@ -0,0 +1,17 @@
+import { Expose } from 'class-transformer';
+import { IsString, IsUUID } from 'class-validator';
+import { ApiPropertyOptional, OmitType } from '@nestjs/swagger';
+import { Address } from './address.dto';
+import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
+
+export class AddressUpdate extends OmitType(Address, [
+  'id',
+  'createdAt',
+  'updatedAt',
+]) {
+  @Expose()
+  @IsString({ groups: [ValidationsGroupsEnum.default] })
+  @IsUUID(4, { groups: [ValidationsGroupsEnum.default] })
+  @ApiPropertyOptional()
+  id?: string;
+}

api/src/dtos/applications/application-create.dto.ts

@@ -1,4 +1,23 @@
-import { OmitType } from '@nestjs/swagger';
+import { Expose, Type } from 'class-transformer';
+import { ArrayMaxSize, ValidateNested } from 'class-validator';
+import { ApiPropertyOptional, OmitType } from '@nestjs/swagger';
 import { ApplicationUpdate } from './application-update.dto';
+import ApplicationSelectionCreate from './application-selection-create.dto';
+import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
 
-export class ApplicationCreate extends OmitType(ApplicationUpdate, ['id']) {}
+export class ApplicationCreate extends OmitType(ApplicationUpdate, [
+  'id',
+  'applicationSelections',
+]) {
+  // TODO: Temporarily optional until after MSQ refactor
+  @Expose()
+  // @IsDefined({ groups: [ValidationsGroupsEnum.default] })
+  @ArrayMaxSize(64, { groups: [ValidationsGroupsEnum.default] })
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default], each: true })
+  @Type(() => ApplicationSelectionCreate)
+  @ApiPropertyOptional({
+    type: ApplicationSelectionCreate,
+    isArray: true,
+  })
+  applicationSelections?: ApplicationSelectionCreate[];
+}

api/src/dtos/applications/application-selection-create.dto.ts

@@ -0,0 +1,24 @@
+import { ApiProperty, OmitType } from '@nestjs/swagger';
+import { Expose, Type } from 'class-transformer';
+import { IsDefined, ValidateNested } from 'class-validator';
+import ApplicationSelectionUpdate from './application-selection-update.dto';
+import ApplicationSelectionOptionCreate from './application-selection-option-create.dto';
+import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
+
+class ApplicationSelectionCreate extends OmitType(ApplicationSelectionUpdate, [
+  'id',
+  'application',
+  'selections',
+]) {
+  @Expose()
+  @IsDefined({ groups: [ValidationsGroupsEnum.default] })
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default], each: true })
+  @Type(() => ApplicationSelectionOptionCreate)
+  @ApiProperty({
+    type: ApplicationSelectionOptionCreate,
+    isArray: true,
+  })
+  selections: ApplicationSelectionOptionCreate[];
+}
+
+export { ApplicationSelectionCreate as default, ApplicationSelectionCreate };

api/src/dtos/applications/application-selection-option-create.dto.ts

@@ -0,0 +1,12 @@
+import { OmitType } from '@nestjs/swagger';
+import ApplicationSelectionOptionUpdate from './application-selection-option-update.dto';
+
+class ApplicationSelectionOptionCreate extends OmitType(
+  ApplicationSelectionOptionUpdate,
+  ['id'],
+) {}
+
+export {
+  ApplicationSelectionOptionCreate as default,
+  ApplicationSelectionOptionCreate,
+};

api/src/dtos/applications/application-selection-option-update.dto.ts

@@ -0,0 +1,41 @@
+import { ApiPropertyOptional, OmitType } from '@nestjs/swagger';
+import { Expose, Type } from 'class-transformer';
+import { IsString, IsUUID, ValidateNested } from 'class-validator';
+import ApplicationSelectionOption from './application-selection-option.dto';
+import { AddressUpdate } from '../addresses/address-update.dto';
+import { IdDTO } from '../shared/id.dto';
+import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
+
+class ApplicationSelectionOptionUpdate extends OmitType(
+  ApplicationSelectionOption,
+  [
+    'id',
+    'createdAt',
+    'updatedAt',
+    'addressHolderAddress',
+    'applicationSelection',
+  ],
+) {
+  @Expose()
+  @IsString({ groups: [ValidationsGroupsEnum.default] })
+  @IsUUID(4, { groups: [ValidationsGroupsEnum.default] })
+  @ApiPropertyOptional()
+  id?: string;
+
+  @Expose()
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
+  @Type(() => AddressUpdate)
+  @ApiPropertyOptional({ type: AddressUpdate })
+  addressHolderAddress?: AddressUpdate;
+
+  @Expose()
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
+  @Type(() => IdDTO)
+  @ApiPropertyOptional({ type: IdDTO })
+  applicationSelection?: IdDTO;
+}
+
+export {
+  ApplicationSelectionOptionUpdate as default,
+  ApplicationSelectionOptionUpdate,
+};

api/src/dtos/applications/application-selection-options.dto.ts → api/src/dtos/applications/application-selection-option.dto.ts

@@ -9,14 +9,15 @@ import {
 import { AbstractDTO } from '../shared/abstract.dto';
 import { IdDTO } from '../shared/id.dto';
 import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
+import { Address } from '../addresses/address.dto';
 
-class ApplicationSelectionOptions extends AbstractDTO {
+class ApplicationSelectionOption extends AbstractDTO {
   @Expose()
   @IsDefined({ groups: [ValidationsGroupsEnum.default] })
   @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
-  @Type(() => IdDTO)
-  @ApiProperty({ type: IdDTO })
-  addressHolderAddress?: IdDTO;
+  @Type(() => Address)
+  @ApiProperty({ type: Address })
+  addressHolderAddress?: Address;
 
   @Expose()
   @IsString({ groups: [ValidationsGroupsEnum.default] })
@@ -42,10 +43,9 @@ class ApplicationSelectionOptions extends AbstractDTO {
 
   @Expose()
   @IsDefined({ groups: [ValidationsGroupsEnum.default] })
-  @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
   @Type(() => IdDTO)
   @ApiProperty({ type: IdDTO })
   multiselectOption: IdDTO;
 }
 
-export { ApplicationSelectionOptions as default, ApplicationSelectionOptions };
+export { ApplicationSelectionOption as default, ApplicationSelectionOption };

api/src/dtos/applications/application-selection-update.dto.ts

@@ -0,0 +1,31 @@
+import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger';
+import { Expose, Type } from 'class-transformer';
+import { IsDefined, IsString, IsUUID, ValidateNested } from 'class-validator';
+import ApplicationSelection from './application-selection.dto';
+import ApplicationSelectionOptionUpdate from './application-selection-option-update.dto';
+import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
+
+class ApplicationSelectionUpdate extends OmitType(ApplicationSelection, [
+  'id',
+  'createdAt',
+  'updatedAt',
+  'selections',
+]) {
+  @Expose()
+  @IsString({ groups: [ValidationsGroupsEnum.default] })
+  @IsUUID(4, { groups: [ValidationsGroupsEnum.default] })
+  @ApiPropertyOptional()
+  id?: string;
+
+  @Expose()
+  @IsDefined({ groups: [ValidationsGroupsEnum.default] })
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default], each: true })
+  @Type(() => ApplicationSelectionOptionUpdate)
+  @ApiProperty({
+    type: ApplicationSelectionOptionUpdate,
+    isArray: true,
+  })
+  selections: ApplicationSelectionOptionUpdate[];
+}
+
+export { ApplicationSelectionUpdate as default, ApplicationSelectionUpdate };

api/src/dtos/applications/application-selections.dto.ts → api/src/dtos/applications/application-selection.dto.ts

@@ -1,12 +1,17 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { Expose, Type } from 'class-transformer';
-import { ValidateNested, IsBoolean, IsDefined } from 'class-validator';
-import ApplicationSelectionOptions from './application-selection-options.dto';
+import {
+  ValidateNested,
+  IsBoolean,
+  IsDefined,
+  IsString,
+} from 'class-validator';
+import ApplicationSelectionOption from './application-selection-option.dto';
 import { AbstractDTO } from '../shared/abstract.dto';
 import { IdDTO } from '../shared/id.dto';
 import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
 
-class ApplicationSelections extends AbstractDTO {
+class ApplicationSelection extends AbstractDTO {
   @Expose()
   @IsDefined({ groups: [ValidationsGroupsEnum.default] })
   @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
@@ -21,17 +26,16 @@ class ApplicationSelections extends AbstractDTO {
 
   @Expose()
   @IsDefined({ groups: [ValidationsGroupsEnum.default] })
-  @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
   @Type(() => IdDTO)
   @ApiProperty({ type: IdDTO })
   multiselectQuestion: IdDTO;
 
   @Expose()
   @IsDefined({ groups: [ValidationsGroupsEnum.default] })
   @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
-  @Type(() => ApplicationSelectionOptions)
-  @ApiProperty({ type: ApplicationSelectionOptions })
-  selections: ApplicationSelectionOptions[];
+  @Type(() => ApplicationSelectionOption)
+  @ApiProperty({ type: ApplicationSelectionOption })
+  selections: ApplicationSelectionOption[];
 }
 
-export { ApplicationSelections as default, ApplicationSelections };
+export { ApplicationSelection as default, ApplicationSelection };

api/src/dtos/applications/application-update.dto.ts

@@ -1,39 +1,65 @@
-import { ApiProperty, OmitType } from '@nestjs/swagger';
 import { Expose, Type } from 'class-transformer';
 import { ArrayMaxSize, ValidateNested } from 'class-validator';
-import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
-import { AddressCreate } from '../addresses/address-create.dto';
+import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger';
 import { AccessibilityUpdate } from './accessibility-update.dto';
 import { AlternateContactUpdate } from './alternate-contact-update.dto';
 import { ApplicantUpdate } from './applicant-update.dto';
 import { Application } from './application.dto';
+import ApplicationSelectionUpdate from './application-selection-update.dto';
 import { DemographicUpdate } from './demographic-update.dto';
 import { HouseholdMemberUpdate } from './household-member-update.dto';
+import { AddressCreate } from '../addresses/address-create.dto';
 import { IdDTO } from '../shared/id.dto';
+import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
 
 export class ApplicationUpdate extends OmitType(Application, [
   'createdAt',
   'updatedAt',
   'deletedAt',
+  'accessibility',
+  'alternateContact',
   'applicant',
-  'applicationsMailingAddress',
+  'applicationLotteryPositions',
+  'applicationSelections',
   'applicationsAlternateAddress',
-  'alternateContact',
-  'accessibility',
+  'applicationsMailingAddress',
+  'confirmationCode',
   'demographics',
+  'flagged',
   'householdMember',
   'markedAsDuplicate',
-  'flagged',
-  'confirmationCode',
   'preferredUnitTypes',
-  'applicationLotteryPositions',
 ]) {
+  @Expose()
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
+  @Type(() => AccessibilityUpdate)
+  @ApiProperty({ type: AccessibilityUpdate })
+  accessibility: AccessibilityUpdate;
+
+  @Expose()
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
+  @Type(() => AlternateContactUpdate)
+  @ApiProperty({ type: AlternateContactUpdate })
+  alternateContact: AlternateContactUpdate;
+
   @Expose()
   @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
   @Type(() => ApplicantUpdate)
   @ApiProperty({ type: ApplicantUpdate })
   applicant: ApplicantUpdate;
 
+  // TODO: Temporarily optional until after MSQ refactor
+  @Expose()
+  // @IsDefined({ groups: [ValidationsGroupsEnum.default] })
+  @ArrayMaxSize(64, { groups: [ValidationsGroupsEnum.default] })
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default], each: true })
+  @Type(() => ApplicationSelectionUpdate)
+  @ApiPropertyOptional({
+    type: ApplicationSelectionUpdate,
+    isArray: true,
+  })
+  applicationSelections?: ApplicationSelectionUpdate[];
+
   @Expose()
   @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
   @Type(() => AddressCreate)
@@ -46,18 +72,6 @@ export class ApplicationUpdate extends OmitType(Application, [
   @ApiProperty({ type: AddressCreate })
   applicationsAlternateAddress: AddressCreate;
 
-  @Expose()
-  @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
-  @Type(() => AlternateContactUpdate)
-  @ApiProperty({ type: AlternateContactUpdate })
-  alternateContact: AlternateContactUpdate;
-
-  @Expose()
-  @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
-  @Type(() => AccessibilityUpdate)
-  @ApiProperty({ type: AccessibilityUpdate })
-  accessibility: AccessibilityUpdate;
-
   @Expose()
   @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
   @Type(() => DemographicUpdate)

api/src/dtos/applications/application.dto.ts

@@ -32,7 +32,7 @@ import { Demographic } from './demographic.dto';
 import { HouseholdMember } from './household-member.dto';
 import { UnitType } from '../unit-types/unit-type.dto';
 import { ApplicationLotteryPosition } from './application-lottery-position.dto';
-import ApplicationSelections from './application-selections.dto';
+import ApplicationSelection from './application-selection.dto';
 
 export class Application extends AbstractDTO {
   @Expose()
@@ -262,16 +262,16 @@ export class Application extends AbstractDTO {
   householdMember: HouseholdMember[];
 
   // TODO: Temporarily optional until after MSQ refactor
-  // @Expose()
+  @Expose()
   // @IsDefined({ groups: [ValidationsGroupsEnum.default] })
   @ArrayMaxSize(64, { groups: [ValidationsGroupsEnum.default] })
   @ValidateNested({ groups: [ValidationsGroupsEnum.default], each: true })
-  @Type(() => ApplicationSelections)
+  @Type(() => ApplicationSelection)
   @ApiPropertyOptional({
-    type: ApplicationSelections,
+    type: ApplicationSelection,
     isArray: true,
   })
-  applicationSelections?: ApplicationSelections[];
+  applicationSelections?: ApplicationSelection[];
 
   @Expose()
   @IsDefined({ groups: [ValidationsGroupsEnum.default] })