Merge pull request #3276 from SeedCompany/engagement-date-filters

Author: CarsonF

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

@@ -1,5 +1,8 @@
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
+import { Type } from 'class-transformer';
+import { ValidateNested } from 'class-validator';
 import {
+  DateFilter,
   FilterField,
   ID,
   PaginatedList,
@@ -56,6 +59,20 @@ export abstract class EngagementFilters {
   readonly intern?: UserFilters & {};
 
   readonly partnerId?: ID<'Partner'>;
+
+  @Field({
+    nullable: true,
+  })
+  @Type(() => DateFilter)
+  @ValidateNested()
+  readonly startDate?: DateFilter;
+
+  @Field({
+    nullable: true,
+  })
+  @Type(() => DateFilter)
+  @ValidateNested()
+  readonly endDate?: DateFilter;
 }
 
 @InputType()

src/components/engagement/engagement.repository.ts

@@ -619,6 +619,40 @@ export const engagementFilters = filter.define(() => EngagementFilters, {
         node('node', 'User'),
       ]),
   ),
+  startDate: filter.dateTime(({ query }) => {
+    query.optionalMatch([
+      [
+        node('node'),
+        relation('out', '', 'startDateOverride', ACTIVE),
+        node('startDateOverride', 'Property'),
+      ],
+      [
+        node('node'),
+        relation('in', '', 'engagement'),
+        node('project', 'Project'),
+        relation('out', '', 'mouStart', ACTIVE),
+        node('mouStart', 'Property'),
+      ],
+    ]);
+    return coalesce('startDateOverride.value', 'mouStart.value');
+  }),
+  endDate: filter.dateTime(({ query }) => {
+    query.optionalMatch([
+      [
+        node('node'),
+        relation('out', '', 'endDateOverride', ACTIVE),
+        node('endDateOverride', 'Property'),
+      ],
+      [
+        node('node'),
+        relation('in', '', 'engagement'),
+        node('project', 'Project'),
+        relation('out', '', 'mouEnd', ACTIVE),
+        node('mouEnd', 'Property'),
+      ],
+    ]);
+    return coalesce('endDateOverride.value', 'mouEnd.value');
+  }),
 });
 
 export const engagementSorters = defineSorters(IEngagement, {

src/core/database/query/filters.ts

@@ -188,30 +188,35 @@ export const isPinned = pathExists<{ pinned?: boolean }, 'pinned'>([
   node('node'),
 ]);
 
-export const dateTimeBaseNodeProp =
-  <T, K extends ConditionalKeys<T, DateTimeFilter | undefined>>(
-    prop?: string,
-  ): Builder<T, K> =>
-  ({ key, value }) => {
-    const comparison = comparisonOfDateTimeFilter(value);
-    return comparison ? { node: { [prop ?? key]: comparison } } : null;
-  };
+export const dateTimeBaseNodeProp = <
+  T,
+  K extends ConditionalKeys<T, DateTimeFilter | undefined>,
+>(
+  prop?: string,
+): Builder<T, K> => dateTime(({ key }) => `node.${prop ?? key}`);
 
-export const dateTimeProp =
-  <T, K extends ConditionalKeys<T, DateTimeFilter | undefined>>(
-    prop?: string,
-  ): Builder<T, K> =>
-  ({ key, value, query }) => {
-    const comparison = comparisonOfDateTimeFilter(value);
-    if (!comparison) {
-      return null;
-    }
+export const dateTimeProp = <
+  T,
+  K extends ConditionalKeys<T, DateTimeFilter | undefined>,
+>(
+  prop?: string,
+): Builder<T, K> =>
+  dateTime(({ key, query }) => {
     query.match([
       node('node'),
       relation('out', '', prop ?? key, ACTIVE),
       node(prop ?? key, 'Property'),
     ]);
-    return { [prop ?? key]: { value: comparison } };
+    return `${prop ?? key}.value`;
+  });
+
+export const dateTime =
+  <T, K extends ConditionalKeys<T, DateTimeFilter | undefined>>(
+    getLhs: (args: BuilderArgs<T, K>) => string,
+  ): Builder<T, K> =>
+  (args) => {
+    const comparator = comparisonOfDateTimeFilter(args.value);
+    return comparator ? { [getLhs(args)]: comparator } : null;
   };
 
 export const comparisonOfDateTimeFilter = (