Merge pull request #3273 from SeedCompany/date-filters-projects

Author: CarsonF

src/common/date-filter.input.ts

@@ -1,4 +1,4 @@
-import { InputType } from '@nestjs/graphql';
+import { Field, InputType } from '@nestjs/graphql';
 import { DateTime } from 'luxon';
 import { DateField, DateTimeField } from './luxon.graphql';
 import { CalendarDate } from './temporal';
@@ -30,6 +30,9 @@ export abstract class DateFilter {
     nullable: true,
   })
   beforeInclusive?: CalendarDate;
+
+  @Field({ description: 'Whether the field is null or not', nullable: true })
+  isNull?: boolean;
 }
 
 @InputType({
@@ -59,4 +62,7 @@ export abstract class DateTimeFilter {
     nullable: true,
   })
   beforeInclusive?: DateTime;
+
+  @Field({ description: 'Whether the field is null or not', nullable: true })
+  isNull?: boolean;
 }

src/components/project/dto/list-projects.dto.ts

@@ -2,6 +2,7 @@ import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
 import {
+  DateFilter,
   DateTimeFilter,
   FilterField,
   ID,
@@ -78,6 +79,20 @@ export abstract class ProjectFilters {
   @ValidateNested()
   readonly modifiedAt?: DateTimeFilter;
 
+  @Field({
+    nullable: true,
+  })
+  @Type(() => DateFilter)
+  @ValidateNested()
+  readonly mouStart?: DateFilter;
+
+  @Field({
+    nullable: true,
+  })
+  @Type(() => DateFilter)
+  @ValidateNested()
+  readonly mouEnd?: DateFilter;
+
   @Field({
     nullable: true,
     description: 'only mine',

src/components/project/project-filters.query.ts

@@ -40,6 +40,8 @@ export const projectFilters = filter.define(() => ProjectFilters, {
   step: filter.stringListProp(),
   createdAt: filter.dateTimeBaseNodeProp(),
   modifiedAt: filter.dateTimeProp(),
+  mouStart: filter.dateTimeProp(),
+  mouEnd: filter.dateTimeProp(),
   mine: filter.pathExistsWhenTrue([
     node('requestingUser'),
     relation('in', '', 'user'),

src/core/database/query/filters.ts

@@ -222,9 +222,13 @@ export const comparisonOfDateTimeFilter = (
     after: comparisions.greaterThan,
     beforeInclusive: comparisions.lessEqualTo,
     before: comparisions.lessThan,
+    isNull:
+      (val: boolean | any): Comparator =>
+      (_, name) =>
+        `${name} ${val ? 'IS' : 'IS NOT'} NULL`,
   };
   const comparators = entries(input).flatMap(([key, val]) =>
-    val ? comparatorMap[key](val) : [],
+    val != null ? comparatorMap[key](val) : [],
   );
   return comparators.length > 0
     ? (...args) => comparators.map((comp) => comp(...args)).join(' AND ')