@reldens/storage 0.45.0 → 0.46.0

package/lib/prisma/prisma-driver.js

@@ -157,6 +157,42 @@ class PrismaDriver extends BaseDriver
         return data;
     }
 
+    processFilters(filters)
+    {
+        if(!sc.isObject(filters)){
+            return filters;
+        }
+        let processedFilters = {};
+        for(let key of Object.keys(filters)){
+            let value = filters[key];
+            if(sc.hasOwn(value, 'operator') && sc.hasOwn(value, 'value')){
+                let operatorValue = value.value;
+                if('id' === key && sc.isArray(operatorValue)){
+                    operatorValue = operatorValue.map(id => this.castIdValue(id));
+                }
+                if('id' === key && !sc.isArray(operatorValue)){
+                    operatorValue = this.castIdValue(operatorValue);
+                }
+                processedFilters[key] = this.applyOperator(operatorValue, value.operator);
+                continue;
+            }
+            if(sc.isObject(value) && !sc.isArray(value)){
+                processedFilters[key] = this.processFilters(value);
+                continue;
+            }
+            if('id' === key && sc.isArray(value)){
+                processedFilters[key] = value.map(id => this.castIdValue(id));
+                continue;
+            }
+            if('id' === key){
+                processedFilters[key] = this.castIdValue(value);
+                continue;
+            }
+            processedFilters[key] = value;
+        }
+        return processedFilters;
+    }
+
     async create(params)
     {
         try {
@@ -205,8 +241,9 @@ class PrismaDriver extends BaseDriver
     {
         try {
             let preparedData = this.prepareData(updatePatch);
+            let processedFilters = this.processFilters(filters);
             return await this.model.updateMany({
-                where: filters,
+                where: processedFilters,
                 data: preparedData
             });
         } catch(error) {
@@ -285,8 +322,9 @@ class PrismaDriver extends BaseDriver
     async delete(filters = {})
     {
         try {
+            let processedFilters = this.processFilters(filters);
             return await this.model.deleteMany({
-                where: filters
+                where: processedFilters
             });
         } catch(error) {
             Logger.error('Delete error: '+error.message);
@@ -314,8 +352,9 @@ class PrismaDriver extends BaseDriver
     async count(filters)
     {
         try {
+            let processedFilters = this.processFilters(filters);
             return await this.model.count({
-                where: filters
+                where: processedFilters
             });
         } catch(error) {
             Logger.error('Count error: '+error.message);
@@ -326,8 +365,9 @@ class PrismaDriver extends BaseDriver
     async countWithRelations(filters, relations)
     {
         try {
+            let processedFilters = this.processFilters(filters);
             let query = {
-                where: filters
+                where: processedFilters
             };
             if(sc.isArray(relations) && 0 < relations.length){
                 query.include = this.buildIncludeObject(relations);
@@ -366,8 +406,9 @@ class PrismaDriver extends BaseDriver
     async load(filters)
     {
         try {
+            let processedFilters = this.processFilters(filters);
             let query = this.buildQueryOptions();
-            query.where = filters;
+            query.where = processedFilters;
             return await this.model.findMany(query);
         } catch(error) {
             Logger.error('Load error: '+error.message);
@@ -378,8 +419,9 @@ class PrismaDriver extends BaseDriver
     async loadWithRelations(filters, relations)
     {
         try {
+            let processedFilters = this.processFilters(filters);
             let query = this.buildQueryOptions();
-            query.where = filters;
+            query.where = processedFilters;
             if(sc.isArray(relations) && 0 < relations.length){
                 query.include = this.buildIncludeObject(relations);
             }
@@ -467,8 +509,9 @@ class PrismaDriver extends BaseDriver
     async loadOne(filters)
     {
         try {
+            let processedFilters = this.processFilters(filters);
             let query = this.buildQueryOptions(false);
-            query.where = filters;
+            query.where = processedFilters;
             return await this.model.findFirst(query);
         } catch(error) {
             Logger.error('Load one error: '+error.message);
@@ -479,8 +522,9 @@ class PrismaDriver extends BaseDriver
     async loadOneWithRelations(filters, relations)
     {
         try {
+            let processedFilters = this.processFilters(filters);
             let query = this.buildQueryOptions(false);
-            query.where = filters;
+            query.where = processedFilters;
             if(sc.isArray(relations) && 0 < relations.length){
                 query.include = this.buildIncludeObject(relations);
             }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.45.0",
+    "version": "0.46.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -46,7 +46,7 @@
         "@mikro-orm/mongodb": "^6.4.15",
         "@mikro-orm/mysql": "^6.4.15",
         "@prisma/client": "^6.8.2",
-        "@reldens/server-utils": "^0.16.0",
+        "@reldens/server-utils": "^0.17.0",
         "@reldens/utils": "^0.47.0",
         "knex": "^3.1.0",
         "mysql": "^2.18.1",