@rws-framework/db 4.1.5 → 4.1.6

package/dist/models/core/RWSModel.js

@@ -222,7 +222,7 @@ class RWSModel {
         if (entryExists) {
             await this.preUpdate();
             const pk = ModelUtils_1.ModelUtils.findPrimaryKeyFields(this.constructor);
-            updatedModelData = await this.dbService.update(data, this.getCollection(), pk);
+            updatedModelData = await this.dbService.update(data, this.getCollection(), pk, this.constructor);
             await this._asyncFill(updatedModelData);
             await this.postUpdate();
         }

package/dist/services/DBService.d.ts

@@ -23,7 +23,7 @@ declare class DBService {
     cloneDatabase(source: string, target: string): Promise<void>;
     watchCollection(collectionName: string, preRun: () => void): Promise<any>;
     insert(data: any, collection: string, isTimeSeries?: boolean): Promise<any>;
-    update(data: any, collection: string, pk: string | string[]): Promise<IModel>;
+    update(data: any, collection: string, pk: string | string[], modelClass?: any): Promise<IModel>;
     findOneBy(collection: string, conditions: any, fields?: string[] | null, ordering?: OrderByType, prismaOptions?: any): Promise<IModel | null>;
     delete(collection: string, conditions: any): Promise<void>;
     findBy(collection: string, conditions: any, fields?: string[] | null, ordering?: OrderByType, pagination?: IPaginationParams, prismaOptions?: any): Promise<IModel[]>;
@@ -37,7 +37,7 @@ declare class DBService {
     }): Promise<number>;
     /**
      * Convert foreign key fields to Prisma relation syntax
-     * Handles common patterns like user_id -> creator, avatar_id -> avatar, etc.
+     * Dynamically reads relation metadata from model decorators
      */
     private convertForeignKeysToRelations;
     getPrismaClient(): PrismaClient;

package/dist/services/DBService.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -101,7 +134,7 @@ class DBService {
         result = await prismaCollection.create({ data });
         return await this.findOneBy(collection, { id: result.id });
     }
-    async update(data, collection, pk) {
+    async update(data, collection, pk, modelClass) {
         const prismaCollection = this.getCollectionHandler(collection);
         const where = {};
         if (Array.isArray(pk)) {
@@ -121,7 +154,7 @@ class DBService {
             }
         }
         // Convert foreign key fields to Prisma relation syntax
-        const processedData = this.convertForeignKeysToRelations(data);
+        const processedData = await this.convertForeignKeysToRelations(data, modelClass);
         await prismaCollection.update({
             where,
             data: processedData,
@@ -248,37 +281,37 @@ class DBService {
     }
     /**
      * Convert foreign key fields to Prisma relation syntax
-     * Handles common patterns like user_id -> creator, avatar_id -> avatar, etc.
+     * Dynamically reads relation metadata from model decorators
      */
-    convertForeignKeysToRelations(data) {
+    async convertForeignKeysToRelations(data, modelClass) {
         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'
-        };
+        let relationMappings = {};
+        // If model class is provided, dynamically build relation mappings from metadata
+        if (modelClass) {
+            try {
+                const { ModelUtils } = await Promise.resolve().then(() => __importStar(require('../models/utils/ModelUtils')));
+                const modelAnnotations = await ModelUtils.getModelAnnotations(modelClass);
+                // Build relation mappings from the model's relation metadata
+                Object.keys(modelAnnotations).forEach(propertyKey => {
+                    const annotation = modelAnnotations[propertyKey];
+                    if (annotation.annotationType === 'Relation') {
+                        const metadata = annotation.metadata;
+                        const relationField = metadata.relationField;
+                        const relationName = metadata.relationName || propertyKey;
+                        if (relationField) {
+                            relationMappings[relationField] = relationName;
+                        }
+                    }
+                });
+            }
+            catch (error) {
+                console.warn('Failed to read model relation metadata, falling back to static mappings:', error);
+            }
+        }
+        // Fallback to static mappings if no model class provided or metadata extraction fails
+        if (Object.keys(relationMappings).length === 0) {
+            relationMappings = {};
+        }
         // Convert foreign key fields to relation syntax
         Object.keys(processedData).forEach(key => {
             if (key.endsWith('_id') && relationMappings[key]) {

package/package.json

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

package/src/models/core/RWSModel.ts

@@ -279,7 +279,7 @@ class RWSModel<T> implements IModel {
 
             const pk = ModelUtils.findPrimaryKeyFields(this.constructor as OpModelType<any>);
 
-            updatedModelData = await this.dbService.update(data, this.getCollection(), pk);
+            updatedModelData = await this.dbService.update(data, this.getCollection(), pk, this.constructor);
 
             await this._asyncFill(updatedModelData);
             await this.postUpdate();

package/src/services/DBService.ts

@@ -138,7 +138,7 @@ class DBService {
         return await this.findOneBy(collection, { id: result.id });
     }
 
-    async update(data: any, collection: string, pk: string | string[]): Promise<IModel> 
+    async update(data: any, collection: string, pk: string | string[], modelClass?: any): Promise<IModel> 
     {        
 
         const prismaCollection = this.getCollectionHandler(collection);
@@ -163,7 +163,7 @@ class DBService {
         }        
 
         // Convert foreign key fields to Prisma relation syntax
-        const processedData = this.convertForeignKeysToRelations(data);
+        const processedData = await this.convertForeignKeysToRelations(data, modelClass);
 
         await prismaCollection.update({
             where,
@@ -337,37 +337,41 @@ class DBService {
 
     /**
      * Convert foreign key fields to Prisma relation syntax
-     * Handles common patterns like user_id -> creator, avatar_id -> avatar, etc.
+     * Dynamically reads relation metadata from model decorators
      */
-    private convertForeignKeysToRelations(data: any): any {
+    private async convertForeignKeysToRelations(data: any, modelClass?: any): Promise<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'
-        };
+        let relationMappings: { [key: string]: string } = {};
+
+        // If model class is provided, dynamically build relation mappings from metadata
+        if (modelClass) {
+            try {
+                const { ModelUtils } = await import('../models/utils/ModelUtils');
+                const modelAnnotations = await ModelUtils.getModelAnnotations(modelClass);
+                
+                // Build relation mappings from the model's relation metadata
+                Object.keys(modelAnnotations).forEach(propertyKey => {
+                    const annotation = modelAnnotations[propertyKey];
+                    if (annotation.annotationType === 'Relation') {
+                        const metadata = annotation.metadata;
+                        const relationField = metadata.relationField;
+                        const relationName = metadata.relationName || propertyKey;
+                        
+                        if (relationField) {
+                            relationMappings[relationField] = relationName;
+                        }
+                    }
+                });
+            } catch (error) {
+                console.warn('Failed to read model relation metadata, falling back to static mappings:', error);
+            }
+        }
+
+        // Fallback to static mappings if no model class provided or metadata extraction fails
+        if (Object.keys(relationMappings).length === 0) {
+            relationMappings = {                
+            };
+        }
 
         // Convert foreign key fields to relation syntax
         Object.keys(processedData).forEach(key => {