@rws-framework/db 3.6.0 → 3.7.0

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

@@ -24,7 +24,7 @@ declare class RWSModel<T> implements IModel {
     checkForInclusion(): boolean;
     static checkForInclusion(this: OpModelType<any>, checkModelType: string): boolean;
     protected _fill(data: any): RWSModel<T>;
-    protected hasRelation(key: string): boolean;
+    protected hasRelation(key: string): Promise<boolean>;
     protected bindRelation(key: string, relatedModel: RWSModel<any>): {
         connect: {
             id: string | number;

package/dist/models/core/RWSModel.js

@@ -86,8 +86,8 @@ class RWSModel {
         }
         return this;
     }
-    hasRelation(key) {
-        return RelationUtils_1.RelationUtils.hasRelation(this, key);
+    async hasRelation(key) {
+        return RelationUtils_1.RelationUtils.hasRelation(this.constructor, key);
     }
     bindRelation(key, relatedModel) {
         return RelationUtils_1.RelationUtils.bindRelation(relatedModel);
@@ -138,7 +138,7 @@ class RWSModel {
         const timeSeriesIds = TimeSeriesUtils_1.TimeSeriesUtils.getTimeSeriesModelFields(this);
         const timeSeriesHydrationFields = [];
         for (const key in this) {
-            if (this.hasRelation(key)) {
+            if (await this.hasRelation(key)) {
                 data[key] = this.bindRelation(key, this[key]);
                 continue;
             }

package/dist/models/utils/FindUtils.js

@@ -13,7 +13,7 @@ class FindUtils {
         const dbData = await opModel.services.dbService.findOneBy(collection, conditions, fields, ordering);
         if (dbData) {
             const inst = new opModel();
-            const loaded = await inst._asyncFill(dbData, fullData, allowRelations, findParams.cancelPostLoad ? false : true);
+            const loaded = await inst._asyncFill(dbData, fullData, allowRelations, findParams?.cancelPostLoad ? false : true);
             return loaded;
         }
         return null;
@@ -28,7 +28,7 @@ class FindUtils {
         const dbData = await opModel.services.dbService.findOneBy(collection, { id }, fields, ordering);
         if (dbData) {
             const inst = new opModel();
-            const loaded = await inst._asyncFill(dbData, fullData, allowRelations, findParams.cancelPostLoad ? false : true);
+            const loaded = await inst._asyncFill(dbData, fullData, allowRelations, findParams?.cancelPostLoad ? false : true);
             return loaded;
         }
         return null;
@@ -48,7 +48,7 @@ class FindUtils {
                 const instanced = [];
                 for (const data of dbData) {
                     const inst = new opModel();
-                    instanced.push((await inst._asyncFill(data, fullData, allowRelations, findParams.cancelPostLoad ? false : true)));
+                    instanced.push((await inst._asyncFill(data, fullData, allowRelations, findParams?.cancelPostLoad ? false : true)));
                 }
                 return instanced;
             }
@@ -73,7 +73,7 @@ class FindUtils {
                 const instanced = [];
                 for (const data of dbData) {
                     const inst = new opModel();
-                    instanced.push((await inst._asyncFill(data, fullData, allowRelations, findParams.cancelPostLoad ? false : true)));
+                    instanced.push((await inst._asyncFill(data, fullData, allowRelations, findParams?.cancelPostLoad ? false : true)));
                 }
                 return instanced;
             }

package/dist/models/utils/RelationUtils.d.ts

@@ -8,7 +8,7 @@ export declare class RelationUtils {
         connect: {
             id: string | number;
         };
-    };
-    static hasRelation(model: RWSModel<any>, key: string): boolean;
+    } | null;
+    static hasRelation(constructor: any, variable: string): Promise<boolean>;
     static checkRelDisabled(model: RWSModel<any>, key: string): boolean;
 }

package/dist/models/utils/RelationUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelationUtils = void 0;
+const ModelUtils_1 = require("./ModelUtils");
 class RelationUtils {
     static async getRelationOneMeta(model, classFields) {
         const relIds = {};
@@ -48,15 +49,22 @@ class RelationUtils {
         return relIds;
     }
     static bindRelation(relatedModel) {
+        if (!relatedModel.id) {
+            return null;
+        }
         return {
             connect: {
                 id: relatedModel.id
             }
         };
     }
-    static hasRelation(model, key) {
-        // Check if the property exists and is an object with an id property
-        return !!model[key] && typeof model[key] === 'object' && model[key] !== null && 'id' in model[key];
+    static async hasRelation(constructor, variable) {
+        const dbAnnotations = await ModelUtils_1.ModelUtils.getModelAnnotations(constructor);
+        const dbProperties = Object.keys(dbAnnotations)
+            .map((key) => { return { ...dbAnnotations[key], key }; })
+            .filter((element) => element.annotationType === 'Relation')
+            .map((element) => element.key);
+        return dbProperties.includes(variable);
     }
     static checkRelDisabled(model, key) {
         const constructor = model.constructor;

package/package.json

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

package/src/models/core/RWSModel.ts

@@ -101,8 +101,8 @@ class RWSModel<T> implements IModel {
         return this;
     }
 
-    protected hasRelation(key: string): boolean {
-        return RelationUtils.hasRelation(this, key);
+    protected async hasRelation(key: string): Promise<boolean> {
+        return RelationUtils.hasRelation((this as any).constructor, key);
     }
 
     protected bindRelation(key: string, relatedModel: RWSModel<any>): { connect: { id: string | number } } {        
@@ -177,7 +177,7 @@ class RWSModel<T> implements IModel {
         const timeSeriesHydrationFields: string[] = [];
       
         for (const key in (this as any)) { 
-            if (this.hasRelation(key)) {                
+            if (await this.hasRelation(key)) {                
                 data[key] = this.bindRelation(key, this[key]);                
                 continue;
             }
@@ -192,6 +192,7 @@ class RWSModel<T> implements IModel {
                 ).includes(key) && 
                 !timeSeriesHydrationFields.includes(key)
             ;
+
     
             if (passedFieldCondition) {                      
                 data[key] = this[key];
@@ -201,8 +202,8 @@ class RWSModel<T> implements IModel {
                 data[key] = this[key];
                 timeSeriesHydrationFields.push(timeSeriesIds[key].hydrationField);              
             }
-        }                
-    
+        }               
+            
         return data;
     }  
 

package/src/models/utils/FindUtils.ts

@@ -27,7 +27,7 @@ export class FindUtils {
 
         if (dbData) {
             const inst: T = new (opModel as { new(): T })();
-            const loaded = await inst._asyncFill(dbData, fullData, allowRelations, findParams.cancelPostLoad ? false : true);        
+            const loaded = await inst._asyncFill(dbData, fullData, allowRelations, findParams?.cancelPostLoad ? false : true);        
             return loaded as T;
         }
 
@@ -51,7 +51,7 @@ export class FindUtils {
 
         if (dbData) {
             const inst: T = new (opModel as { new(): T })();
-            const loaded = await inst._asyncFill(dbData, fullData, allowRelations, findParams.cancelPostLoad ? false : true);
+            const loaded = await inst._asyncFill(dbData, fullData, allowRelations, findParams?.cancelPostLoad ? false : true);
             return loaded as T;
         }
 
@@ -80,7 +80,7 @@ export class FindUtils {
                 for (const data of dbData) {
                     const inst: T = new (opModel as { new(): T })();
 
-                    instanced.push((await inst._asyncFill(data, fullData, allowRelations, findParams.cancelPostLoad ? false : true)) as T);
+                    instanced.push((await inst._asyncFill(data, fullData, allowRelations, findParams?.cancelPostLoad ? false : true)) as T);
                 }
 
                 return instanced;
@@ -114,7 +114,7 @@ export class FindUtils {
 
                 for (const data of dbData) {
                     const inst: T = new (opModel as { new(): T })();
-                    instanced.push((await inst._asyncFill(data, fullData, allowRelations, findParams.cancelPostLoad ? false : true)) as T);
+                    instanced.push((await inst._asyncFill(data, fullData, allowRelations, findParams?.cancelPostLoad ? false : true)) as T);
                 }
 
                 return instanced;

package/src/models/utils/RelationUtils.ts

@@ -1,6 +1,7 @@
 import { RelOneMetaType, RelManyMetaType } from '../types/RelationTypes';
 import { IRWSModel } from '../../types/IRWSModel';
 import { OpModelType, RWSModel } from '../_model';
+import { ModelUtils } from './ModelUtils';
 
 export class RelationUtils {
     static async getRelationOneMeta(model: RWSModel<any>, classFields: string[]): Promise<RelOneMetaType<IRWSModel>> {
@@ -57,7 +58,11 @@ export class RelationUtils {
         return relIds;
     }
 
-    static bindRelation(relatedModel: RWSModel<any>): { connect: { id: string | number } } {
+    static bindRelation(relatedModel: RWSModel<any>): { connect: { id: string | number } } | null {
+        if(!relatedModel.id){
+            return null;
+        }
+
         return {
             connect: {
                 id: relatedModel.id
@@ -65,9 +70,16 @@ export class RelationUtils {
         };
     }
 
-    static hasRelation(model: RWSModel<any>, key: string): boolean {
-        // Check if the property exists and is an object with an id property
-        return !!model[key] && typeof model[key] === 'object' && model[key] !== null && 'id' in model[key];
+    static async hasRelation(constructor: any, variable: string): Promise<boolean> {
+        const dbAnnotations = await ModelUtils.getModelAnnotations(constructor);
+        type AnnotationType = { annotationType: string, key: string };
+    
+        const dbProperties: string[] = Object.keys(dbAnnotations)
+            .map((key: string): AnnotationType => {return {...dbAnnotations[key], key};})
+            .filter((element: AnnotationType) => element.annotationType === 'Relation' )
+            .map((element: AnnotationType) => element.key);
+    
+        return dbProperties.includes(variable);
     }
 
     static checkRelDisabled(model: RWSModel<any>, key: string): boolean {