Create ListField to DRY deduping items

Author: CarsonF

src/common/index.ts

@@ -24,6 +24,7 @@ export * from './fiscal-year';
 export * from './generate-id';
 export * from './id.arg';
 export * from './lazy-ref';
+export * from './list-field';
 export * from './lazy-record';
 export { DateField, DateTimeField } from './luxon.graphql';
 export * from './map-or-else';

src/common/list-field.ts

@@ -0,0 +1,16 @@
+import { applyDecorators } from '@nestjs/common';
+import { OptionalField, OptionalFieldOptions } from './optional-field';
+
+export type ListFieldOptions = OptionalFieldOptions;
+
+export const ListField = (typeFn: () => any, options: ListFieldOptions) =>
+  applyDecorators(
+    OptionalField(() => [typeFn()], {
+      optional: false,
+      ...options,
+      transform: (value) => {
+        const deduped = value ? [...new Set(value)] : value;
+        return options.transform ? options.transform(deduped) : value;
+      },
+    }),
+  );

src/components/language/dto/update-language.dto.ts

@@ -1,5 +1,5 @@
 import { Field, InputType, Int, ObjectType } from '@nestjs/graphql';
-import { Transform, Type } from 'class-transformer';
+import { Type } from 'class-transformer';
 import {
   IsAlpha,
   IsLowercase,
@@ -8,12 +8,12 @@ import {
   Matches,
   ValidateNested,
 } from 'class-validator';
-import { uniq } from 'lodash';
 import {
   CalendarDate,
   DateField,
   ID,
   IdField,
+  ListField,
   NameField,
   OptionalField,
   Sensitivity,
@@ -108,9 +108,8 @@ export abstract class UpdateLanguage {
   @OptionalField()
   readonly hasExternalFirstScripture?: boolean;
 
-  @Field(() => [String], { nullable: true })
-  @Transform(({ value }) => uniq(value))
-  readonly tags?: string[];
+  @ListField(() => String, { optional: true })
+  readonly tags?: readonly string[];
 }
 
 @InputType()

src/components/partner/dto/update-partner.dto.ts

@@ -1,13 +1,13 @@
 import { Field, ID as IDType, InputType, ObjectType } from '@nestjs/graphql';
-import { Transform, Type } from 'class-transformer';
+import { Type } from 'class-transformer';
 import { Matches, ValidateNested } from 'class-validator';
-import { uniq } from 'lodash';
 import {
   CalendarDate,
   DateField,
   ID,
   IdField,
   IsId,
+  ListField,
   NameField,
 } from '~/common';
 import { FinanceDepartmentIdBlockInput } from '../../finance/department/dto/id-blocks.input';
@@ -24,12 +24,10 @@ export abstract class UpdatePartner {
   @IdField({ nullable: true })
   readonly pointOfContactId?: ID<'User'> | null;
 
-  @Field(() => [PartnerType], { nullable: true })
-  @Transform(({ value }) => uniq(value))
+  @ListField(() => PartnerType, { optional: true })
   readonly types?: readonly PartnerType[];
 
-  @Field(() => [FinancialReportingType], { nullable: true })
-  @Transform(({ value }) => uniq(value))
+  @ListField(() => FinancialReportingType, { optional: true })
   readonly financialReportingTypes?: readonly FinancialReportingType[];
 
   @Field(() => String, { nullable: true })
@@ -50,26 +48,23 @@ export abstract class UpdatePartner {
   @IdField({ nullable: true })
   readonly languageOfWiderCommunicationId?: ID<'Language'> | null;
 
-  @Field(() => [IDType], { nullable: true })
+  @ListField(() => IDType, { optional: true })
   @IsId({ each: true })
-  @Transform(({ value }) => (value ? uniq(value) : undefined))
   readonly countries?: ReadonlyArray<ID<'Location'>>;
 
-  @Field(() => [IDType], { nullable: true })
+  @ListField(() => IDType, { optional: true })
   @IsId({ each: true })
-  @Transform(({ value }) => (value ? uniq(value) : undefined))
   readonly fieldRegions?: ReadonlyArray<ID<'FieldRegion'>>;
 
-  @Field(() => [IDType], { name: 'languagesOfConsulting', nullable: true })
-  @Transform(({ value }) => (value ? uniq(value) : undefined))
+  @ListField(() => IDType, { optional: true })
+  @IsId({ each: true })
   readonly languagesOfConsulting?: ReadonlyArray<ID<'Language'>>;
 
   @DateField({ nullable: true })
   readonly startDate?: CalendarDate | null;
 
-  @Field(() => [ProjectType], { nullable: true })
-  @Transform(({ value }) => uniq(value))
-  readonly approvedPrograms?: ProjectType[];
+  @ListField(() => ProjectType, { optional: true })
+  readonly approvedPrograms?: readonly ProjectType[];
 
   @Field(() => FinanceDepartmentIdBlockInput, { nullable: true })
   @ValidateNested()

src/components/partnership/dto/update-partnership.dto.ts

@@ -1,8 +1,14 @@
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
-import { Transform, Type } from 'class-transformer';
+import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
-import { uniq } from 'lodash';
-import { CalendarDate, DateField, ID, IdField, OptionalField } from '~/common';
+import {
+  CalendarDate,
+  DateField,
+  ID,
+  IdField,
+  ListField,
+  OptionalField,
+} from '~/common';
 import { ChangesetIdField } from '../../changeset';
 import { CreateDefinedFileVersionInput } from '../../file/dto';
 import { PartnerType } from '../../partner/dto';
@@ -37,8 +43,7 @@ export abstract class UpdatePartnership {
   @DateField({ nullable: true })
   readonly mouEndOverride?: CalendarDate | null;
 
-  @Field(() => [PartnerType], { nullable: true })
-  @Transform(({ value }) => uniq(value))
+  @ListField(() => PartnerType, { optional: true })
   readonly types?: readonly PartnerType[];
 
   @Field(() => FinancialReportingType, { nullable: true })

src/components/project-change-request/dto/update-project-change-request.dto.ts

@@ -1,7 +1,7 @@
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
-import { ID, IdField, NameField, OptionalField } from '~/common';
+import { ID, IdField, ListField, NameField, OptionalField } from '~/common';
 import { ProjectChangeRequestStatus } from './project-change-request-status.enum';
 import { ProjectChangeRequestType } from './project-change-request-type.enum';
 import { ProjectChangeRequest } from './project-change-request.dto';
@@ -11,8 +11,8 @@ export abstract class UpdateProjectChangeRequest {
   @IdField()
   readonly id: ID;
 
-  @OptionalField(() => [ProjectChangeRequestType])
-  readonly types?: [ProjectChangeRequestType];
+  @ListField(() => ProjectChangeRequestType, { optional: true })
+  readonly types?: readonly ProjectChangeRequestType[];
 
   @NameField({ optional: true })
   readonly summary?: string;

src/components/project/dto/update-project.dto.ts

@@ -1,7 +1,6 @@
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
-import { Transform, Type } from 'class-transformer';
+import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
-import { uniq } from 'lodash';
 import { DateTime } from 'luxon';
 import {
   CalendarDate,
@@ -10,6 +9,7 @@ import {
   ID,
   IdField,
   IdOf,
+  ListField,
   NameField,
   OptionalField,
   Sensitivity,
@@ -75,8 +75,7 @@ export abstract class UpdateProject {
   })
   readonly sensitivity?: Sensitivity;
 
-  @Field(() => [String], { nullable: true })
-  @Transform(({ value }) => uniq(value))
+  @ListField(() => String, { optional: true })
   readonly tags?: readonly string[];
 
   @DateTimeField({ nullable: true })

src/components/project/project-member/dto/update-project-member.dto.ts

@@ -1,15 +1,15 @@
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
-import { ID, IdField, OptionalField, Role } from '~/common';
+import { ID, IdField, ListField, Role } from '~/common';
 import { ProjectMember } from './project-member.dto';
 
 @InputType()
 export abstract class UpdateProjectMember {
   @IdField()
   readonly id: ID;
 
-  @OptionalField(() => [Role])
+  @ListField(() => Role, { optional: true })
   readonly roles?: readonly Role[];
 }
 

src/components/user/dto/update-user.dto.ts

@@ -1,12 +1,12 @@
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
-import { Transform, Type } from 'class-transformer';
+import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
-import { uniq } from 'lodash';
 import {
   EmailField,
   ID,
   IdField,
   IsIanaTimezone,
+  ListField,
   NameField,
   OptionalField,
   Role,
@@ -47,8 +47,7 @@ export abstract class UpdateUser {
   @OptionalField(() => UserStatus)
   readonly status?: UserStatus;
 
-  @Field(() => [Role], { nullable: true })
-  @Transform(({ value }) => uniq(value))
+  @ListField(() => Role, { optional: true })
   readonly roles?: readonly Role[];
 
   @Field(() => String, { nullable: true })