rez_core 2.0.67 → 2.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.0.67",
+  "version": "2.0.68",
   "description": "",
   "author": "",
   "private": false,

package/src/module/filter/service/filter.service.ts

@@ -268,6 +268,8 @@ export class FilterService {
         return this.buildSelectCondition(attr, op, val, key);
       case 'multiselect':
         return this.buildMultiSelectCondition(attr, op, val, key);
+      case 'year':
+        return this.buildYearCondition(attr, op, val, key);
       default:
         return null;
     }
@@ -338,7 +340,6 @@ export class FilterService {
     }
   }
 
-  // this can be inproved
   private buildSelectCondition(
     attr: string,
     op: string,
@@ -348,16 +349,12 @@ export class FilterService {
     switch (op) {
       case 'equal':
         return { query: `e.${attr} = :${key}`, params: { [key]: val } };
-
       case 'not_equal':
         return { query: `e.${attr} != :${key}`, params: { [key]: val } };
-
       case 'empty':
         return { query: `e.${attr} IS NULL`, params: {} };
-
       case 'not_empty':
         return { query: `e.${attr} IS NOT NULL`, params: {} };
-
       default:
         throw new BadRequestException(`Unsupported operator for select: ${op}`);
     }
@@ -385,23 +382,46 @@ export class FilterService {
           query: `e.${attr} IN (:${key})`,
           params: { [key]: val },
         };
-
       case 'not_equal':
         return {
           query: `e.${attr} NOT IN (:${key})`,
           params: { [key]: val },
         };
-
       case 'empty':
         return { query: `e.${attr} IS NULL`, params: {} };
-
       case 'not_empty':
         return { query: `e.${attr} IS NOT NULL`, params: {} };
-
       default:
         throw new BadRequestException(
           `Unsupported operator for multiselect: ${op}`,
         );
     }
   }
+
+  private buildYearCondition(attr: string, op: string, val: any, key: string) {
+    switch (op) {
+      case 'equal':
+        return {
+          query: `e.${attr} = :${key}`,
+          params: { [key]: parseInt(val, 10) },
+        };
+      case 'not_equal':
+        return {
+          query: `e.${attr} != :${key}`,
+          params: { [key]: parseInt(val, 10) },
+        };
+      case 'greater_than':
+        return {
+          query: `e.${attr} > :${key}`,
+          params: { [key]: parseInt(val, 10) },
+        };
+      case 'less_than':
+        return {
+          query: `e.${attr} < :${key}`,
+          params: { [key]: parseInt(val, 10) },
+        };
+      default:
+        throw new BadRequestException(`Unsupported operator for year: ${op}`);
+    }
+  }
 }