Define new style sorters for FieldRegion & FieldZone

Author: CarsonF

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

@@ -14,13 +14,17 @@ import {
   ACTIVE,
   createNode,
   createRelationships,
+  defineSorters,
   filter,
   matchProps,
   merge,
   paginate,
-  sorting,
+  sortWith,
 } from '~/core/database/query';
-import { fieldZoneFilters } from '../field-zone/field-zone.repository';
+import {
+  fieldZoneFilters,
+  fieldZoneSorters,
+} from '../field-zone/field-zone.repository';
 import {
   type CreateFieldRegion,
   FieldRegion,
@@ -113,7 +117,7 @@ export class FieldRegionRepository extends DtoRepository(FieldRegion) {
       .query()
       .match(node('node', 'FieldRegion'))
       .apply(fieldRegionFilters(input.filter))
-      .apply(sorting(FieldRegion, input))
+      .apply(sortWith(fieldRegionSorters, input))
       .apply(paginate(input, this.hydrate()))
       .first();
     return result!; // result from paginate() will always have 1 row.
@@ -143,3 +147,16 @@ export const fieldRegionFilters = filter.define(() => FieldRegionFilters, {
     ]),
   ),
 });
+
+export const fieldRegionSorters = defineSorters(FieldRegion, {
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  'fieldZone.*': (query, input) =>
+    query
+      .with('node as region')
+      .match([
+        node('region'),
+        relation('out', '', 'zone', ACTIVE),
+        node('node', 'FieldZone'),
+      ])
+      .apply(sortWith(fieldZoneSorters, input)),
+});

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

@@ -15,11 +15,12 @@ import {
   ACTIVE,
   createNode,
   createRelationships,
+  defineSorters,
   filter,
   matchProps,
   merge,
   paginate,
-  sorting,
+  sortWith,
 } from '~/core/database/query';
 import {
   type CreateFieldZone,
@@ -131,7 +132,7 @@ export class FieldZoneRepository extends DtoRepository(FieldZone) {
       .query()
       .match(node('node', 'FieldZone'))
       .apply(fieldZoneFilters(input.filter))
-      .apply(sorting(FieldZone, input))
+      .apply(sortWith(fieldZoneSorters, input))
       .apply(paginate(input, this.hydrate()))
       .first();
     return result!; // result from paginate() will always have 1 row.
@@ -154,3 +155,5 @@ export class FieldZoneRepository extends DtoRepository(FieldZone) {
 export const fieldZoneFilters = filter.define(() => FieldZoneFilters, {
   id: filter.baseNodeProp(),
 });
+
+export const fieldZoneSorters = defineSorters(FieldZone, {});