@bytebrand/export-cars 1.21.14 → 1.21.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.21.14",
+  "version": "1.21.16",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",

package/src/export.command.ts

@@ -24,7 +24,7 @@ export class ExportRunner extends CommandRunner {
     await new Promise<void>((resolve, reject) => {
       rl.on('line', async (data: string) => {
         const input = JSON.parse(data) as Input;
-        LoggerService.log(`Running job: ${input.id} - ${JSON.stringify(input)} - ${JSON.stringify(exportSchema)} \n`);
+        LoggerService.log(`Running job: ${input.id} - ${JSON.stringify(input)} \n`);
 
         this.configService.config = new exportSchema[input.params.exportType].config(input.params);
         const exporter = await this.moduleRef.create<Exporter>(exportSchema[input.params.exportType].exporter);

package/src/exporters/santander.exporter.ts

@@ -31,8 +31,6 @@ export class SantanderExporter implements Exporter {
 
 		const santanderTransformer = await this.moduleRef.create(SantanderTransformer);
 
-		const transformedCars = []
-
 		await this.loaderService.process(async (chunk: FsChunkInterface) => {
 			chunk.data = chunk.data.filter(e => this.carService.filterCar(e, this.rulesService.rules));
 
@@ -40,23 +38,14 @@ export class SantanderExporter implements Exporter {
 				for (const data of chunk.data) {
 					const { car, images } = data;
 					const transformedData = await santanderTransformer.transform(car, images);
+					const transformedNormalizedData = await santanderTransformer.normalizeCarData(transformedData);
+					await santanderCSVBuilder.addItem(transformedNormalizedData);
 
-					if (chunk.data.indexOf(data) < 2) {
-						console.log(transformedData);
-					}
-
-					transformedCars.push(transformedData);
 					this.carService.counter.countCar(images);
 				}
 			}
 		});
 
-		const transformedNormalizedData = await santanderTransformer.normalizeCarData(transformedCars);
-
-		for (const data of transformedNormalizedData) {
-			await santanderCSVBuilder.addItem(data);
-		}
-
 		console.log(this.carService.counter.getCountedCars());
 		await santanderCSVBuilder.buildEnd();
 	}

package/src/formats/santander-csv.builder.ts

@@ -7,7 +7,7 @@ export class SantanderCSVBuilder extends XMLBuilderBase {
 	async addItem(car: unknown): Promise<void> {
 		let values = Object.values(car).map(value => {
 			if (typeof value === 'string' && value.includes(',')) {
-				return `"${value}"`;
+				return `"${value.replace(/"/g, '""')}"`;
 			}
 			return value;
 		});

package/src/transformers/santander.transformer.ts

@@ -30,24 +30,18 @@ export class SantanderTransformer extends MobileTransformer {
 	async normalizeCarData(transformedCarData: unknown) {
 		const data = transformedCarData as Array<{ [key: string]: any }>;
 
-		const allKeys = new Set<string>();
-		for (const car of data) {
-			for (const key of Object.keys(car)) {
-				allKeys.add(key);
+		const maxKey = Math.max(...Object.keys(data).map(key => parseInt(key, 10)));
+
+		const outputArray = [];
+		for (let i = 0; i <= maxKey; i++) {
+			if (data.hasOwnProperty(i.toString())) {
+				outputArray.push(data[i.toString()]);
+			} else {
+				outputArray.push('');
 			}
 		}
 
-		const normalizedData = await Promise.all(data.map(async car => {
-			const normalizedCar: { [key: string]: any } = { ...car };
-			for (const key of allKeys) {
-				if (!(key in normalizedCar)) {
-					normalizedCar[key] = "";
-				}
-			}
-			return normalizedCar;
-		}));
-
-		return normalizedData;
+		return outputArray;
 	}
 
 }