@bytebrand/export-cars 1.12.11 → 1.12.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.12.11",
+  "version": "1.12.13",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "52cb18663c18194212f6afac63e5ee056a347e1c"
+  "gitHead": "a544ce4fb9fa2f53b386550022d93ee05313072f"
 }

package/src/exporters/as24.exporter.ts

@@ -36,21 +36,18 @@ export class As24Exporter implements Exporter {
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
       const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
 
-      if (chunk && chunkData) {
-        for (let i = 0; i < chunk.data.length; i += 1) {
-          const data = chunk.data[i];
-          const ownerId = get(data.car, 'metaData.ownerId');
+      for (let i = 0; i < chunkData.length; i += 1) {
+        const data = chunkData[i];
+        const ownerId = get(data.car, 'metaData.ownerId');
 
-          const transformedData = await as24Transformer.transform(data.car);
-          const transformedDataCSV = `${convertToCSV(transformedData)}\n`;
+        const transformedData = await as24Transformer.transform(data.car);
+        const transformedDataCSV = `${convertToCSV(transformedData)}\n`;
 
-          const filename = `${this.configService.config.pathesConfig.localConvertedDirectory}/${ownerId}.${FileType.CSV}`
-          await writeFile(filename, Buffer.from(transformedDataCSV), { flag: 'a' },);
-
-          this.carService.counter.countCar(data.images);
-          processedDealers.add(ownerId);
-        }
+        const filename = `${this.configService.config.pathesConfig.localConvertedDirectory}/${ownerId}.${FileType.CSV}`
+        await writeFile(filename, Buffer.from(transformedDataCSV), { flag: 'a' },);
 
+        this.carService.counter.countCar(data.images);
+        processedDealers.add(ownerId);
       }
     });
 
@@ -59,7 +56,7 @@ export class As24Exporter implements Exporter {
       const d = `${now.getFullYear()}${now.getMonth() + 1}${now.getDate()}`;
       const fileCSV = normalize(`${this.configService.config.pathesConfig.localConvertedDirectory}/${dealer}.${FileType.CSV}`);
       const fileZIP = normalize(`${this.configService.config.pathesConfig.localConvertedDirectory}/${d}_${dealer}.${FileType.ZIP}`);
-      
+
       if (await CronicleUtils.exists(fileCSV)) {
         await Zipper.zip({ fileList: [fileCSV], dest: fileZIP });
         await CronicleUtils.unlinkIfExists(fileCSV);

package/src/exporters/auto24.exporter.ts

@@ -17,7 +17,7 @@ export class Auto24Exporter implements Exporter {
     private loaderService: LoaderService,
     private moduleRef: ModuleRef,
     private rulesService: RulesService,
-  ) {}
+  ) { }
 
   async export(): Promise<void> {
     const [fileXml] = this.configService.config.outputFiles;
@@ -32,13 +32,11 @@ export class Auto24Exporter implements Exporter {
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
       const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
 
-      if (chunk && chunkData) {
-        for (let i = 0; i < chunk.data.length; i += 1) {
-          const data = chunk.data[i];
-          const { car, images } = data;
-          await xmlBuilder.addItem(await auto24Transformer.transform(car, images), 'Deutschland');
-          this.carService.counter.countCar(images);
-        }
+      for (let i = 0; i < chunkData.length; i += 1) {
+        const data = chunk.data[i];
+        const { car, images } = data;
+        await xmlBuilder.addItem(await auto24Transformer.transform(car, images), 'Deutschland');
+        this.carService.counter.countCar(images);
       }
     });
 

package/src/exporters/autouncle.exporter.ts

@@ -33,7 +33,7 @@ export class AutouncleExporter implements Exporter {
 
     let firstCar = true;
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
-      // chunk.data = chunk.data.filter(e => this.carService.filterCar(e, this.rulesService.rules));
+      chunk.data = chunk.data.filter(e => this.carService.filterCar(e, this.rulesService.rules));
 
       for (const data of chunk.data) {
         const ownerId = get(data.car, 'metaData.ownerId');

package/src/exporters/facebook-shop.exporter.ts

@@ -17,7 +17,7 @@ export class FacebookShopExporter implements Exporter {
     private loaderService: LoaderService,
     private moduleRef: ModuleRef,
     private rulesService: RulesService,
-  ) {}
+  ) { }
 
   async export(): Promise<void> {
     const [fileXml] = this.configService.config.outputFiles;
@@ -32,15 +32,13 @@ export class FacebookShopExporter implements Exporter {
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
       const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
 
-      if (chunk && chunkData) {
-        for (let i = 0; i < chunk.data.length; i += 1) {
-          const data = chunk.data[i];
+      for (let i = 0; i < chunkData.length; i += 1) {
+        const data = chunk.data[i];
 
-          const transformedCar = await facebookShopTransformer.transform(data);
+        const transformedCar = await facebookShopTransformer.transform(data);
 
-          await facebookShopXmkBuilder.addItem(transformedCar);
-          this.carService.counter.countCar(data.images);
-        }
+        await facebookShopXmkBuilder.addItem(transformedCar);
+        this.carService.counter.countCar(data.images);
       }
     });
 

package/src/exporters/ooyyo.exporter.ts

@@ -31,15 +31,12 @@ export class OoyyoExporter implements Exporter {
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
       const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
 
-      if (chunk && chunkData) {
-        for (let i = 0; i < chunk.data.length; i += 1) {
-          const data = chunk.data[i];
-          const { car, images } = data;
+        for (let i = 0; i < chunkData.length; i += 1) {
+          const { car, images } = chunkData[i];
           await ooyyoXmlBuilder.addItem(await ooyyoTransformer.transform(car, images));
 
           this.carService.counter.countCar(images);
         }
-      }
     });
 
     await ooyyoXmlBuilder.buildEnd();

package/src/exporters/rubrikk.exporter.ts

@@ -33,15 +33,13 @@ export class RubrikkExporter implements Exporter {
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
       const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
 
-      if (chunk && chunkData) {
-        for (let i = 0; i < chunk.data.length; i += 1) {
-          const data = chunk.data[i];
+      for (let i = 0; i < chunkData.length; i += 1) {
+        const data = chunkData[i];
 
-          const transformedCar = await rubrikkTransformer.transform(data);
+        const transformedCar = await rubrikkTransformer.transform(data);
 
-          await rubrikkXmlBuilder.addItem(transformedCar);
-          this.carService.counter.countCar(data.images);
-        }
+        await rubrikkXmlBuilder.addItem(transformedCar);
+        this.carService.counter.countCar(data.images);
       }
     });
 

package/src/exporters/trovit.exporter.ts

@@ -17,7 +17,7 @@ export class TrovitExporter implements Exporter {
     private loaderService: LoaderService,
     private moduleRef: ModuleRef,
     private rulesService: RulesService,
-  ) {}
+  ) { }
 
   async export(): Promise<void> {
     const [fileXml] = this.configService.config.outputFiles;
@@ -30,17 +30,15 @@ export class TrovitExporter implements Exporter {
     const trovitTransformer = await this.moduleRef.create(TrovitTransformer);
 
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
-      const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
+      chunk.data = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
 
-      if (chunk && chunkData) {
-        for (let i = 0; i < chunk.data.length; i += 1) {
-          const data = chunk.data[i];
+      for (let i = 0; i < chunk.data.length; i += 1) {
+        const data = chunk.data[i];
 
-          const transformedCar = await trovitTransformer.transform(data);
+        const transformedCar = await trovitTransformer.transform(data);
 
-          await trovitXmlBuilder.addItem(transformedCar);
-          this.carService.counter.countCar(data.images);
-        }
+        await trovitXmlBuilder.addItem(transformedCar);
+        this.carService.counter.countCar(data.images);
       }
     });
 

package/src/transformers/rubrikk.transformer.ts

@@ -1,25 +1,26 @@
 import { escape, get, isEmpty, join, toNumber, toSafeInteger, toString, trim } from 'lodash';
 import { Injectable } from '@nestjs/common';
+import * as moment from 'moment/moment';
 
+import { CarDescriptionFactory, DescriptionTypeEnum } from '@bytebrand/car-description';
 import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictionaries';
-import { DePostalCodesService } from '@bytebrand/car-basic-data-scope';
 import { ImboImageResponseInterface } from '@bytebrand/chunkable';
 import { TranslatorExtended } from '@bytebrand/schema-tools';
 import { DataSchemes } from '@bytebrand/car-schema';
 
+import { ConfigService, ImagesService, UserService } from '../services';
 import { RubrikkXmlItem } from '../interfaces';
-import { ConfigService, ImagesService } from '../services';
-
-import * as moment from 'moment/moment';
 
 @Injectable()
 export class RubrikkTransformer {
   private translator: TranslatorExtended;
-  private postalCodesService: DePostalCodesService;
 
-  constructor(private readonly configService: ConfigService, private readonly imageService: ImagesService) {
+  constructor(
+    private readonly configService: ConfigService, 
+    private readonly imageService: ImagesService,
+    private readonly userService: UserService,
+    ) {
     const dict = { ...de, ...deVehicleProps, ...deVehicleDetailsPage };
-    this.postalCodesService = DePostalCodesService.getInstance();
     this.translator = new TranslatorExtended(dict);
   }
 
@@ -34,7 +35,7 @@ export class RubrikkTransformer {
       //Common Fields
       ad__all_imageurls: await this.imageService.getImages(car, images, this.configService.config.imageType, false),
       ad__condition_new_used_etc: this.getCondition(car),
-      ad__description: toString(get(car, 'offer.offerDescription', '')),
+      ad__description: await this.getDescription(car),
       ad__headline: this.getTitle(car),
       ad__imageurl: this.getImageLink(car),
       ad__price: toNumber(get(car, 'price.currentSalesPrice', null)),
@@ -189,4 +190,11 @@ export class RubrikkTransformer {
     const driveType = get(car, 'driveSuspension.driveType', 'selector_unknown');
     return get(available, driveType) || 'N/A';
   }
+
+  private async getDescription(car: DataSchemes.Car): Promise<string> {
+    const dealerId = get(car, 'metaData.ownerId');
+    const descriptionSchema = await this.userService.getDefaultSummaryByDealerId(dealerId);
+    const descriptionBuilder = CarDescriptionFactory.create(DescriptionTypeEnum.Mobile, car);
+    return descriptionBuilder.transform(descriptionSchema);
+  }
 }