@bytebrand/export-cars 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -65,5 +65,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "4a0ed79c501346cef400dec5595283cdde7d1c93"
+  "gitHead": "322cb1a9ad9fa057e227f2c89bfed7f37ee39903"
 }

package/src/configs/alleskralle.config.ts

@@ -7,6 +7,6 @@ export class AlleskralleConfig extends Config {
     super(params);
     this.campaign = ExportType.ALLESKRALLE;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.ALLESKRALLE}-export`;
-    this.outputFiles = [`api_export_cars_${ExportType.ALLESKRALLE}.${FileType.XML}`];
+    this.outputFiles = [`${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.ALLESKRALLE}.${FileType.XML}`];
   }
 }

package/src/configs/auto24.config.ts

@@ -7,6 +7,8 @@ export class Auto24Config extends Config {
     super(params);
     this.campaign = ExportType.AUTO24;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.AUTO24}-export`;
-    this.outputFiles = [`api_export_cars_${ExportType.AUTO24}.${FileType.XML}`, `autode.${FileType.TAR_GZ}`];
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.AUTO24}.${FileType.XML}`, 
+    ];
   }
 }

package/src/configs/autoboerse.config.ts

@@ -7,7 +7,10 @@ export class AutoboerseConfig extends Config {
     super(params);
     this.campaign = ExportType.AUTOBOERSE;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.AUTOBOERSE}-export`;
+    
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.AUTOBOERSE}.${FileType.XML}`
+    ];
     this.imageUrl = this.environmentConfig[params.environment].imageUrl;
-    this.outputFiles = [`api_export_cars_${ExportType.AUTOBOERSE}.${FileType.XML}`];
   }
 }

package/src/configs/autouncle.config.ts

@@ -6,6 +6,8 @@ export class AutouncleConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.AUTOUNCLE}-export`;
-    this.outputFiles = [`api_export_cars_${ExportType.AUTOUNCLE}.${FileType.JSON}`];
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.AUTOUNCLE}.${FileType.JSON}`
+    ];
   }
 }

package/src/configs/criteo.config.ts

@@ -7,7 +7,9 @@ export class CriteoConfig extends Config {
     super(params);
     this.campaign = ExportType.CRITEO;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.CRITEO}-export`;
-    this.outputFiles = [`api_export_cars_${ExportType.CRITEO}.${FileType.XML}`];
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.CRITEO}.${FileType.XML}`
+    ];
     this.isCriteo = true;
   }
 }

package/src/configs/dasparking.config.ts

@@ -7,6 +7,8 @@ export class DasparkingConfig extends Config {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.DASPARKING}-export`;
     this.campaign = ExportType.DASPARKING;
-    this.outputFiles = [`api_export_cars_${ExportType.DASPARKING}.${FileType.XML}`];
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.DASPARKING}.${FileType.XML}`
+    ];
   }
 }

package/src/configs/fb.config.ts

@@ -7,6 +7,8 @@ export class FbConfig extends Config {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.FB}-export`;
     this.imageUrl = this.environmentConfig[params.environment].imageUrl;
-    this.outputFiles = [`api_export_cars_${ExportType.FB}.${FileType.XML}`];
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.FB}.${FileType.XML}`
+    ];
   }
 }

package/src/configs/google.config.ts

@@ -6,6 +6,8 @@ export class GoogleConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.GOOGLE}-export`;
-    this.outputFiles = [`api_export_cars_${ExportType.GOOGLE}.${FileType.XML}`];
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.GOOGLE}.${FileType.XML}`
+    ];
   }
 }

package/src/configs/{kleinanzeigeFocus.config.ts → kleinanzeigefocus.config.ts}

@@ -7,6 +7,8 @@ export class KleinanzeigeFocusConfig extends Config {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.KLEINANZEIGE_FOCUS}-export`;
     this.imageUrl = this.environmentConfig[params.environment].baseImageUrl;
-    this.outputFiles = [`api_export_cars_${ExportType.KLEINANZEIGE_FOCUS}.${FileType.XML}`];
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.KLEINANZEIGE_FOCUS}.${FileType.XML}`
+    ];
   }
 }

package/src/configs/meinstadt.config.ts

@@ -7,8 +7,8 @@ export class MeinstadtConfig extends Config {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.MEINSTADT}-export`;;
     this.outputFiles = [
-      `api_export_cars_${ExportType.MEINSTADT}.${FileType.JSON}`,
-      `api_export_cars_${ExportType.MEINSTADT}.${FileType.ZIP}`,
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.MEINSTADT}.${FileType.JSON}`,
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.MEINSTADT}.${FileType.ZIP}`,
     ];
   }
 }

package/src/configs/ooyyo.config.ts

@@ -7,8 +7,8 @@ export class OoyyoConfig extends Config {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.OOYYO}-export`;
     this.outputFiles = [
-      `api_export_cars_${ExportType.OOYYO}.${FileType.XML}`,
-      `autode-${ExportType.OOYYO}.${FileType.TAR_GZ}`,
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.OOYYO}.${FileType.XML}`,
+      `${this.pathesConfig.localConvertedDirectory}/autode-${ExportType.OOYYO}.${FileType.TAR_GZ}`,
     ];
   }
 }

package/src/enums/export-type.enum.ts

@@ -8,9 +8,6 @@ export enum ExportType {
   AUTOBOERSE = 'autoboerse',
   GOOGLE = 'google',
   FB = 'fb',
-  /**
-  * @deprecated
-  */
   AUTO24 = 'auto24',
   OOYYO = 'ooyyo',
   MEINSTADT = 'meinstadt',

package/src/exporters/auto24.exporter.ts

@@ -21,8 +21,9 @@ export class Auto24Exporter implements Exporter {
   ) { }
 
   async export(): Promise<void> {
-    const [fileXml, fileGZ] = this.configService.config.outputFiles;
-    await Promise.all([await CronicleUtils.unlinkIfExists(fileXml), await CronicleUtils.unlinkIfExists(fileGZ)]);
+    const [fileXml] = this.configService.config.outputFiles;
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
     const xmlBuilder = new Auto24XmlBuilder(fileXml);
     await xmlBuilder.buildStart();
@@ -44,8 +45,6 @@ export class Auto24Exporter implements Exporter {
     });
 
     await xmlBuilder.buildEnd();
-
-    fileGZ && await Zipper.tar({ dest: fileGZ, fileList: [fileXml] });
     console.log(this.carService.counter.getCountedCars());
   }
 }

package/src/exporters/autouncle.exporter.ts

@@ -23,7 +23,8 @@ export class AutouncleExporter implements Exporter {
 
   async export(): Promise<void> {
     const [fileName] = this.configService.config.outputFiles;
-    await CronicleUtils.unlinkIfExists(fileName);
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
     const autouncleJsonBuilder = new AutouncleJsonBuilder(fileName);
     await autouncleJsonBuilder.buildStart();

package/src/exporters/by-owner.exporter.ts

@@ -24,8 +24,8 @@ export class ByOwnerExporter implements Exporter {
 
   async export(): Promise<void> {
     const [fileName] = this.configService.config.outputFiles;
-
-    await CronicleUtils.unlinkIfExists(fileName);
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
     const byOwnerTransformer = await this.moduleRef.create(ByOwnerTransformer);
     const csvWriter = createCsvWriter();

package/src/exporters/fb.exporter.ts

@@ -21,8 +21,8 @@ export class FbExporter implements Exporter {
 
   async export(): Promise<void> {
     const [fileName] = this.configService.config.outputFiles;
-    await CronicleUtils.unlinkIfExists(fileName);
-
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
     const fbXmlBuilder = new FbXmlBuilder(fileName);
     await fbXmlBuilder.buildStart(this.configService.config.domain);

package/src/exporters/google.exporter.ts

@@ -21,7 +21,8 @@ export class GoogleExporter implements Exporter {
 
   async export(): Promise<void> {
     const [fileName] = this.configService.config.outputFiles;
-    await CronicleUtils.unlinkIfExists(fileName);
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
     const googleXmlBuilder = new GoogleXmlBuilder(fileName);
     await googleXmlBuilder.buildStart(this.configService.config.domain);

package/src/exporters/meinstadt.exporter.ts

@@ -23,7 +23,8 @@ export class MeinstadtExporter implements Exporter {
 
   async export(): Promise<void> {
     const [fileJson, fileGZ] = this.configService.config.outputFiles;
-    await Promise.all([CronicleUtils.unlinkIfExists(fileJson), CronicleUtils.unlinkIfExists(fileGZ)])
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
     const meinstadtJsonBuilder = new MeinstadtJsonBuilder(fileJson);
     await meinstadtJsonBuilder.buildStart();

package/src/exporters/mobile.exporter.ts

@@ -26,7 +26,6 @@ export class MobileExporter implements Exporter {
 
   async export(): Promise<void> {
     const [fileName] = this.configService.config.outputFiles;
-
     await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
     await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
@@ -41,21 +40,16 @@ export class MobileExporter implements Exporter {
           const { car, images } = data;
           const transformedData = await mobileTransformer.transform(car, images);
 
-          const file = `${this.configService.config.pathesConfig.localConvertedDirectory}/${fileName}`;
-          await writeFile(file, Buffer.from(`${convertToCSV(transformedData)}\n`), { flag: 'a' });
+          await writeFile(fileName, Buffer.from(`${convertToCSV(transformedData)}\n`), { flag: 'a' });
 
           this.carService.counter.countCar(data.images);
         }
-
       }
     });
 
-    const fileZIP = normalize(`${this.configService.config.pathesConfig.localConvertedDirectory}/${basename(fileName)}.${FileType.ZIP}`);
-    const fileCSV = normalize(`${this.configService.config.pathesConfig.localConvertedDirectory}/${fileName}`);
-    const fileList = [fileCSV];
-
-    if (await CronicleUtils.exists(fileCSV)) {
-      await Zipper.zip({ fileList, dest: fileZIP });
+    const fileZIP = normalize(`${basename(fileName)}.${FileType.ZIP}`);
+    if (await CronicleUtils.exists(fileName)) {
+      await Zipper.zip({ fileList: [fileName], dest: fileZIP });
     }
     console.log(this.carService.counter.getCountedCars());
   }

package/src/exporters/modix.exporter.ts

@@ -19,7 +19,8 @@ export class ModixExporter implements Exporter {
   ) {}
   async export(): Promise<void> {
     const [fileXml] = this.configService.config.outputFiles;
-    await CronicleUtils.unlinkIfExists(fileXml);
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
     const modixXmlBuilder = new ModixXmlBuilder(fileXml);
     await modixXmlBuilder.buildStart();

package/src/exporters/ooyyo.exporter.ts

@@ -20,7 +20,8 @@ export class OoyyoExporter implements Exporter {
 
   async export(): Promise<void> {
     const [fileXml, fileGZ] = this.configService.config.outputFiles;
-    await Promise.all([CronicleUtils.unlinkIfExists(fileXml), CronicleUtils.unlinkIfExists(fileGZ)]);
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
     
     const ooyyoXmlBuilder = new OoyyoXmlBuilder(fileXml);
     await ooyyoXmlBuilder.buildStart();

package/src/exporters/rubrikk.exporter.ts

@@ -22,7 +22,8 @@ export class RubrikkExporter implements Exporter {
 
   async export(): Promise<void> {
     const [fileXml, fileGZ] = this.configService.config.outputFiles;
-    await Promise.all([CronicleUtils.unlinkIfExists(fileXml), CronicleUtils.unlinkIfExists(fileGZ)]);
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
     const rubrikkXmlBuilder = new RubrikkXmlBuilder(fileXml);
     await rubrikkXmlBuilder.buildStart();

package/src/main.ts

@@ -7,6 +7,7 @@ async function bootstrap() {
     await CommandFactory.run(AppModule, false);
     LoggerService.complete();
   } catch (e) {
+    console.error(e);
     LoggerService.exitError(e.message || e);
   }
 }

package/src/transformers/rubrikk.transformer.ts

@@ -31,6 +31,7 @@ export class RubrikkTransformer {
     images: ImboImageResponseInterface[];
   }): Promise<RubrikkXmlItem> {
     const autodeId = toString(get(car, '_id', ''));
+
     return {
       //Common Fields
       ad__all_imageurls: this.getImagesLinks(autodeId, images),
@@ -124,8 +125,7 @@ export class RubrikkTransformer {
   }
 
   private getCarLink(car: DataSchemes.Car): string {
-    const autodeId = toString(get(car, '_id', ''));
-    return `https://${this.configService.config.imageUrl}/search/vehicle/${autodeId}?source=classifieds&medium=listing&campaign=focus`;
+    return `https://${this.configService.config.domain}/search/vehicle/${car._id}?source=classifieds&medium=listing&campaign=focus`;
   }
 
   private getImageLink(car: DataSchemes.Car): string {
@@ -138,7 +138,7 @@ export class RubrikkTransformer {
   private getImagesLinks(carId: string, images: ImboImageResponseInterface[]): string[] {
     if (isNotEmptyArray(images)) {
       return images.map((image: ImboImageResponseInterface) => {
-        return `https://${this.configService.config.baseImageUrl}/carimage/${carId}/${image.imageIdentifier}/large`;
+        return `${this.configService.config.baseImageUrl}/carimage/${carId}/${image.imageIdentifier}/large`;
       });
     }
     return [];