@reldens/storage 0.79.0 → 0.81.0

package/lib/prisma/prisma-driver.js

@@ -5,8 +5,10 @@
  */
 
 const { BaseDriver } = require('../base-driver');
+const { PrismaTypeCaster } = require('./prisma-type-caster');
+const { PrismaMetadataLoader } = require('./prisma-metadata-loader');
+const { PrismaRelationResolver } = require('./prisma-relation-resolver');
 const { Logger, sc } = require('@reldens/utils');
-const { Prisma } = require('@prisma/client');
 
 class PrismaDriver extends BaseDriver
 {
@@ -24,302 +26,59 @@ class PrismaDriver extends BaseDriver
         }
         this.prisma = props.prisma;
         this.model = props.model;
-        this.requiredFields = [];
-        this.optionalFields = [];
-        this.fieldTypes = {};
-        this.fieldDefaults = {};
-        this.idFieldType = 'String';
-        this.referenceFields = {};
-        this.relationMetadata = {};
-        this.foreignKeyMappings = {};
-        this.jsonFields = new Set();
+        this.initHelpers();
         this.initModelMetadata();
     }
 
-    initModelMetadata()
-    {
-        let dmmf = this.getDmmf();
-        if(!dmmf){
-            Logger.warning('Could not access Prisma DMMF metadata');
-            return;
-        }
-        let modelName = this.tableName().toLowerCase();
-        let modelInfo = dmmf.models?.[modelName] || dmmf.models?.find(m => m.name.toLowerCase() === modelName);
-        if(!modelInfo){
-            Logger.warning('Could not find model info for: '+modelName);
-            return;
-        }
-        for(let field of modelInfo.fields){
-            this.processFieldMetadata(field);
-        }
-        if(this.rawModel && this.rawModel.relationTypes){
-            for(let relationName of Object.keys(this.rawModel.relationTypes)){
-                if(sc.hasOwn(this.relationMetadata, relationName)){
-                    this.relationMetadata[relationName].type = this.rawModel.relationTypes[relationName];
-                }
-            }
-        }
-    }
-
-    getDmmf()
-    {
-        try {
-            if(this.prisma._dmmf){
-                return this.prisma._dmmf.datamodel;
-            }
-            if(this.prisma._getDmmf && sc.isFunction(this.prisma._getDmmf)){
-                return this.prisma._getDmmf().datamodel;
-            }
-            if(this.prisma._runtimeDataModel){
-                return this.prisma._runtimeDataModel;
-            }
-            if(Prisma.dmmf && Prisma.dmmf.datamodel){
-                return Prisma.dmmf.datamodel;
-            }
-            return null;
-        } catch(error) {
-            Logger.warning('Failed to access DMMF: '+error.message);
-            return null;
-        }
-    }
-
-    processFieldMetadata(field)
-    {
-        this.fieldTypes[field.name] = field.type;
-        if('Json' === field.type){
-            this.jsonFields.add(field.name);
-        }
-        if(field.isId){
-            this.idFieldType = field.type;
-        }
-        if(field.hasDefaultValue){
-            this.fieldDefaults[field.name] = field.default;
-        }
-        if(field.isRequired && !field.hasDefaultValue && !field.isId && 'object' !== field.kind){
-            this.requiredFields.push(field.name);
-        }
-        if(field.isOptional || field.hasDefaultValue){
-            this.optionalFields.push(field.name);
-        }
-        if(field.kind === 'scalar' && field.isList === false){
-            let isNumericType = this.isNumericFieldType(field.type);
-            let isReferenceField = field.relationFromFields && 0 < field.relationFromFields.length;
-            if(isNumericType || isReferenceField){
-                this.referenceFields[field.name] = field.type;
-            }
-        }
-        if('object' === field.kind){
-            let relationType = field.isList ? 'many' : 'one';
-            this.relationMetadata[field.name] = {
-                type: relationType,
-                model: field.type,
-                isList: field.isList,
-                isOptional: field.isOptional
-            };
-        }
-        if('object' === field.kind && sc.hasOwn(field, 'relationFromFields') && sc.isArray(field.relationFromFields)){
-            for(let foreignKeyField of field.relationFromFields){
-                this.foreignKeyMappings[foreignKeyField] = field.name;
-            }
-        }
-    }
-
-    getAllRelations()
-    {
-        return Object.keys(this.relationMetadata || {});
-    }
-
-    isNumericFieldType(fieldType)
-    {
-        return ('Int' === fieldType || 'BigInt' === fieldType || 'Float' === fieldType || 'Decimal' === fieldType);
+    initHelpers()
+    {
+        this.metadataLoader = new PrismaMetadataLoader({
+            prisma: this.prisma,
+            rawModel: this.rawModel
+        });
+        this.typeCaster = new PrismaTypeCaster({
+            idFieldType: 'String',
+            jsonFields: new Set(),
+            fieldTypes: {},
+            fieldDefaults: {},
+            requiredFields: [],
+            optionalFields: [],
+            rawModel: this.rawModel
+        });
+        this.relationResolver = new PrismaRelationResolver({
+            relationMetadata: {},
+            relationAliases: {},
+            metadataLoader: this.metadataLoader
+        });
     }
 
-    isBooleanFieldType(fieldType)
-    {
-        return 'Boolean' === fieldType;
-    }
-
-    isDateTimeFieldType(fieldType)
-    {
-        return 'DateTime' === fieldType || 'Date' === fieldType;
-    }
-
-    isJsonFieldType(fieldType)
-    {
-        return 'Json' === fieldType;
-    }
-
-    isJsonFieldByName(fieldName)
-    {
-        if(this.jsonFields.has(fieldName)){
-            return true;
-        }
-        if(!this.rawModel || !this.rawModel.properties){
-            return false;
-        }
-        return 'json' === sc.get(this.rawModel.properties[fieldName], 'dbType', '');
-    }
-
-    isStringFieldType(fieldType)
-    {
-        return 'String' === fieldType;
-    }
-
-    castValue(value, fieldType, fieldName = null)
-    {
-        if('id' === fieldName){
-            return this.castToIdType(value);
-        }
-        if(this.isNullOrEmpty(value)){
-            if(sc.hasOwn(this.fieldDefaults, fieldName)){
-                return undefined;
-            }
-            if(-1 !== this.optionalFields.indexOf(fieldName)){
-                return null;
-            }
-            if(-1 !== this.requiredFields.indexOf(fieldName)){
-                Logger.warning('Required field '+fieldName+' cannot be null or empty');
-                return undefined;
-            }
-            return null;
-        }
-        if(this.isJsonFieldByName(fieldName)){
-            return this.castToJsonType(value);
-        }
-        if(this.isNumericFieldType(fieldType)){
-            return this.castToNumericType(value, fieldType);
-        }
-        if(this.isBooleanFieldType(fieldType)){
-            return this.castToBooleanType(value);
-        }
-        if(this.isDateTimeFieldType(fieldType)){
-            return this.castToDateType(value);
-        }
-        if(this.isStringFieldType(fieldType)){
-            return this.castToStringType(value);
-        }
-        return value;
-    }
-
-    isNullOrEmpty(value)
-    {
-        return null === value || undefined === value || '' === value;
-    }
-
-    castToIdType(value)
-    {
-        if(this.isNullOrEmpty(value)){
-            return value;
-        }
-        if(this.isNumericFieldType(this.idFieldType)){
-            let numeric = Number(value);
-            if(!isNaN(numeric)){
-                return ('Int' === this.idFieldType || 'BigInt' === this.idFieldType) ? Math.floor(numeric) : numeric;
-            }
-        }
-        return String(value);
-    }
-
-    castToNumericType(value, fieldType)
-    {
-        if(this.isNullOrEmpty(value)){
-            return null;
-        }
-        let numericValue = Number(value);
-        if(isNaN(numericValue)){
-            Logger.warning('Cannot convert value to numeric: '+value);
-            return null;
-        }
-        if('Int' === fieldType || 'BigInt' === fieldType){
-            return Math.floor(numericValue);
-        }
-        return numericValue;
-    }
-
-    castToBooleanType(value)
-    {
-        if(this.isNullOrEmpty(value)){
-            return null;
-        }
-        if('boolean' === typeof value){
-            return value;
-        }
-        if('number' === typeof value){
-            return 0 !== value;
-        }
-        if('string' === typeof value){
-            let lowerValue = value.toLowerCase();
-            if('true' === lowerValue || '1' === lowerValue || 'yes' === lowerValue){
-                return true;
-            }
-            if('false' === lowerValue || '0' === lowerValue || 'no' === lowerValue){
-                return false;
-            }
-        }
-        return Boolean(value);
-    }
-
-    castToDateType(dateValue)
-    {
-        if(dateValue instanceof Date){
-            return dateValue;
-        }
-        if(this.isNullOrEmpty(dateValue)){
-            return null;
-        }
-        let dateString = String(dateValue);
-        if(dateString.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/)){
-            return new Date(dateString.replace(' ', 'T') + 'Z');
-        }
-        if(dateString.match(/^\d{4}-\d{2}-\d{2}$/)){
-            return new Date(dateString + 'T00:00:00Z');
-        }
-        try {
-            let parsedDate = new Date(dateString);
-            if(isNaN(parsedDate.getTime())){
-                Logger.warning('Invalid date value: '+dateString);
-                return null;
-            }
-            return parsedDate;
-        } catch(error) {
-            Logger.warning('Failed to convert date value: '+dateString);
-            return null;
-        }
-    }
-
-    castToJsonType(value)
-    {
-        if(this.isNullOrEmpty(value)){
-            return Prisma.DbNull;
-        }
-        if('object' === typeof value){
-            return value;
-        }
-        if('string' === typeof value){
-            if(value.startsWith('%') && value.endsWith('%')){
-                return value;
-            }
-            try {
-                return JSON.parse(value);
-            } catch(error) {
-                return value;
-            }
-        }
-        return value;
-    }
-
-    castToStringType(value)
+    initModelMetadata()
     {
-        if(null === value || undefined === value){
-            return null;
-        }
-        if('string' === typeof value){
-            if('null' === value){
-                return null;
-            }
-            return value;
+        let metadata = this.metadataLoader.loadModelMetadata(this.tableName());
+        if(!metadata){
+            return;
         }
-        return String(value);
+        this.requiredFields = metadata.requiredFields;
+        this.optionalFields = metadata.optionalFields;
+        this.fieldTypes = metadata.fieldTypes;
+        this.fieldDefaults = metadata.fieldDefaults;
+        this.idFieldType = metadata.idFieldType;
+        this.referenceFields = metadata.referenceFields;
+        this.relationMetadata = metadata.relationMetadata;
+        this.foreignKeyMappings = metadata.foreignKeyMappings;
+        this.jsonFields = metadata.jsonFields;
+        this.typeCaster.updateMetadata({
+            idFieldType: this.idFieldType,
+            jsonFields: this.jsonFields,
+            fieldTypes: this.fieldTypes,
+            fieldDefaults: this.fieldDefaults,
+            requiredFields: this.requiredFields,
+            optionalFields: this.optionalFields
+        });
+        this.relationResolver.updateMetadata({
+            relationMetadata: this.relationMetadata
+        });
+        this.relationAliases = this.relationResolver.buildRelationAliases(this.tableName());
     }
 
     databaseName()
@@ -347,6 +106,11 @@ class PrismaDriver extends BaseDriver
         return this.rawModel[propertyName] || null;
     }
 
+    getAllRelations()
+    {
+        return this.relationResolver.getAllRelations();
+    }
+
     prepareData(params)
     {
         let data = {};
@@ -356,7 +120,7 @@ class PrismaDriver extends BaseDriver
                 data[key] = params[key];
                 continue;
             }
-            let castedValue = this.castValue(params[key], fieldType, key);
+            let castedValue = this.typeCaster.castValue(params[key], fieldType, key);
             if(undefined !== castedValue){
                 data[key] = castedValue;
             }
@@ -372,9 +136,9 @@ class PrismaDriver extends BaseDriver
             if(sc.hasOwn(this.foreignKeyMappings, key)){
                 let relationName = this.foreignKeyMappings[key];
                 let value = params[key];
-                if(!this.isNullOrEmpty(value)){
+                if(!this.typeCaster.isNullOrEmpty(value)){
                     relations[relationName] = {
-                        connect: {id: this.castToIdType(value)}
+                        connect: {id: this.typeCaster.castToIdType(value)}
                     };
                     continue;
                 }
@@ -387,14 +151,14 @@ class PrismaDriver extends BaseDriver
             }
             let fieldType = this.fieldTypes[key];
             if(!fieldType){
-                if(!this.isNullOrEmpty(params[key])){
+                if(!this.typeCaster.isNullOrEmpty(params[key])){
                     data[key] = params[key];
                 }
                 continue;
             }
-            let castedValue = this.castValue(params[key], fieldType, key);
+            let castedValue = this.typeCaster.castValue(params[key], fieldType, key);
             if(undefined !== castedValue){
-                if(this.isJsonFieldType(fieldType) && null === castedValue){
+                if(this.typeCaster.isJsonFieldType(fieldType) && null === castedValue){
                     continue;
                 }
                 data[key] = castedValue;
@@ -447,60 +211,69 @@ class PrismaDriver extends BaseDriver
     {
         if(sc.isArray(value)){
             if('id' === key){
-                return value.map(id => this.castToIdType(id));
+                return value.map(id => this.typeCaster.castToIdType(id)).filter(id => null !== id);
             }
             let fieldType = this.fieldTypes[key];
             if(fieldType){
-                return value.map(val => this.castValue(val, fieldType, key)).filter(val => undefined !== val);
+                return value.map(val => this.typeCaster.castValue(val, fieldType, key)).filter(val => undefined !== val);
             }
             return value;
         }
         if('id' === key){
-            return this.castToIdType(value);
+            return this.typeCaster.castToIdType(value);
         }
         let fieldType = this.fieldTypes[key];
         if(fieldType){
-            let castedValue = this.castValue(value, fieldType, key);
+            let castedValue = this.typeCaster.castValue(value, fieldType, key);
             return undefined !== castedValue ? castedValue : value;
         }
         return value;
     }
 
-    transformRelationResults(result, includeConfig)
+    applyOperator(value, operator, fieldName = null)
     {
-        if(!result || !includeConfig){
-            return result;
-        }
-        if(sc.isArray(result)){
-            return result.map(item => this.transformSingleResult(item, includeConfig));
+        let upperOperator = operator ? operator.toUpperCase() : '';
+        if('LIKE' === upperOperator){
+            return this.handleLikeOperator(value, fieldName);
         }
-        return this.transformSingleResult(result, includeConfig);
+        let operatorsMap = {
+            '=': value,
+            '!=': {not: value},
+            '>': {gt: value},
+            '>=': {gte: value},
+            '<': {lt: value},
+            '<=': {lte: value},
+            'IN': {in: value},
+            'NOT IN': {notIn: value}
+        };
+        return operatorsMap[upperOperator] || value;
     }
 
-    transformSingleResult(item, includeConfig)
+    handleLikeOperator(value, fieldName)
     {
-        if(!item || !sc.isObject(item)){
-            return item;
+        let cleanValue = String(value).replace(/%/g, '');
+        if(this.typeCaster.isJsonFieldByName(fieldName) || this.isJsonField(fieldName)){
+            return this.handleJsonTextSearch(cleanValue);
         }
-        let transformed = {...item};
-        for(let relationName of Object.keys(includeConfig)){
-            if(!sc.hasOwn(transformed, relationName)){
-                continue;
-            }
-            let relationMeta = this.relationMetadata[relationName];
-            if(!relationMeta){
-                continue;
-            }
-            let relationValue = transformed[relationName];
-            if('one' === relationMeta.type && sc.isArray(relationValue)){
-                transformed[relationName] = 0 < relationValue.length ? relationValue[0] : null;
-                continue;
-            }
-            if('many' === relationMeta.type && !sc.isArray(relationValue)){
-                transformed[relationName] = relationValue ? [relationValue] : [];
+        if('id' === fieldName || sc.hasOwn(this.referenceFields, fieldName)){
+            let numericValue = Number(cleanValue);
+            if(!isNaN(numericValue)){
+                return numericValue;
             }
         }
-        return transformed;
+        return {contains: cleanValue};
+    }
+
+    handleJsonTextSearch(searchValue)
+    {
+        return {
+            string_contains: searchValue
+        };
+    }
+
+    isJsonField(fieldName)
+    {
+        return this.jsonFields && this.jsonFields.has(fieldName);
     }
 
     async create(params)
@@ -526,26 +299,37 @@ class PrismaDriver extends BaseDriver
         this.ensureRequiredFields(preparedData);
         let createData = {data: preparedData};
         if(0 < relations.length){
-            let includeConfig = this.buildIncludeObject(relations);
-            createData.include = includeConfig;
+            let includeData = this.relationResolver.buildIncludeObjectWithMapping(relations);
+            createData.include = includeData.include;
             for(let relation of relations){
-                if(!sc.hasOwn(params, relation)){
+                let normalizedRelation = this.relationResolver.normalizeRelationName(relation);
+                if(!sc.hasOwn(params, relation) && !sc.hasOwn(params, normalizedRelation)){
                     continue;
                 }
-                let relationData = params[relation];
+                let relationData = sc.get(params, relation, sc.get(params, normalizedRelation, null));
                 if(sc.isArray(relationData)){
-                    createData.data[relation] = {
-                        connect: relationData.map(item => ({id: this.castToIdType(item.id)}))
+                    createData.data[normalizedRelation] = {
+                        connect: relationData.map(item => ({id: this.typeCaster.castToIdType(item.id)}))
                     };
                     continue;
                 }
-                createData.data[relation] = {
-                    connect: {id: this.castToIdType(relationData.id)}
+                createData.data[normalizedRelation] = {
+                    connect: {id: this.typeCaster.castToIdType(relationData.id)}
                 };
             }
+            try {
+                return this.relationResolver.transformRelationResults(
+                    await this.model.create(createData),
+                    includeData.include,
+                    includeData.mapping
+                );
+            } catch(error) {
+                Logger.error('Create with relations error: '+error.message);
+                return false;
+            }
         }
         try {
-            return this.transformRelationResults(await this.model.create(createData), createData.include);
+            return await this.model.create(createData);
         } catch(error) {
             Logger.error('Create with relations error: '+error.message);
             return false;
@@ -584,7 +368,7 @@ class PrismaDriver extends BaseDriver
 
     async updateById(id, params)
     {
-        let castedId = this.castToIdType(id);
+        let castedId = this.typeCaster.castToIdType(id);
         let found = await this.loadById(castedId);
         if(!found){
             return false;
@@ -606,7 +390,7 @@ class PrismaDriver extends BaseDriver
         let preparedData = this.prepareDataWithRelations(params);
         let existing = false;
         if(params.id){
-            let castedId = this.castToIdType(params.id);
+            let castedId = this.typeCaster.castToIdType(params.id);
             existing = await this.loadById(castedId);
             if(existing){
                 let patch = Object.assign({}, preparedData);
@@ -627,7 +411,7 @@ class PrismaDriver extends BaseDriver
             if(existing){
                 try {
                     return await this.model.update({
-                        where: {id: this.castToIdType(existing.id)},
+                        where: {id: this.typeCaster.castToIdType(existing.id)},
                         data: preparedData
                     });
                 } catch(error) {
@@ -654,7 +438,7 @@ class PrismaDriver extends BaseDriver
 
     async deleteById(id)
     {
-        let castedId = this.castToIdType(id);
+        let castedId = this.typeCaster.castToIdType(id);
         let found = await this.loadById(castedId);
         if(!found){
             return false;
@@ -692,7 +476,7 @@ class PrismaDriver extends BaseDriver
             where: processedFilters
         };
         if(0 < relations.length){
-            query.include = this.buildIncludeObject(relations);
+            query.include = this.relationResolver.buildIncludeObjectWithMapping(relations).include;
         }
         try {
             return await this.model.count(query);
@@ -714,22 +498,13 @@ class PrismaDriver extends BaseDriver
 
     async loadAllWithRelations(relations)
     {
-        if(!sc.isArray(relations) || 0 === relations.length){
-            relations = this.getAllRelations();
-        }
-        let query = this.buildQueryOptions();
-        let includeConfig = {};
-        if(0 < relations.length){
-            includeConfig = this.buildIncludeObject(relations);
-            query.include = includeConfig;
-        }
-        try {
-            let results = await this.model.findMany(query);
-            return this.transformRelationResults(results, includeConfig);
-        } catch(error) {
-            Logger.error('Load all with relations error: '+error.message);
-            return [];
-        }
+        return this.executeQueryWithRelations(
+            (q) => this.model.findMany(q),
+            this.buildQueryOptions(),
+            relations,
+            'Load all with relations error: ',
+            []
+        );
     }
 
     async load(filters)
@@ -747,24 +522,15 @@ class PrismaDriver extends BaseDriver
 
     async loadWithRelations(filters, relations)
     {
-        if(!sc.isArray(relations) || 0 === relations.length){
-            relations = this.getAllRelations();
-        }
-        let processedFilters = this.processFilters(filters);
         let query = this.buildQueryOptions();
-        query.where = processedFilters;
-        let includeConfig = {};
-        if(0 < relations.length){
-            includeConfig = this.buildIncludeObject(relations);
-            query.include = includeConfig;
-        }
-        try {
-            let results = await this.model.findMany(query);
-            return this.transformRelationResults(results, includeConfig);
-        } catch(error) {
-            Logger.error('Load with relations error: '+error.message);
-            return [];
-        }
+        query.where = this.processFilters(filters);
+        return this.executeQueryWithRelations(
+            (q) => this.model.findMany(q),
+            query,
+            relations,
+            'Load with relations error: ',
+            []
+        );
     }
 
     async loadBy(field, fieldValue, operator = null)
@@ -782,29 +548,20 @@ class PrismaDriver extends BaseDriver
 
     async loadByWithRelations(field, fieldValue, relations, operator = null)
     {
-        if(!sc.isArray(relations) || 0 === relations.length){
-            relations = this.getAllRelations();
-        }
-        let filter = this.createSingleFilter(field, fieldValue, operator);
         let query = this.buildQueryOptions();
-        query.where = filter;
-        let includeConfig = {};
-        if(0 < relations.length){
-            includeConfig = this.buildIncludeObject(relations);
-            query.include = includeConfig;
-        }
-        try {
-            let results = await this.model.findMany(query);
-            return this.transformRelationResults(results, includeConfig);
-        } catch(error) {
-            Logger.error('Load by with relations error: '+error.message);
-            return [];
-        }
+        query.where = this.createSingleFilter(field, fieldValue, operator);
+        return this.executeQueryWithRelations(
+            (q) => this.model.findMany(q),
+            query,
+            relations,
+            'Load by with relations error: ',
+            []
+        );
     }
 
     async loadById(id)
     {
-        let castedId = this.castToIdType(id);
+        let castedId = this.typeCaster.castToIdType(id);
         try {
             return await this.model.findUnique({
                 where: {id: castedId}
@@ -817,30 +574,21 @@ class PrismaDriver extends BaseDriver
 
     async loadByIdWithRelations(id, relations)
     {
-        if(!sc.isArray(relations) || 0 === relations.length){
-            relations = this.getAllRelations();
-        }
-        let castedId = this.castToIdType(id);
-        let query = {
-            where: {id: castedId}
-        };
-        let includeConfig = {};
-        if(0 < relations.length){
-            includeConfig = this.buildIncludeObject(relations);
-            query.include = includeConfig;
-        }
-        try {
-            let result = await this.model.findUnique(query);
-            return this.transformRelationResults(result, includeConfig);
-        } catch(error) {
-            Logger.error('Load by ID with relations error: '+error.message);
-            return null;
-        }
+        return this.executeQueryWithRelations(
+            (q) => this.model.findUnique(q),
+            {where: {id: this.typeCaster.castToIdType(id)}},
+            relations,
+            'Load by ID with relations error: ',
+            null
+        );
     }
 
     async loadByIds(ids)
     {
-        let castedIds = ids.map(id => this.castToIdType(id));
+        let castedIds = ids.map(id => this.typeCaster.castToIdType(id)).filter(id => null !== id);
+        if(0 === castedIds.length){
+            return [];
+        }
         try {
             return await this.model.findMany({
                 where: {
@@ -868,24 +616,15 @@ class PrismaDriver extends BaseDriver
 
     async loadOneWithRelations(filters, relations)
     {
-        if(!sc.isArray(relations) || 0 === relations.length){
-            relations = this.getAllRelations();
-        }
-        let processedFilters = this.processFilters(filters);
         let query = this.buildQueryOptions(false);
-        query.where = processedFilters;
-        let includeConfig = {};
-        if(0 < relations.length){
-            includeConfig = this.buildIncludeObject(relations);
-            query.include = includeConfig;
-        }
-        try {
-            let result = await this.model.findFirst(query);
-            return this.transformRelationResults(result, includeConfig);
-        } catch(error) {
-            Logger.error('Load one with relations error: '+error.message);
-            return null;
-        }
+        query.where = this.processFilters(filters);
+        return this.executeQueryWithRelations(
+            (q) => this.model.findFirst(q),
+            query,
+            relations,
+            'Load one with relations error: ',
+            null
+        );
     }
 
     async loadOneBy(field, fieldValue, operator = null)
@@ -903,24 +642,15 @@ class PrismaDriver extends BaseDriver
 
     async loadOneByWithRelations(field, fieldValue, relations, operator = null)
     {
-        if(!sc.isArray(relations) || 0 === relations.length){
-            relations = this.getAllRelations();
-        }
-        let filter = this.createSingleFilter(field, fieldValue, operator);
         let query = this.buildQueryOptions(false);
-        query.where = filter;
-        let includeConfig = {};
-        if(0 < relations.length){
-            includeConfig = this.buildIncludeObject(relations);
-            query.include = includeConfig;
-        }
-        try {
-            let result = await this.model.findFirst(query);
-            return this.transformRelationResults(result, includeConfig);
-        } catch(error) {
-            Logger.error('Load one by with relations error: '+error.message);
-            return null;
-        }
+        query.where = this.createSingleFilter(field, fieldValue, operator);
+        return this.executeQueryWithRelations(
+            (q) => this.model.findFirst(q),
+            query,
+            relations,
+            'Load one by with relations error: ',
+            null
+        );
     }
 
     buildQueryOptions(useLimit = true)
@@ -958,54 +688,21 @@ class PrismaDriver extends BaseDriver
         return this.processFilters(filter);
     }
 
-    applyOperator(value, operator, fieldName = null)
+    async executeQueryWithRelations(modelMethod, query, relations, errorMessage, defaultReturn)
     {
-        let upperOperator = operator ? operator.toUpperCase() : '';
-        if('LIKE' === upperOperator){
-            return this.handleLikeOperator(value, fieldName);
-        }
-        let operatorsMap = {
-            '=': value,
-            '!=': {not: value},
-            '>': {gt: value},
-            '>=': {gte: value},
-            '<': {lt: value},
-            '<=': {lte: value},
-            'IN': {in: value},
-            'NOT IN': {notIn: value}
-        };
-        return operatorsMap[upperOperator] || value;
-    }
-
-    handleLikeOperator(value, fieldName)
-    {
-        let cleanValue = String(value).replace(/%/g, '');
-        if(this.isJsonFieldByName(fieldName) || this.isJsonField(fieldName)){
-            return this.handleJsonTextSearch(cleanValue);
+        if(!sc.isArray(relations) || 0 === relations.length){
+            relations = this.getAllRelations();
         }
-        if('id' === fieldName || sc.hasOwn(this.referenceFields, fieldName)){
-            let numericValue = Number(cleanValue);
-            if(!isNaN(numericValue)){
-                return numericValue;
-            }
+        let includeData = this.relationResolver.buildIncludeObjectWithMapping(relations);
+        if(0 < Object.keys(includeData.include).length){
+            query.include = includeData.include;
         }
-        return {contains: cleanValue};
-    }
-
-    handleJsonTextSearch(searchValue)
-    {
-        return {
-            string_contains: searchValue
-        };
-    }
-
-    buildIncludeObject(relations)
-    {
-        let include = {};
-        for(let relation of relations){
-            include[relation] = true;
+        try {
+            return this.relationResolver.transformRelationResults(await modelMethod(query), includeData.include, includeData.mapping);
+        } catch(error) {
+            Logger.error(errorMessage+error.message);
+            return defaultReturn;
         }
-        return include;
     }
 
 }