@rws-framework/db 4.1.3 → 4.1.5

package/dist/decorators/Relation.js

@@ -19,7 +19,8 @@ function Relation(theModel, relationOptions = _DEFAULTS) {
                     relationOptions.relationName :
                     null
             };
-            if (relationOptions.required) {
+            // Only set default cascade behavior if no explicit cascade was provided
+            if (relationOptions.required && !relationOptions.cascade) {
                 if (!metaOpts.cascade) {
                     metaOpts.cascade = {};
                 }

package/dist/services/DBService.d.ts

@@ -35,6 +35,11 @@ declare class DBService {
     count<T = any>(opModel: OpModelType<T>, where?: {
         [k: string]: any;
     }): Promise<number>;
+    /**
+     * Convert foreign key fields to Prisma relation syntax
+     * Handles common patterns like user_id -> creator, avatar_id -> avatar, etc.
+     */
+    private convertForeignKeysToRelations;
     getPrismaClient(): PrismaClient;
 }
 export { DBService, IDBClientCreate };

package/dist/services/DBService.js

@@ -120,9 +120,11 @@ class DBService {
                 delete data[cKey];
             }
         }
+        // Convert foreign key fields to Prisma relation syntax
+        const processedData = this.convertForeignKeysToRelations(data);
         await prismaCollection.update({
             where,
-            data: data,
+            data: processedData,
         });
         return await this.findOneBy(collection, where);
     }
@@ -244,6 +246,57 @@ class DBService {
     async count(opModel, where = {}) {
         return await this.getCollectionHandler(opModel._collection).count({ where });
     }
+    /**
+     * Convert foreign key fields to Prisma relation syntax
+     * Handles common patterns like user_id -> creator, avatar_id -> avatar, etc.
+     */
+    convertForeignKeysToRelations(data) {
+        const processedData = { ...data };
+        const relationMappings = {
+            // Common relation mappings for foreign keys to relation names
+            'user_id': 'creator',
+            'avatar_id': 'avatar',
+            'file_id': 'logo',
+            'company_id': 'company',
+            'user_group_id': 'userGroup',
+            'accountGrade_id': 'accountGrade',
+            'account_balance_id': 'accountBalance',
+            'knowledgeGroup_id': 'project',
+            'conversation_id': 'conversation',
+            'message_id': 'message',
+            'knowledge_id': 'knowledge',
+            'profession_id': 'profession',
+            'step_id': 'step',
+            'question_id': 'question',
+            'tutorial_id': 'tutorial',
+            'tutorial_step_id': 'tutorialStep',
+            'tutorial_section_id': 'tutorialSection',
+            'todo_id': 'todo',
+            'bot_test_id': 'botTest',
+            'bot_test_tester_id': 'tester',
+            'bot_test_target_id': 'target',
+            'branch_id': 'branch',
+            'acl_policy_id': 'policy',
+            'instruction_file_id': 'instructionFile'
+        };
+        // Convert foreign key fields to relation syntax
+        Object.keys(processedData).forEach(key => {
+            if (key.endsWith('_id') && relationMappings[key]) {
+                const relationField = relationMappings[key];
+                const value = processedData[key];
+                // Remove the foreign key field
+                delete processedData[key];
+                // Add the relation field with proper Prisma syntax
+                if (value === null || value === undefined) {
+                    processedData[relationField] = { disconnect: true };
+                }
+                else {
+                    processedData[relationField] = { connect: { id: value } };
+                }
+            }
+        });
+        return processedData;
+    }
     getPrismaClient() {
         if (!this.client || !this.connected) {
             this.connectToDB();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/db",
   "private": false,
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/decorators/Relation.ts

@@ -43,7 +43,8 @@ function Relation(theModel: () => OpModelType<RWSModel<any>>, relationOptions: P
                   null
             };  
             
-            if(relationOptions.required){
+            // Only set default cascade behavior if no explicit cascade was provided
+            if(relationOptions.required && !relationOptions.cascade){
                 if(!metaOpts.cascade){
                     metaOpts.cascade = {};
                 }

package/src/services/DBService.ts

@@ -162,9 +162,12 @@ class DBService {
             }
         }        
 
+        // Convert foreign key fields to Prisma relation syntax
+        const processedData = this.convertForeignKeysToRelations(data);
+
         await prismaCollection.update({
             where,
-            data: data,
+            data: processedData,
         });    
 
         
@@ -332,6 +335,61 @@ class DBService {
         return await this.getCollectionHandler(opModel._collection).count({where});
     }
 
+    /**
+     * Convert foreign key fields to Prisma relation syntax
+     * Handles common patterns like user_id -> creator, avatar_id -> avatar, etc.
+     */
+    private convertForeignKeysToRelations(data: any): any {
+        const processedData = { ...data };
+        const relationMappings: { [key: string]: string } = {
+            // Common relation mappings for foreign keys to relation names
+            'user_id': 'creator',
+            'avatar_id': 'avatar',
+            'file_id': 'logo',
+            'company_id': 'company',
+            'user_group_id': 'userGroup',
+            'accountGrade_id': 'accountGrade',
+            'account_balance_id': 'accountBalance',
+            'knowledgeGroup_id': 'project',
+            'conversation_id': 'conversation',
+            'message_id': 'message',
+            'knowledge_id': 'knowledge',
+            'profession_id': 'profession',
+            'step_id': 'step',
+            'question_id': 'question',
+            'tutorial_id': 'tutorial',
+            'tutorial_step_id': 'tutorialStep',
+            'tutorial_section_id': 'tutorialSection',
+            'todo_id': 'todo',
+            'bot_test_id': 'botTest',
+            'bot_test_tester_id': 'tester',
+            'bot_test_target_id': 'target',
+            'branch_id': 'branch',
+            'acl_policy_id': 'policy',
+            'instruction_file_id': 'instructionFile'
+        };
+
+        // Convert foreign key fields to relation syntax
+        Object.keys(processedData).forEach(key => {
+            if (key.endsWith('_id') && relationMappings[key]) {
+                const relationField = relationMappings[key];
+                const value = processedData[key];
+                
+                // Remove the foreign key field
+                delete processedData[key];
+                
+                // Add the relation field with proper Prisma syntax
+                if (value === null || value === undefined) {
+                    processedData[relationField] = { disconnect: true };
+                } else {
+                    processedData[relationField] = { connect: { id: value } };
+                }
+            }
+        });
+
+        return processedData;
+    }
+
     public getPrismaClient(): PrismaClient
     {
         if(!this.client || !this.connected){