Add FieldRegion/FieldZone director sorting/filtering

Author: CarsonF

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

@@ -8,13 +8,17 @@ import {
   SortablePaginationInput,
 } from '~/common';
 import { FieldZoneFilters } from '../../field-zone/dto';
+import { UserFilters } from '../../user/dto';
 import { FieldRegion } from './field-region.dto';
 
 @InputType()
 export abstract class FieldRegionFilters {
   @IdField({ optional: true })
   readonly id?: ID<'FieldRegion'>;
 
+  @FilterField(() => UserFilters)
+  readonly director?: UserFilters & {};
+
   @FilterField(() => FieldZoneFilters)
   readonly fieldZone?: FieldZoneFilters & {};
 }

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

@@ -25,6 +25,7 @@ import {
   fieldZoneFilters,
   fieldZoneSorters,
 } from '../field-zone/field-zone.repository';
+import { userFilters, userSorters } from '../user/user.repository';
 import {
   type CreateFieldRegion,
   FieldRegion,
@@ -139,6 +140,13 @@ export class FieldRegionRepository extends DtoRepository(FieldRegion) {
 
 export const fieldRegionFilters = filter.define(() => FieldRegionFilters, {
   id: filter.baseNodeProp(),
+  director: filter.sub(() => userFilters)((sub) =>
+    sub.match([
+      node('outer'),
+      relation('out', '', 'director', ACTIVE),
+      node('node', 'User'),
+    ]),
+  ),
   fieldZone: filter.sub(() => fieldZoneFilters)((sub) =>
     sub.match([
       node('outer'),
@@ -150,6 +158,16 @@ export const fieldRegionFilters = filter.define(() => FieldRegionFilters, {
 
 export const fieldRegionSorters = defineSorters(FieldRegion, {
   // eslint-disable-next-line @typescript-eslint/naming-convention
+  'director.*': (query, input) =>
+    query
+      .with('node as region')
+      .match([
+        node('region'),
+        relation('out', '', 'director', ACTIVE),
+        node('node', 'User'),
+      ])
+      .apply(sortWith(userSorters, input)),
+  // eslint-disable-next-line @typescript-eslint/naming-convention
   'fieldZone.*': (query, input) =>
     query
       .with('node as region')

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

@@ -7,12 +7,16 @@ import {
   SecuredList,
   SortablePaginationInput,
 } from '~/common';
+import { UserFilters } from '../../user/dto';
 import { FieldZone } from './field-zone.dto';
 
 @InputType()
 export abstract class FieldZoneFilters {
   @IdField({ optional: true })
   readonly id?: ID<'FieldZone'>;
+
+  @FilterField(() => UserFilters)
+  readonly director?: UserFilters & {};
 }
 
 @InputType()

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

@@ -22,6 +22,7 @@ import {
   paginate,
   sortWith,
 } from '~/core/database/query';
+import { userFilters, userSorters } from '../user/user.repository';
 import {
   type CreateFieldZone,
   FieldZone,
@@ -154,6 +155,24 @@ export class FieldZoneRepository extends DtoRepository(FieldZone) {
 
 export const fieldZoneFilters = filter.define(() => FieldZoneFilters, {
   id: filter.baseNodeProp(),
+  director: filter.sub(() => userFilters)((sub) =>
+    sub.match([
+      node('outer'),
+      relation('out', '', 'director', ACTIVE),
+      node('node', 'User'),
+    ]),
+  ),
 });
 
-export const fieldZoneSorters = defineSorters(FieldZone, {});
+export const fieldZoneSorters = defineSorters(FieldZone, {
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  'director.*': (query, input) =>
+    query
+      .with('node as zone')
+      .match([
+        node('zone'),
+        relation('out', '', 'director', ACTIVE),
+        node('node', 'User'),
+      ])
+      .apply(sortWith(userSorters, input)),
+});