Define new style filters for FieldRegion & FieldZone

Author: CarsonF

src/components/field-region/dto/list-field-region.dto.ts

@@ -2,15 +2,21 @@ import { InputType, ObjectType } from '@nestjs/graphql';
 import {
   FilterField,
   type ID,
+  IdField,
   PaginatedList,
   SecuredList,
   SortablePaginationInput,
 } from '~/common';
+import { FieldZoneFilters } from '../../field-zone/dto';
 import { FieldRegion } from './field-region.dto';
 
 @InputType()
 export abstract class FieldRegionFilters {
-  readonly fieldZoneId?: ID;
+  @IdField({ optional: true })
+  readonly id?: ID<'FieldRegion'>;
+
+  @FilterField(() => FieldZoneFilters)
+  readonly fieldZone?: FieldZoneFilters & {};
 }
 
 @InputType()
@@ -19,7 +25,7 @@ export class FieldRegionListInput extends SortablePaginationInput<
 >({
   defaultSort: 'name',
 }) {
-  @FilterField(() => FieldRegionFilters, { internal: true })
+  @FilterField(() => FieldRegionFilters)
   readonly filter?: FieldRegionFilters;
 }
 

src/components/field-region/field-region.repository.ts

@@ -14,14 +14,17 @@ import {
   ACTIVE,
   createNode,
   createRelationships,
+  filter,
   matchProps,
   merge,
   paginate,
   sorting,
 } from '~/core/database/query';
+import { fieldZoneFilters } from '../field-zone/field-zone.repository';
 import {
   type CreateFieldRegion,
   FieldRegion,
+  FieldRegionFilters,
   type FieldRegionListInput,
   type UpdateFieldRegion,
 } from './dto';
@@ -102,13 +105,14 @@ export class FieldRegionRepository extends DtoRepository(FieldRegion) {
         );
   }
 
-  async list({ filter, ...input }: FieldRegionListInput) {
+  async list(input: FieldRegionListInput) {
     if (!this.privileges.can('read')) {
       return SecuredList.Redacted;
     }
     const result = await this.db
       .query()
       .match(node('node', 'FieldRegion'))
+      .apply(fieldRegionFilters(input.filter))
       .apply(sorting(FieldRegion, input))
       .apply(paginate(input, this.hydrate()))
       .first();
@@ -128,3 +132,14 @@ export class FieldRegionRepository extends DtoRepository(FieldRegion) {
       .run();
   }
 }
+
+export const fieldRegionFilters = filter.define(() => FieldRegionFilters, {
+  id: filter.baseNodeProp(),
+  fieldZone: filter.sub(() => fieldZoneFilters)((sub) =>
+    sub.match([
+      node('outer'),
+      relation('out', '', 'zone', ACTIVE),
+      node('node', 'FieldZone'),
+    ]),
+  ),
+});

src/components/field-zone/dto/list-field-zone.dto.ts

@@ -2,6 +2,7 @@ import { InputType, ObjectType } from '@nestjs/graphql';
 import {
   FilterField,
   type ID,
+  IdField,
   PaginatedList,
   SecuredList,
   SortablePaginationInput,
@@ -10,7 +11,8 @@ import { FieldZone } from './field-zone.dto';
 
 @InputType()
 export abstract class FieldZoneFilters {
-  readonly fieldZoneId?: ID;
+  @IdField({ optional: true })
+  readonly id?: ID<'FieldZone'>;
 }
 
 @InputType()
@@ -19,7 +21,7 @@ export class FieldZoneListInput extends SortablePaginationInput<
 >({
   defaultSort: 'name',
 }) {
-  @FilterField(() => FieldZoneFilters, { internal: true })
+  @FilterField(() => FieldZoneFilters)
   readonly filter?: FieldZoneFilters;
 }
 

src/components/field-zone/field-zone.repository.ts

@@ -15,6 +15,7 @@ import {
   ACTIVE,
   createNode,
   createRelationships,
+  filter,
   matchProps,
   merge,
   paginate,
@@ -23,6 +24,7 @@ import {
 import {
   type CreateFieldZone,
   FieldZone,
+  FieldZoneFilters,
   type FieldZoneListInput,
   type UpdateFieldZone,
 } from './dto';
@@ -121,13 +123,14 @@ export class FieldZoneRepository extends DtoRepository(FieldZone) {
     await query.run();
   }
 
-  async list({ filter, ...input }: FieldZoneListInput) {
+  async list(input: FieldZoneListInput) {
     if (!this.privileges.can('read')) {
       return SecuredList.Redacted;
     }
     const result = await this.db
       .query()
       .match(node('node', 'FieldZone'))
+      .apply(fieldZoneFilters(input.filter))
       .apply(sorting(FieldZone, input))
       .apply(paginate(input, this.hydrate()))
       .first();
@@ -147,3 +150,7 @@ export class FieldZoneRepository extends DtoRepository(FieldZone) {
       .run();
   }
 }
+
+export const fieldZoneFilters = filter.define(() => FieldZoneFilters, {
+  id: filter.baseNodeProp(),
+});