ismx-nexo-node-app 0.4.136 → 0.4.138

package/dist/js/business/utils/DateUtils.js

@@ -91,6 +91,33 @@ class DateUtils {
         };
         return recursivelyRevive(obj);
     }
+    static split(span, from, to) {
+        const dates = [];
+        const current = new Date(from);
+        switch (span) {
+            case 'day':
+                while (current <= to) {
+                    dates.push(new Date(current));
+                    current.setDate(current.getDate() + 1);
+                }
+                break;
+            case 'month':
+                current.setDate(1);
+                while (current <= to) {
+                    dates.push(new Date(current.getFullYear(), current.getMonth(), 1));
+                    current.setMonth(current.getMonth() + 1);
+                }
+                break;
+            case 'year':
+                current.setMonth(0, 1);
+                while (current <= to) {
+                    dates.push(new Date(current.getFullYear(), 0, 1));
+                    current.setFullYear(current.getFullYear() + 1);
+                }
+                break;
+        }
+        return dates;
+    }
 }
 DateUtils.MILLIS = 1;
 DateUtils.SECONDS = 1000 * DateUtils.MILLIS;

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -307,14 +307,21 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
                 continue;
             if (alias !== "")
                 alias += ".";
-            if (value instanceof Array)
+            if (value instanceof Array) {
                 where += ` AND ${alias}${column} = ANY(\$${iter++})`;
-            else if (value === null)
+                values.push(value);
+            }
+            else if (value instanceof PgOperator) {
+                let idxs = value.vals.map((v) => { values.push(v); return `\$${iter++}`; });
+                where += ` AND ${value.toWhere(`${alias}${column}`, idxs)}`;
+            }
+            else if (value === null) {
                 where += ` AND ${alias}${column} IS NULL`;
-            else
-                where += ` AND ${alias}${column}=\$${iter++}`;
-            if (value !== null)
+            }
+            else {
+                where += ` AND ${alias}${column} = \$${iter++}`;
                 values.push(value);
+            }
         }
         return { where, values };
     }

package/dist/types/business/utils/DateUtils.d.ts

@@ -17,4 +17,5 @@ export default abstract class DateUtils {
     static isIsoDate(value: string): boolean;
     static reviveDate(value: string): string | Date;
     static reviveDates<T>(obj: T): T;
+    static split(span: 'year' | 'month' | 'day', from: Date, to: Date): Date[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.136",
+  "version": "0.4.138",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/business/utils/DateUtils.ts

@@ -115,4 +115,37 @@ export default abstract class DateUtils {
 
         return recursivelyRevive(obj);
     }
+
+    static split(span: 'year' | 'month' | 'day', from: Date, to: Date): Date[]
+    {
+        const dates: Date[] = [];
+        const current = new Date(from);
+
+        switch (span) {
+            case 'day':
+                while (current <= to) {
+                    dates.push(new Date(current));
+                    current.setDate(current.getDate() + 1);
+                }
+                break;
+
+            case 'month':
+                current.setDate(1);
+                while (current <= to) {
+                    dates.push(new Date(current.getFullYear(), current.getMonth(), 1));
+                    current.setMonth(current.getMonth() + 1);
+                }
+                break;
+
+            case 'year':
+                current.setMonth(0, 1);
+                while (current <= to) {
+                    dates.push(new Date(current.getFullYear(), 0, 1));
+                    current.setFullYear(current.getFullYear() + 1);
+                }
+                break;
+        }
+
+        return dates;
+    }
 }

package/src/main/node/repository/RepositoryDatabasePostgres.ts

@@ -274,10 +274,22 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
             let column = PostgresUtils.camelToSnake(key);
             if (value === undefined) continue;
             if (alias !== "") alias += "."
-            if (value instanceof Array) where += ` AND ${alias}${column} = ANY(\$${iter++})`
-            else if (value === null) where += ` AND ${alias}${column} IS NULL`
-            else where += ` AND ${alias}${column}=\$${iter++}`
-            if (value !== null) values.push(value);
+
+            if (value instanceof Array) {
+                where += ` AND ${alias}${column} = ANY(\$${iter++})`;
+                values.push(value);
+
+            } else if (value instanceof PgOperator) {
+                let idxs = value.vals.map((v) => { values.push(v); return `\$${iter++}` });
+                where += ` AND ${value.toWhere(`${alias}${column}`, idxs)}`
+
+            } else if (value === null) {
+                where += ` AND ${alias}${column} IS NULL`
+
+            } else {
+                where += ` AND ${alias}${column} = \$${iter++}`;
+                values.push(value);
+            }
         }
 
         return { where, values };