@solidstarters/solid-core 1.2.112 → 1.2.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.112",
+  "version": "1.2.114",
   "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

@@ -248,6 +248,12 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
       JSON.parse(importTransaction.mapping) as ImportMapping[], // Parse the mapping from the import transaction
       importTransaction.modelMetadata,
     );
+
+    // Update the import transaction status to 'completed'
+    importTransaction.status = 'import_succeeded';
+    // Save the import transaction
+    await this.repo.save(importTransaction);
+
     return {status: importTransaction.status, importedIds: ids}; // Return the IDs of the created records
   }
 
@@ -331,7 +337,7 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
   ): Promise<Array<number>> {
     // Get the model service for the model metadata name
     const modelService = this.getModelService(modelMetadataWithFields.singularName);
-
+    const createdRecordIds = [];
     // Depending upon the mime type of the file, read the file in pages
     // For CSV files, use the csvService to read the file in pages
     // For Excel files, use the excelService to read the file in pages
@@ -344,7 +350,9 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
         const createdRecords = await modelService.insertMany(dtos, [], {});
         // Set the solidRequestContext to null, as this is a background job;
         // Return the IDs of the created records
-        return createdRecords.map(record => record.id);
+        const newIds = createdRecords.map(record => record.id);
+        // Add the new IDs to the createdRecordIds array
+        createdRecordIds.push(...newIds);
       }
     }
     else if (mimeType === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
@@ -356,11 +364,13 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
         const createdRecords = await modelService.insertMany(dtos, [], {});
         // Set the solidRequestContext to null, as this is a background job;
         // Return the IDs of the created records
-        return createdRecords.map(record => record.id);
+        const newIds = createdRecords.map(record => record.id);
+        createdRecordIds.push(...newIds);
       }
     } else { // If the file is neither CSV nor Excel, throw an error
       throw new Error(`Unsupported file type: ${mimeType}`);
     }
+    return createdRecordIds; // Return the IDs of the created records
   }
 
   private getModelService(modelSingularName: string): CRUDService<any> {
@@ -411,18 +421,43 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
     const fieldType = fieldMetadata.type;
     // const userKeyFieldName = userKeyField?.name || 'id'; // Default to 'id' if not found
 
+    // TODO Move this logic to field crud managers i.e add a parse method to the field crud manager interface
     switch (fieldType) {
       case SolidFieldType.relation: {
         return await this.populateDtoForRelations(fieldMetadata, record, key, dtoRecord);
       }
-      case SolidFieldType.date: return this.populateDtoForDate(record, key, fieldMetadata, dtoRecord);
+      case SolidFieldType.date: 
       case SolidFieldType.datetime: return this.populateDtoForDate(record, key, fieldMetadata, dtoRecord);
+      case SolidFieldType.int:
+      case SolidFieldType.bigint:
+      case SolidFieldType.decimal:
+        return this.populateDtoForNumber(dtoRecord, fieldMetadata, record, key); 
+      case SolidFieldType.boolean:
+        return this.populateDtoForBoolean(dtoRecord, fieldMetadata, record, key);  
       default:
         dtoRecord[fieldMetadata.name] = record[key];
         return dtoRecord;
     }
   }
 
+  private populateDtoForBoolean(dtoRecord: Record<string, any>, fieldMetadata: FieldMetadata, record: Record<string, any>, key: string) {
+    const booleanValue = Boolean(record[key]);
+    if (typeof booleanValue !== 'boolean') {
+      throw new Error(`Invalid boolean value for field ${fieldMetadata.name}: ${record[key]}`);
+    }
+    dtoRecord[fieldMetadata.name] = booleanValue;
+    return dtoRecord;
+  }
+
+  private populateDtoForNumber(dtoRecord: Record<string, any>, fieldMetadata: FieldMetadata, record: Record<string, any>, key: string) {
+    const numberValue = Number(record[key]);
+    if (isNaN(numberValue)) {
+      throw new Error(`Invalid number value for field ${fieldMetadata.name}: ${record[key]}`);
+    }
+    dtoRecord[fieldMetadata.name] = numberValue;
+    return dtoRecord;
+  }
+
   private populateDtoForDate(record: Record<string, any>, key: string, fieldMetadata: FieldMetadata, dtoRecord: Record<string, any>) {
     {
       const dateValue = new Date(record[key]);