@takaro/db 0.0.1 → 0.0.5

package/src/queryBuilder.ts

@@ -1,5 +1,12 @@
-import { IsDateString, IsEnum, IsNumber, IsOptional, IsString } from 'class-validator';
-import { QueryBuilder as ObjectionQueryBuilder, Model as ObjectionModel, Page, AnyQueryBuilder } from 'objection';
+import { IsEnum, IsNumber, IsOptional, IsString } from 'class-validator';
+import {
+  QueryBuilder as ObjectionQueryBuilder,
+  Model as ObjectionModel,
+  Page,
+  AnyQueryBuilder,
+  Expression,
+  PrimitiveValue,
+} from 'objection';
 
 export class ITakaroQuery<T> {
   @IsOptional()
@@ -12,6 +19,16 @@ export class ITakaroQuery<T> {
     [key in keyof T]?: unknown[] | unknown;
   };
 
+  @IsOptional()
+  greaterThan?: {
+    [key in keyof T]?: unknown;
+  };
+
+  @IsOptional()
+  lessThan?: {
+    [key in keyof T]?: unknown;
+  };
+
   @IsOptional()
   @IsNumber()
   page?: number;
@@ -29,14 +46,6 @@ export class ITakaroQuery<T> {
   @IsEnum(['asc', 'desc'])
   sortDirection?: SortDirection;
 
-  @IsOptional()
-  @IsDateString()
-  startDate?: string;
-
-  @IsOptional()
-  @IsDateString()
-  endDate?: string;
-
   @IsOptional()
   @IsString({ each: true })
   extend?: string[];
@@ -58,14 +67,9 @@ export class QueryBuilder<Model extends ObjectionModel, OutputDTO> {
 
     let qry = query.page(pagination.page, pagination.limit).orderBy(sorting.sortBy, sorting.sortDirection);
 
-    if (this.query.startDate) {
-      qry = qry.where(`${tableName}.createdAt`, '>=', this.query.startDate);
-    }
-    if (this.query.endDate) {
-      qry = qry.where(`${tableName}.createdAt`, '<=', this.query.endDate);
-    }
-
     qry = this.filters(tableName, qry);
+    qry = this.greaterThan(tableName, qry);
+    qry = this.lessThan(tableName, qry);
 
     if (this.query.search) {
       qry.where((builder) => {
@@ -93,15 +97,19 @@ export class QueryBuilder<Model extends ObjectionModel, OutputDTO> {
 
   private filters(
     tableName: string,
-    query: ObjectionQueryBuilder<Model, Page<Model>>
+    query: ObjectionQueryBuilder<Model, Page<Model>>,
   ): ObjectionQueryBuilder<Model, Page<Model>> {
     for (const filter in this.query.filters) {
       if (Object.prototype.hasOwnProperty.call(this.query.filters, filter)) {
         const searchVal = this.query.filters[filter];
 
         if (searchVal && Array.isArray(searchVal)) {
-          const filtered = searchVal.filter(Boolean);
-          if (filtered.length) {
+          if (searchVal.includes(null) || searchVal.includes('null')) {
+            query.whereNull(`${tableName}.${filter}`);
+            continue;
+          }
+
+          if (searchVal.length) {
             query.whereIn(`${tableName}.${filter}`, searchVal.filter(Boolean) as unknown as AnyQueryBuilder);
           }
         }
@@ -111,6 +119,38 @@ export class QueryBuilder<Model extends ObjectionModel, OutputDTO> {
     return query;
   }
 
+  private greaterThan(
+    tableName: string,
+    query: ObjectionQueryBuilder<Model, Page<Model>>,
+  ): ObjectionQueryBuilder<Model, Page<Model>> {
+    for (const filter in this.query.greaterThan) {
+      if (Object.prototype.hasOwnProperty.call(this.query.greaterThan, filter)) {
+        const searchVal = this.query.greaterThan[filter];
+        if (searchVal) {
+          query.where(`${tableName}.${filter}`, '>=', searchVal as unknown as Expression<PrimitiveValue>);
+        }
+      }
+    }
+
+    return query;
+  }
+
+  private lessThan(
+    tableName: string,
+    query: ObjectionQueryBuilder<Model, Page<Model>>,
+  ): ObjectionQueryBuilder<Model, Page<Model>> {
+    for (const filter in this.query.lessThan) {
+      if (Object.prototype.hasOwnProperty.call(this.query.lessThan, filter)) {
+        const searchVal = this.query.lessThan[filter];
+        if (searchVal) {
+          query.where(`${tableName}.${filter}`, '<=', searchVal as unknown as Expression<PrimitiveValue>);
+        }
+      }
+    }
+
+    return query;
+  }
+
   private sorting(): { sortBy: string; sortDirection: SortDirection } {
     if (!this.query.sortBy) {
       return {