@solidstarters/solid-core 1.2.138 → 1.2.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.138",
+  "version": "1.2.139",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/helpers/field-crud-managers/ManyToOneRelationFieldCrudManager.ts

@@ -9,9 +9,10 @@ export interface ManyToOneRelationFieldOptions {
     required: boolean | undefined | null;
     relationCoModelSingularName: string | undefined | null;
     fieldName: string | undefined | null;
-    modelUserKeyFieldName: string | undefined | null;
+    // modelUserKeyFieldName: string | undefined | null;
     modelSingularName: string | undefined | null;
     entityManager: EntityManager;
+    relationCoModelUserKeyFieldName: string | undefined | null; 
 }
 
 // This implementation is meant to be used for many-to-one relation field
@@ -50,8 +51,8 @@ export class ManyToOneRelationFieldCrudManager implements FieldCrudManager {
     private applyUserKeyFormatValidations(fieldUserKey: string): ValidationError[] {
         const errors: ValidationError[] = [];
         !isString(fieldUserKey) ? errors.push({ field: this.options.fieldName, error: 'Field is not a string' }) : "no errors";
-        if (isEmpty(this.options.modelUserKeyFieldName)) {
-            errors.push({ field: this.options.fieldName, error: `UserKey field name is not defined in the model ${this.options.modelSingularName}` });
+        if (isEmpty(this.options.relationCoModelUserKeyFieldName)) {
+            errors.push({ field: this.options.fieldName, error: `UserKey field name is not defined in the model ${this.options.relationCoModelSingularName}` });
         }
         return errors;
     }
@@ -72,9 +73,9 @@ export class ManyToOneRelationFieldCrudManager implements FieldCrudManager {
             }
         }
         else {
-            dto[this.options.fieldName] = await this.options.entityManager.getRepository(entityTarget).findOneBy({ [this.options.modelUserKeyFieldName]: fieldUserKeyValue });
+            dto[this.options.fieldName] = await this.options.entityManager.getRepository(entityTarget).findOneBy({ [this.options.relationCoModelUserKeyFieldName]: fieldUserKeyValue });
             if (this.options.required && isEmpty(dto[this.options.fieldName])) {
-                throw new Error(`ManyToOneRelationFieldCrudManager: Record with userKey: ${this.options.modelUserKeyFieldName}: ${fieldUserKeyValue} not found in ${this.options.relationCoModelSingularName}`);
+                throw new Error(`ManyToOneRelationFieldCrudManager: Record with userKey: ${this.options.relationCoModelUserKeyFieldName}: ${fieldUserKeyValue} not found in ${this.options.relationCoModelSingularName}`);
             }
         }
 

package/src/services/crud.service.ts

@@ -111,7 +111,7 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
     }
 
     private async validateAndTransformDto(field: FieldMetadata, dto: any, files: Express.Multer.File[], hasMediaFields: boolean, isPartialUpdate: boolean = false, isUpdate: boolean = false) {
-        const fieldManager: FieldCrudManager = this.fieldCrudManager(field, this.entityManager, isPartialUpdate, isUpdate);
+        const fieldManager: FieldCrudManager = await this.fieldCrudManager(field, this.entityManager, isPartialUpdate, isUpdate);
         const validationErrors = fieldManager.validate(dto, files);
         const errors = (validationErrors instanceof Promise) ? await validationErrors : validationErrors;
         if (errors.length > 0) {
@@ -259,7 +259,7 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
         }
     }
 
-    private fieldCrudManager(fieldMetadata: FieldMetadata, entityManager: EntityManager, isPartialUpdate: boolean = false, isUpdate: boolean = false): FieldCrudManager {
+    private async fieldCrudManager(fieldMetadata: FieldMetadata, entityManager: EntityManager, isPartialUpdate: boolean = false, isUpdate: boolean = false) {
         const commonOptions = { required: fieldMetadata.required && !isPartialUpdate, fieldName: fieldMetadata.name, isUpdate };
         switch (fieldMetadata.type) {
             case SolidFieldType.shortText: {
@@ -326,11 +326,13 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
             case SolidFieldType.relation: {
                 // Identify if the field is for the inverse side or not
                 if (fieldMetadata.relationType === RelationType.manyToOne) {
+                    const relationCoModelUserKeyFieldName = await this.getUserKeyFieldNameForModel(fieldMetadata.relationCoModelSingularName);
                     const manyToOneOptions: ManyToOneRelationFieldOptions = {
                         ...commonOptions,
                         relationCoModelSingularName: fieldMetadata.relationCoModelSingularName,
-                        modelUserKeyFieldName: fieldMetadata.model.userKeyField?.name,
+                        // modelUserKeyFieldName: fieldMetadata.model.userKeyField?.name,
                         modelSingularName: fieldMetadata.model.singularName,
+                        relationCoModelUserKeyFieldName: relationCoModelUserKeyFieldName,
                         entityManager,
                     }
                     return new ManyToOneRelationFieldCrudManager(manyToOneOptions);
@@ -677,7 +679,7 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
 
             // Process each field
             for (const field of model.fields) {
-                const fieldManager: FieldCrudManager = this.fieldCrudManager(field, this.entityManager);
+                const fieldManager: FieldCrudManager = await this.fieldCrudManager(field, this.entityManager);
                 const validationErrors = await fieldManager.validate(createDto, files);
                 if (validationErrors.length > 0) {
                     throw new BadRequestException(`Validation errors in ${field.name} are invalid: ${validationErrors.map(e => e.error).join(', ')}`);
@@ -871,5 +873,13 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
 
         return this.getFieldMetadataRecursively(remainingParts, relationCoModel.fields);
     }
+
+    async getUserKeyFieldNameForModel(modelSingularName: string): Promise<string> {
+        const model = await this.modelMetadataService.findOneBySingularName(modelSingularName, ['userKeyField']);
+        if (!model) {
+            throw new BadRequestException(`Model ${modelSingularName} not found`);
+        }
+        return model.userKeyField?.name || '';
+    }
 }
 

package/src/subscribers/dashboard.subscriber.ts

@@ -1,9 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectDataSource } from "@nestjs/typeorm";
-import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
 import { Dashboard } from 'src/entities/dashboard.entity';
 import { ModuleMetadataHelperService } from "src/helpers/module-metadata-helper.service";
-import { DashboardMapper } from 'src/mappers/dashboard-mapper';
 import { DashboardService } from 'src/services/dashboard.service';
 import { DataSource, EntityManager, EntitySubscriberInterface, InsertEvent, UpdateEvent } from "typeorm";
 
@@ -49,7 +47,7 @@ export class DashboardSubscriber implements EntitySubscriberInterface<Dashboard>
         // Load the dashboard with module relation populated
         const populatedDashboard = await entityManager.findOne(Dashboard, {
             where: { id: dashboard.id },
-            relations: ['module'],
+            relations: ['module','dashboardVariables', 'questions', 'questions.questionSqlDatasetConfigs'],
         });
 
         if (!populatedDashboard) {