Merge pull request #3246 from SeedCompany/filters-optional

Author: CarsonF

src/common/filter-field.ts

@@ -1,9 +1,8 @@
 import { applyDecorators } from '@nestjs/common';
 import { Field } from '@nestjs/graphql';
-import { Transform, Type } from 'class-transformer';
+import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
 import { Constructor, HasRequiredKeys } from 'type-fest';
-import { DefaultValue } from './default-value';
 import { AbstractClassType } from './types';
 
 /**
@@ -24,11 +23,8 @@ export const FilterField = <T extends object>(
       : [
           Field(type as unknown as () => Constructor<T>, {
             nullable: true,
-            defaultValue: {} as unknown as T, // Only for GQL schema & not always applied in TS
           }),
         ]),
     Type(type),
     ValidateNested(),
-    DefaultValue.Set({}), // Default when omitted
-    Transform(({ value }) => value || {}), // null -> {}
   );

src/common/pagination.input.ts

@@ -4,7 +4,6 @@ import { setHas } from '@seedcompany/common';
 import { Matches, Max, Min } from 'class-validator';
 import { stripIndent } from 'common-tags';
 import { DataObject } from './data-object';
-import { DefaultValue } from './default-value';
 import { Order } from './order.enum';
 import { AbstractClassType } from './types';
 
@@ -126,7 +125,7 @@ export const ListArg = <T extends PaginationInput>(
       name: 'input',
       type: () => input,
       nullable: true,
-      defaultValue: DataObject.defaultValue(input, DefaultValue.Get(input)),
+      defaultValue: DataObject.defaultValue(input),
       ...opts,
     },
     ...pipes,

src/components/budget/budget-record.repository.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { node, Query, relation } from 'cypher-query-builder';
+import { pickBy } from 'lodash';
 import {
   ID,
   labelForView,
@@ -131,10 +132,14 @@ export class BudgetRecordRepository extends DtoRepository<
     session: Session,
     view?: ObjectView,
   ) {
-    const { budgetId } = input.filter;
+    const { budgetId } = input.filter ?? {};
     const result = await this.db
       .query()
-      .matchNode('budget', labelForView('Budget', view), { id: budgetId })
+      .matchNode(
+        'budget',
+        labelForView('Budget', view),
+        pickBy({ id: budgetId }),
+      )
       .apply(this.recordsOfBudget({ view }))
       .apply(sorting(BudgetRecord, input))
       .apply(paginate(input))

src/components/budget/budget.repository.ts

@@ -108,7 +108,7 @@ export class BudgetRepository extends DtoRepository<
       .match([
         node('node', 'Budget'),
         relation('in', '', 'budget', ACTIVE),
-        node('project', 'Project', pickBy({ id: filter.projectId })),
+        node('project', 'Project', pickBy({ id: filter?.projectId })),
       ])
       .match(requestingUser(session))
       .apply(
@@ -126,7 +126,7 @@ export class BudgetRepository extends DtoRepository<
     const result = await this.db
       .query()
       .match([
-        ...(filter.projectId
+        ...(filter?.projectId
           ? [
               node('node', 'Budget'),
               relation('in', '', 'budget', ACTIVE),

src/components/budget/dto/list-budget.dto.ts

@@ -21,7 +21,7 @@ export class BudgetListInput extends SortablePaginationInput<keyof Budget>({
   defaultSort: 'status',
 }) {
   @FilterField(() => BudgetFilters, { internal: true })
-  readonly filter: BudgetFilters;
+  readonly filter?: BudgetFilters;
 }
 
 @ObjectType()
@@ -45,7 +45,7 @@ export class BudgetRecordListInput extends SortablePaginationInput<
 }) {
   @Type(() => BudgetRecordFilters)
   @ValidateNested()
-  readonly filter: BudgetRecordFilters;
+  readonly filter?: BudgetRecordFilters;
 }
 
 @ObjectType()

src/components/ceremony/ceremony.repository.ts

@@ -72,7 +72,7 @@ export class CeremonyRepository extends DtoRepository<
         node('', 'Engagement'),
         relation('in', '', 'engagement', ACTIVE),
         node('project', 'Project'),
-        ...(filter.type
+        ...(filter?.type
           ? [
               relation('out', '', 'type', ACTIVE),
               node('name', 'Property', { value: filter.type }),

src/components/ceremony/dto/list-ceremony.dto.ts

@@ -19,7 +19,7 @@ export class CeremonyListInput extends SortablePaginationInput<
   defaultSort: 'projectName',
 }) {
   @FilterField(() => CeremonyFilters)
-  readonly filter: CeremonyFilters;
+  readonly filter?: CeremonyFilters;
 }
 
 @ObjectType()

src/components/engagement/dto/list-engagements.dto.ts

@@ -35,7 +35,7 @@ export class EngagementListInput extends SortablePaginationInput<
   defaultSort: 'createdAt',
 }) {
   @FilterField(() => EngagementFilters)
-  readonly filter: EngagementFilters;
+  readonly filter?: EngagementFilters;
 }
 
 @ObjectType()

src/components/engagement/engagement.repository.ts

@@ -336,7 +336,7 @@ export class EngagementRepository extends CommonRepository {
 
   async list(input: EngagementListInput, session: Session, changeset?: ID) {
     const label =
-      simpleSwitch(input.filter.type, {
+      simpleSwitch(input.filter?.type, {
         language: 'LanguageEngagement',
         internship: 'InternshipEngagement',
       }) ?? 'Engagement';
@@ -346,14 +346,14 @@ export class EngagementRepository extends CommonRepository {
       .subQuery((sub) =>
         sub
           .match([
-            node('project', 'Project', pickBy({ id: input.filter.projectId })),
+            node('project', 'Project', pickBy({ id: input.filter?.projectId })),
             relation('out', '', 'engagement', ACTIVE),
             node('node', label),
           ])
           .apply(whereNotDeletedInChangeset(changeset))
           .return(['node', 'project'])
           .apply((q) =>
-            changeset && input.filter.projectId
+            changeset && input.filter?.projectId
               ? q
                   .union()
                   .match([
@@ -369,7 +369,7 @@ export class EngagementRepository extends CommonRepository {
       )
       .match(requestingUser(session))
       .apply(
-        filter.builder(input.filter, {
+        filter.builder(input.filter ?? {}, {
           type: filter.skip,
           projectId: filter.skip,
           partnerId: filter.pathExists((id) => [

src/components/ethno-art/dto/list-ethno-art.dto.ts

@@ -10,7 +10,7 @@ export class EthnoArtListInput extends SortablePaginationInput<keyof EthnoArt>({
   defaultSort: 'name',
 }) {
   @FilterField(() => EthnoArtFilters, { internal: true })
-  readonly filter: EthnoArtFilters;
+  readonly filter?: EthnoArtFilters;
 }
 
 @ObjectType()