@rws-framework/db 4.0.1 → 4.1.0

package/dist/models/core/RWSModel.d.ts

@@ -15,6 +15,7 @@ declare class RWSModel<T> implements IModel {
     static _BANNED_KEYS: string[];
     static allModels: OpModelType<any>[];
     static _CUT_KEYS: string[];
+    private _relationFields;
     private postLoadExecuted;
     constructor(data?: any);
     isPostLoadExecuted(): boolean;
@@ -86,5 +87,6 @@ declare class RWSModel<T> implements IModel {
     private hydratePrePopulatedRelations;
     static getDb(): DBService;
     reload(): Promise<RWSModel<T> | null>;
+    getPropertyValue(key: string): any;
 }
 export { RWSModel };

package/dist/models/core/RWSModel.js

@@ -27,6 +27,8 @@ class RWSModel {
     static _BANNED_KEYS = ['_collection'];
     static allModels = [];
     static _CUT_KEYS = [];
+    // Store relation foreign key fields for reload() functionality
+    _relationFields = {};
     postLoadExecuted = false;
     constructor(data = null) {
         if (!this.getCollection()) {
@@ -440,6 +442,30 @@ class RWSModel {
                         if (typeof relationData === 'object' && relationData !== null &&
                             (relationData.id || Object.keys(relationData).length > 1)) {
                             const relatedInstance = new ModelClass();
+                            // Check relation metadata to identify foreign key fields that need to be preserved
+                            const tempInstance = new ModelClass();
+                            const childClassFields = FieldsHelper_1.FieldsHelper.getAllClassFields(tempInstance.constructor);
+                            const [childRelOneData, childRelManyData] = await Promise.all([
+                                RelationUtils_1.RelationUtils.getRelationOneMeta(tempInstance, childClassFields),
+                                RelationUtils_1.RelationUtils.getRelationManyMeta(tempInstance, childClassFields)
+                            ]);
+                            // Store foreign key fields from relation metadata
+                            for (const relKey in childRelOneData) {
+                                const relMeta = childRelOneData[relKey];
+                                const foreignKeyField = relMeta.hydrationField; // e.g., 'avatar_id', 'knowledge_id'
+                                if (foreignKeyField && relationData[foreignKeyField] !== undefined) {
+                                    relatedInstance._relationFields[foreignKeyField] = relationData[foreignKeyField];
+                                    relatedInstance[foreignKeyField] = relationData[foreignKeyField];
+                                }
+                            }
+                            for (const relKey in childRelManyData) {
+                                const relMeta = childRelManyData[relKey];
+                                const foreignKeyField = relMeta.foreignKey; // Use foreignKey for inverse relations
+                                if (foreignKeyField && relationData[foreignKeyField] !== undefined) {
+                                    relatedInstance._relationFields[foreignKeyField] = relationData[foreignKeyField];
+                                    relatedInstance[foreignKeyField] = relationData[foreignKeyField];
+                                }
+                            }
                             await relatedInstance._asyncFill(relationData, false, false, true);
                             this[key] = relatedInstance;
                         }
@@ -450,6 +476,30 @@ class RWSModel {
                         for (const itemData of relationData) {
                             if (typeof itemData === 'object' && itemData !== null) {
                                 const relatedInstance = new ModelClass();
+                                // Check relation metadata to identify foreign key fields that need to be preserved
+                                const tempInstance = new ModelClass();
+                                const childClassFields = FieldsHelper_1.FieldsHelper.getAllClassFields(tempInstance.constructor);
+                                const [childRelOneData, childRelManyData] = await Promise.all([
+                                    RelationUtils_1.RelationUtils.getRelationOneMeta(tempInstance, childClassFields),
+                                    RelationUtils_1.RelationUtils.getRelationManyMeta(tempInstance, childClassFields)
+                                ]);
+                                // Store foreign key fields from relation metadata
+                                for (const relKey in childRelOneData) {
+                                    const relMeta = childRelOneData[relKey];
+                                    const foreignKeyField = relMeta.hydrationField; // e.g., 'avatar_id', 'knowledge_id'
+                                    if (foreignKeyField && itemData[foreignKeyField] !== undefined) {
+                                        relatedInstance._relationFields[foreignKeyField] = itemData[foreignKeyField];
+                                        relatedInstance[foreignKeyField] = itemData[foreignKeyField];
+                                    }
+                                }
+                                for (const relKey in childRelManyData) {
+                                    const relMeta = childRelManyData[relKey];
+                                    const foreignKeyField = relMeta.foreignKey; // Use foreignKey for inverse relations
+                                    if (foreignKeyField && itemData[foreignKeyField] !== undefined) {
+                                        relatedInstance._relationFields[foreignKeyField] = itemData[foreignKeyField];
+                                        relatedInstance[foreignKeyField] = itemData[foreignKeyField];
+                                    }
+                                }
                                 await relatedInstance._asyncFill(itemData, false, false, true);
                                 relatedInstances.push(relatedInstance);
                             }
@@ -481,10 +531,23 @@ class RWSModel {
         }
         // Convert the fresh instance back to plain data for hydration
         const plainData = await freshData.toMongo();
+        // Preserve foreign key fields from _relationFields to ensure relations can be hydrated
+        for (const key in this._relationFields) {
+            if (plainData[key] === undefined) {
+                plainData[key] = this._relationFields[key];
+            }
+        }
         // Hydrate current instance with fresh data including relations
         await this._asyncFill(plainData, true, true, true);
         return this;
     }
+    // Helper method to get property with fallback to stored relation fields
+    getPropertyValue(key) {
+        if (this.hasOwnProperty(key) || this[key] !== undefined) {
+            return this[key];
+        }
+        return this._relationFields[key];
+    }
 }
 exports.RWSModel = RWSModel;
 __decorate([

package/package.json

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

package/src/models/core/RWSModel.ts

@@ -27,6 +27,9 @@ class RWSModel<T> implements IModel {
     static _BANNED_KEYS = ['_collection'];
     static allModels: OpModelType<any>[] = [];
     static _CUT_KEYS: string[] = [];
+    
+    // Store relation foreign key fields for reload() functionality
+    private _relationFields: Record<string, any> = {};
 
     private postLoadExecuted: boolean = false;
 
@@ -566,6 +569,34 @@ class RWSModel<T> implements IModel {
                         if (typeof relationData === 'object' && relationData !== null && 
                             (relationData.id || Object.keys(relationData).length > 1)) {
                             const relatedInstance = new ModelClass();
+                            
+                            // Check relation metadata to identify foreign key fields that need to be preserved
+                            const tempInstance = new ModelClass();
+                            const childClassFields = FieldsHelper.getAllClassFields(tempInstance.constructor);
+                            const [childRelOneData, childRelManyData] = await Promise.all([
+                                RelationUtils.getRelationOneMeta(tempInstance, childClassFields),
+                                RelationUtils.getRelationManyMeta(tempInstance, childClassFields)
+                            ]);
+                            
+                            // Store foreign key fields from relation metadata
+                            for (const relKey in childRelOneData) {
+                                const relMeta = childRelOneData[relKey];
+                                const foreignKeyField = relMeta.hydrationField; // e.g., 'avatar_id', 'knowledge_id'
+                                if (foreignKeyField && relationData[foreignKeyField] !== undefined) {
+                                    relatedInstance._relationFields[foreignKeyField] = relationData[foreignKeyField];
+                                    relatedInstance[foreignKeyField] = relationData[foreignKeyField];
+                                }
+                            }
+                            
+                            for (const relKey in childRelManyData) {
+                                const relMeta = childRelManyData[relKey];
+                                const foreignKeyField = relMeta.foreignKey; // Use foreignKey for inverse relations
+                                if (foreignKeyField && relationData[foreignKeyField] !== undefined) {
+                                    relatedInstance._relationFields[foreignKeyField] = relationData[foreignKeyField];
+                                    relatedInstance[foreignKeyField] = relationData[foreignKeyField];
+                                }
+                            }
+                            
                             await relatedInstance._asyncFill(relationData, false, false, true);
                             this[key] = relatedInstance;
                         }
@@ -575,6 +606,34 @@ class RWSModel<T> implements IModel {
                         for (const itemData of relationData) {
                             if (typeof itemData === 'object' && itemData !== null) {
                                 const relatedInstance = new ModelClass();
+                                
+                                // Check relation metadata to identify foreign key fields that need to be preserved
+                                const tempInstance = new ModelClass();
+                                const childClassFields = FieldsHelper.getAllClassFields(tempInstance.constructor);
+                                const [childRelOneData, childRelManyData] = await Promise.all([
+                                    RelationUtils.getRelationOneMeta(tempInstance, childClassFields),
+                                    RelationUtils.getRelationManyMeta(tempInstance, childClassFields)
+                                ]);
+                                
+                                // Store foreign key fields from relation metadata
+                                for (const relKey in childRelOneData) {
+                                    const relMeta = childRelOneData[relKey];
+                                    const foreignKeyField = relMeta.hydrationField; // e.g., 'avatar_id', 'knowledge_id'
+                                    if (foreignKeyField && itemData[foreignKeyField] !== undefined) {
+                                        relatedInstance._relationFields[foreignKeyField] = itemData[foreignKeyField];
+                                        relatedInstance[foreignKeyField] = itemData[foreignKeyField];
+                                    }
+                                }
+                                
+                                for (const relKey in childRelManyData) {
+                                    const relMeta = childRelManyData[relKey];
+                                    const foreignKeyField = relMeta.foreignKey; // Use foreignKey for inverse relations
+                                    if (foreignKeyField && itemData[foreignKeyField] !== undefined) {
+                                        relatedInstance._relationFields[foreignKeyField] = itemData[foreignKeyField];
+                                        relatedInstance[foreignKeyField] = itemData[foreignKeyField];
+                                    }
+                                }
+                                
                                 await relatedInstance._asyncFill(itemData, false, false, true);
                                 relatedInstances.push(relatedInstance);
                             }
@@ -614,11 +673,26 @@ class RWSModel<T> implements IModel {
         // Convert the fresh instance back to plain data for hydration
         const plainData = await freshData.toMongo();
         
+        // Preserve foreign key fields from _relationFields to ensure relations can be hydrated
+        for (const key in this._relationFields) {
+            if (plainData[key] === undefined) {
+                plainData[key] = this._relationFields[key];
+            }
+        }
+        
         // Hydrate current instance with fresh data including relations
         await this._asyncFill(plainData, true, true, true);
         
         return this;
     }
+    
+    // Helper method to get property with fallback to stored relation fields
+    getPropertyValue(key: string): any {
+        if (this.hasOwnProperty(key) || this[key] !== undefined) {
+            return this[key];
+        }
+        return this._relationFields[key];
+    }
 }
 
 export { RWSModel };

package/src/models/utils/FindUtils.ts

@@ -130,7 +130,7 @@ export class FindUtils {
             } : null;
             
             const dbData = await opModel.services.dbService.findBy(collection, conditions, fields, ordering, paginateParams, prismaOptions);
-
+        
             if (dbData.length) {
                 const instanced: T[] = [];