Merge 299c0ae into 8ef174f

nestjsx · Dec 7, 2019 · a1ed2c1 · a1ed2c1
2 parents 8ef174f + 299c0ae
commit a1ed2c1
Show file tree

Hide file tree

Showing 13 changed files with 325 additions and 239 deletions.
diff --git a/packages/crud-request/src/interfaces/parsed-request.interface.ts b/packages/crud-request/src/interfaces/parsed-request.interface.ts
@@ -4,7 +4,6 @@ import { QueryFields, QueryFilter, QueryJoin, QuerySort, SCondition } from '../t
 export interface ParsedRequestParams {
   fields: QueryFields;
   paramsFilter: QueryFilter[];
-  authFilter: ObjectLiteral;
   authPersist: ObjectLiteral;
   search: SCondition;
   filter: QueryFilter[];

diff --git a/packages/crud-request/src/request-query.parser.ts b/packages/crud-request/src/request-query.parser.ts
@@ -34,13 +34,14 @@ import {
   QueryJoin,
   QuerySort,
   SCondition,
+  SConditionAND,
+  SFields,
 } from './types';
 
 // tslint:disable:variable-name ban-types
 export class RequestQueryParser implements ParsedRequestParams {
   public fields: QueryFields = [];
   public paramsFilter: QueryFilter[] = [];
-  public authFilter: ObjectLiteral = undefined;
   public authPersist: ObjectLiteral = undefined;
   public search: SCondition;
   public filter: QueryFilter[] = [];
@@ -69,7 +70,6 @@ export class RequestQueryParser implements ParsedRequestParams {
     return {
       fields: this.fields,
       paramsFilter: this.paramsFilter,
-      authFilter: this.authFilter,
       authPersist: this.authPersist,
       search: this.search,
       filter: this.filter,
@@ -142,12 +142,25 @@ export class RequestQueryParser implements ParsedRequestParams {
     return this;
   }
 
-  setAuthFilter(filter: ObjectLiteral = {}) {
-    this.authFilter = filter;
+  setAuthPersist(persist: ObjectLiteral = {}) {
+    this.authPersist = persist || {};
   }
 
-  setAuthPersist(persist: ObjectLiteral = {}) {
-    this.authPersist = persist;
+  convertFilterToSearch(filter: QueryFilter): SFields | SConditionAND {
+    const isEmptyValue = {
+      isnull: true,
+      notnull: true,
+    };
+
+    return filter
+      ? {
+          [filter.field]: {
+            [filter.operator]: isEmptyValue[filter.operator]
+              ? isEmptyValue[filter.operator]
+              : filter.value,
+          },
+        }
+      : {};
   }
 
   private getParamNames(
@@ -320,6 +333,6 @@ export class RequestQueryParser implements ParsedRequestParams {
         break;
     }
 
-    return { field: option.field, operator: 'eq', value };
+    return { field: option.field, operator: '$eq', value };
   }
 }
diff --git a/packages/crud-request/src/types/request-query.types.ts b/packages/crud-request/src/types/request-query.types.ts
@@ -22,7 +22,9 @@ export type QuerySort = {
 
 export type QuerySortArr = [string, QuerySortOperator];
 
-export type ComparisonOperator =
+export type QuerySortOperator = 'ASC' | 'DESC';
+
+type DeprecatedCondOperator =
   | 'eq'
   | 'ne'
   | 'gt'
@@ -37,31 +39,41 @@ export type ComparisonOperator =
   | 'notin'
   | 'isnull'
   | 'notnull'
-  | 'between'
-  | keyof SFieldOperator;
-export type QuerySortOperator = 'ASC' | 'DESC';
+  | 'between';
 
 export enum CondOperator {
-  EQUALS = 'eq',
-  NOT_EQUALS = 'ne',
-  GREATER_THAN = 'gt',
-  LOWER_THAN = 'lt',
-  GREATER_THAN_EQUALS = 'gte',
-  LOWER_THAN_EQUALS = 'lte',
-  STARTS = 'starts',
-  ENDS = 'ends',
-  CONTAINS = 'cont',
-  EXCLUDES = 'excl',
-  IN = 'in',
-  NOT_IN = 'notin',
-  IS_NULL = 'isnull',
-  NOT_NULL = 'notnull',
-  BETWEEN = 'between',
+  EQUALS = '$eq',
+  NOT_EQUALS = '$ne',
+  GREATER_THAN = '$gt',
+  LOWER_THAN = '$lt',
+  GREATER_THAN_EQUALS = '$gte',
+  LOWER_THAN_EQUALS = '$lte',
+  STARTS = '$starts',
+  ENDS = '$ends',
+  CONTAINS = '$cont',
+  EXCLUDES = '$excl',
+  IN = '$in',
+  NOT_IN = '$notin',
+  IS_NULL = '$isnull',
+  NOT_NULL = '$notnull',
+  BETWEEN = '$between',
+  EQUALS_LOW = '$eqL',
+  NOT_EQUALS_LOW = '$neL',
+  STARTS_LOW = '$startsL',
+  ENDS_LOW = '$endsL',
+  CONTAINS_LOW = '$contL',
+  EXCLUDES_LOW = '$exclL',
+  IN_LOW = '$inL',
+  NOT_IN_LOW = '$betweenL',
 }
 
+export type ComparisonOperator = DeprecatedCondOperator | keyof SFieldOperator;
+
 // new search
 export type SPrimitivesVal = string | number | boolean;
+
 export type SFiledValues = SPrimitivesVal | Array<SPrimitivesVal>;
+
 export type SFieldOperator = {
   $eq?: SFiledValues;
   $ne?: SFiledValues;
@@ -78,9 +90,19 @@ export type SFieldOperator = {
   $between?: SFiledValues;
   $isnull?: SFiledValues;
   $notnull?: SFiledValues;
+  $eqL?: SFiledValues;
+  $neL?: SFiledValues;
+  $startsL?: SFiledValues;
+  $endsL?: SFiledValues;
+  $contL?: SFiledValues;
+  $exclL?: SFiledValues;
+  $inL?: SFiledValues;
+  $notinL?: SFiledValues;
+  $betweenL?: SFiledValues;
   $or?: SFieldOperator;
   $and?: never;
 };
+
 export type SField = SPrimitivesVal | SFieldOperator;
 
 export type SFields = {

diff --git a/packages/crud-request/test/request-query.parser.spec.ts b/packages/crud-request/test/request-query.parser.spec.ts
@@ -451,10 +451,14 @@ describe('#request-query', () => {
         };
         const test = qp.parseParams(params, options);
         const expected = [
-          { field: 'foo', operator: 'eq', value: 'cb1751fd-7fcf-4eb5-b38e-86428b1fd88d' },
-          { field: 'bb', operator: 'eq', value: 1 },
-          { field: 'buz', operator: 'eq', value: 'string' },
-          { field: 'bigInt', operator: 'eq', value: '9007199254740999' },
+          {
+            field: 'foo',
+            operator: '$eq',
+            value: 'cb1751fd-7fcf-4eb5-b38e-86428b1fd88d',
+          },
+          { field: 'bb', operator: '$eq', value: 1 },
+          { field: 'buz', operator: '$eq', value: 'string' },
+          { field: 'bigInt', operator: '$eq', value: '9007199254740999' },
         ];
         expect(test.paramsFilter).toMatchObject(expected);
       });
@@ -468,24 +472,11 @@ describe('#request-query', () => {
           bar: { field: 'bar', type: 'number' },
         };
         const test = qp.parseParams(params, options);
-        const expected = [{ field: 'bar', operator: 'eq', value: 123 }];
+        const expected = [{ field: 'bar', operator: '$eq', value: 123 }];
         expect(test.paramsFilter).toMatchObject(expected);
       });
     });
 
-    describe('#setAuthFilter', () => {
-      it('it should set authFilter, 1', () => {
-        qp.setAuthFilter();
-        expect(qp.authFilter).toMatchObject({});
-      });
-      it('it should set authFilter, 2', () => {
-        const test = { foo: 'bar' };
-        qp.setAuthFilter(test);
-        const parsed = qp.getParsed();
-        expect(parsed.authFilter).toMatchObject(test);
-      });
-    });
-
     describe('#setAuthPersist', () => {
       it('it should set authPersist, 1', () => {
         qp.setAuthPersist();
@@ -505,7 +496,6 @@ describe('#request-query', () => {
           fields: [],
           paramsFilter: [],
           search: undefined,
-          authFilter: undefined,
           authPersist: undefined,
           filter: [],
           or: [],

diff --git a/packages/crud-typeorm/package.json b/packages/crud-typeorm/package.json
@@ -37,5 +37,8 @@
   },
   "scripts": {
     "build": "npx tsc -b"
+  },
+  "dependencies": {
+    "@zmotivat0r/o0": "^1.0.2"
   }
 }