@solidstarters/solid-core 1.2.106 → 1.2.109

package/import_fix

@@ -0,0 +1,37 @@
+commit 0ee811cd5c23efc2f3762436b89cc3d50f82ceae
+Author: Oswald Rodrigues <oswald@logicloop.io>
+Date:   Wed Jun 11 14:58:16 2025 +0530
+
+    import related records fix
+
+diff --git a/src/services/import-transaction.service.ts b/src/services/import-transaction.service.ts
+index 6b3d167..515e52c 100644
+--- a/src/services/import-transaction.service.ts
++++ b/src/services/import-transaction.service.ts
+@@ -434,6 +434,9 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
+     }
+ 
+     const relatedRecordsIds = await this.getRelatedEntityIdsFromUserKeys(fieldMetadata, record, key);
++    if (relatedRecordsIds.length === 0) {
++      return dtoRecord; // If no related records found, return the dtoRecord as is
++    }
+ 
+     if (fieldMetadata.relationType === RelationType.manyTomany || fieldMetadata.relationType === RelationType.oneToMany) {
+       dtoRecord[`${fieldMetadata.name}Ids`] = relatedRecordsIds;
+@@ -446,12 +449,14 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
+   }
+ 
+   private async getRelatedEntityIdsFromUserKeys(fieldMetadata: FieldMetadata, record: Record<string, any>, key: string): Promise<Array<number>> {
++    // For many-to-many or one-to-many relations, we expect the record cell to contains a comma-separated list of userKeys
++    const relationUserKeys = record[key] ? String(record[key]).split(',').map((userKey: string) => userKey.trim()) : [];
++    if (relationUserKeys.length === 0) return [];
++
+     const coModelService = this.getModelService(fieldMetadata.relationCoModelSingularName);
+     const coModelWithUserKeyField = await this.modelMetadataService.findOneBySingularName(fieldMetadata.relationCoModelSingularName, ['userKeyField']);
+     const coModelUserKeyFieldName = coModelWithUserKeyField?.userKeyField?.name || 'id'; // Default to 'id' if not found
+ 
+-    // For many-to-many or one-to-many relations, we expect the record cell to contains a comma-separated list of userKeys
+-    const relationUserKeys = record[key] ? String(record[key]).split(',').map((userKey: string) => userKey.trim()) : [];
+ 
+     // Set the relation basic filter dto filters with the userkeys and call the find method of the model service to get the related records
+     const relationFilterDto = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.106",
+  "version": "1.2.109",
   "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/services/import-transaction.service.ts

@@ -58,6 +58,11 @@ interface ImportMapping {
   fieldName: string; // The name of the field in the model metadata to which the imported field is mapped
 }
 
+export interface ImportSyncResult {
+  status: string; // The status of the import transaction
+  importedIds: Array<number>; // The IDs of the records created during the import
+}
+
 @Injectable()
 export class ImportTransactionService extends CRUDService<ImportTransaction> {
   constructor(
@@ -227,7 +232,7 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
     };
   }
 
-  async startImportSync(importTransactionId: number): Promise<Array<number>> {
+  async startImportSync(importTransactionId: number): Promise<ImportSyncResult> {
     // Load the import transaction for the given ID
     const importTransaction = await this.loadImportTransaction(importTransactionId);
 
@@ -243,7 +248,7 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
       JSON.parse(importTransaction.mapping) as ImportMapping[], // Parse the mapping from the import transaction
       importTransaction.modelMetadata,
     );
-    return ids; // Return the IDs of the created records
+    return {status: importTransaction.status, importedIds: ids}; // Return the IDs of the created records
   }
 
   startImportAsync(importTransactionId: number): Promise<void> {
@@ -435,6 +440,9 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
     }
 
     const relatedRecordsIds = await this.getRelatedEntityIdsFromUserKeys(fieldMetadata, record, key);
+    if (relatedRecordsIds.length === 0) {
+      return dtoRecord; // If no related records found, return the dtoRecord as is
+    }
 
     if (fieldMetadata.relationType === RelationType.manyTomany || fieldMetadata.relationType === RelationType.oneToMany) {
       dtoRecord[`${fieldMetadata.name}Ids`] = relatedRecordsIds;
@@ -447,12 +455,14 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
   }
 
   private async getRelatedEntityIdsFromUserKeys(fieldMetadata: FieldMetadata, record: Record<string, any>, key: string): Promise<Array<number>> {
+    // For many-to-many or one-to-many relations, we expect the record cell to contains a comma-separated list of userKeys
+    const relationUserKeys = record[key] ? String(record[key]).split(',').map((userKey: string) => userKey.trim()) : [];
+    if (relationUserKeys.length === 0) return [];
+
     const coModelService = this.getModelService(fieldMetadata.relationCoModelSingularName);
     const coModelWithUserKeyField = await this.modelMetadataService.findOneBySingularName(fieldMetadata.relationCoModelSingularName, ['userKeyField']);
     const coModelUserKeyFieldName = coModelWithUserKeyField?.userKeyField?.name || 'id'; // Default to 'id' if not found
 
-    // For many-to-many or one-to-many relations, we expect the record cell to contains a comma-separated list of userKeys
-    const relationUserKeys = record[key] ? String(record[key]).split(',').map((userKey: string) => userKey.trim()) : [];
 
     // Set the relation basic filter dto filters with the userkeys and call the find method of the model service to get the related records
     const relationFilterDto = {