@bytebrand/export-cars 1.19.0 → 1.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -15,20 +15,21 @@
     "start:dev": "nest start --watch"
   },
   "dependencies": {
-    "@bytebrand/autode-request": "^1.14.17",
-    "@bytebrand/car-basic-data-scope": "^9.11.8",
-    "@bytebrand/car-description": "^1.12.1",
-    "@bytebrand/car-schema": "^3.14.7",
-    "@bytebrand/chunkable": "^5.15.19",
-    "@bytebrand/cronicle-helper": "^1.17.20",
-    "@bytebrand/i18n-dictionaries": "^1.4.3",
-    "@bytebrand/import-helper": "^0.42.8",
-    "@bytebrand/schema-tools": "^3.17.1",
+    "@bytebrand/autode-request": "^1.19.0",
+    "@bytebrand/car-basic-data-scope": "^9.11.22",
+    "@bytebrand/car-description": "^1.13.8",
+    "@bytebrand/car-schema": "^3.14.15",
+    "@bytebrand/chunkable": "^5.19.6",
+    "@bytebrand/cronicle-helper": "^1.21.6",
+    "@bytebrand/i18n-dictionaries": "^1.5.0",
+    "@bytebrand/import-helper": "^0.45.0",
+    "@bytebrand/schema-tools": "^3.18.8",
     "@bytebrand/zipper": "^2.2.0",
-    "@nestjs/common": "^9.0.0",
-    "@nestjs/core": "^9.0.0",
+    "@nestjs/cache-manager": "^2.1.0",
+    "@nestjs/common": "^10.2.7",
+    "@nestjs/core": "^10.2.7",
     "bottleneck": "^2.19.5",
-    "cache-manager": "^5.1.1",
+    "cache-manager": "^5.2.4",
     "csv-write-stream": "^2.0.0",
     "google-spreadsheet": "^3.3.0",
     "lodash": "^4.17.21",
@@ -38,14 +39,14 @@
     "vin-generator": "^1.0.1"
   },
   "devDependencies": {
-    "@nestjs/cli": "^9.0.0",
-    "@nestjs/schematics": "^9.0.0",
+    "@nestjs/cli": "^10.1.18",
+    "@nestjs/schematics": "^10.0.2",
     "@types/google-spreadsheet": "^3.3.0",
     "@types/inquirer": "^8.2.4",
     "@types/lodash": "^4.14.186",
-    "@types/node": "^16.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
+    "@types/node": "^16.18.58",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
@@ -55,10 +56,10 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.0.0",
     "tsconfig-paths": "4.1.0",
-    "typescript": "^4.7.4"
+    "typescript": "^5.2.2"
   },
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "ff779c8780b8b848e84973a151f3a2fdaf3059e8"
+  "gitHead": "e755a559caae3bd7088cfed459bb8f80e8adc012"
 }

package/src/app.module.ts

@@ -1,6 +1,7 @@
 import Bottleneck from 'bottleneck';
 
-import { CacheModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
 
 import {
   TransformerService,

package/src/constants/images.ts

@@ -0,0 +1,69 @@
+export const IMAGES_SORT_ORDER: any = {
+  ext_f_right: { order: 1 },
+  ext_f_cowl: { order: 2 },
+  ext_f_left: { order: 3 },
+  ext_l_main: { order: 4 },
+  ext_b_left: { order: 5 },
+  ext_b_main: { order: 6 },
+  ext_b_trunk: { order: 7 },
+  ext_b_right: { order: 8 },
+  ext_r_main: { order: 9 },
+  ext_f_main: { order: 10 },
+  ext_f_main_opened: { order: 11 },
+  ext_f_left_opened: { order: 12 },
+  ext_l_main_opened: { order: 13 },
+  ext_b_left_opened: { order: 14 },
+  ext_b_main_opened: { order: 15 },
+  ext_b_right_opened: { order: 16 },
+  ext_r_main_opened: { order: 17 },
+  ext_f_right_opened: { order: 18 },
+  conext_f_main: { order: 19 },
+  conext_f_left: { order: 20 },
+  conext_l_main: { order: 21 },
+  conext_b_left: { order: 22 },
+  conext_b_main: { order: 23 },
+  conext_b_right: { order: 24 },
+  conext_r_main: { order: 25 },
+  conext_f_right: { order: 26 },
+  ext_feat_engine: { order: 27 },
+  int_f_ipanel1: { order: 28 },
+  int_f_ipanel2: { order: 29 },
+  int_f_ipanel5: { order: 30 },
+  int_f_driverseats: { order: 31 },
+  int_f_assistantseats: { order: 32 },
+  int_b_rearseats: { order: 33 },
+  int_f_fandrseats: { order: 34 },
+  int_f_driverdashboard: { order: 35 },
+  int_f_doordriverside: { order: 36 },
+  int_f_stickshift: { order: 37 },
+  int_b_trunk: { order: 38 },
+  int_t_sunroof: { order: 39 },
+  int_t_panorama_sunroof: { order: 40 },
+  int_f_ipanel3: { order: 41 },
+  int_f_ipanel4: { order: 42 },
+  int_feat_seatheating: { order: 43 },
+  ext_feat_ledlights: { order: 44 },
+  ext_feat_cruisecontrol: { order: 45 },
+  int_feat_climatization: { order: 46 },
+  int_feat_bluetooth: { order: 47 },
+  ext_feat_rainsensor: { order: 48 },
+  ext_feat_rims: { order: 49 },
+  ext_feat_parkassistant: { order: 50 },
+  ext_feat_lightsensor: { order: 51 },
+  int_feat_handsfree: { order: 52 },
+  int_feat_headupdisplay: { order: 53 },
+  ext_feat_trafficsignrec: { order: 54 },
+  ext_feat_auxiliaryheating: { order: 55 },
+  ext_feat_laneassistant: { order: 56 },
+  int_feat_startstop: { order: 57 },
+  int_feat_breakassistant: { order: 58 },
+  ext_feat_nightassistant: { order: 59 },
+  dam_out_left: { order: 1000 },
+  dam_out_front: { order: 2000 },
+  dam_out_back: { order: 3000 },
+  dam_out_right: { order: 4000 },
+  dam_out_top: { order: 5000 },
+  gen_feature: { order: 6000 },
+  simple_temp: { order: 7000 },
+  simple_: { order: 8000 }
+};

package/src/exporters/as24.exporter.ts

@@ -40,9 +40,9 @@ export class As24Exporter implements Exporter {
         const data = chunkData[i];
         const ownerId = get(data.car, 'metaData.ownerId');
 
-        console.time(`Transform ${data.car._id}`);
+        // console.time(`Transform ${data.car._id}`);
         const transformedData = await as24Transformer.transform(data.car);
-        console.timeEnd(`Transform ${data.car._id}`);
+        // console.timeEnd(`Transform ${data.car._id}`);
         const transformedDataCSV = `${convertToCSV(transformedData)}\n`;
 
         const filename = `${this.configService.config.pathesConfig.localConvertedDirectory}/${ownerId}.${FileType.CSV}`

package/src/exporters/auto24.exporter.ts

@@ -35,9 +35,9 @@ export class Auto24Exporter implements Exporter {
       for (let i = 0; i < chunkData.length; i += 1) {
         const data = chunk.data[i];
         const { car, images } = data;
-        console.time(`Transform ${data.car._id}`);
+        // console.time(`Transform ${data.car._id}`);
         await xmlBuilder.addItem(await auto24Transformer.transform(car, images), 'Deutschland');
-        console.timeEnd(`Transform ${data.car._id}`);
+        // console.timeEnd(`Transform ${data.car._id}`);
         this.carService.counter.countCar(images);
       }
     });

package/src/exporters/autouncle.exporter.ts

@@ -38,9 +38,9 @@ export class AutouncleExporter implements Exporter {
       for (const data of chunk.data) {
         const ownerId = get(data.car, 'metaData.ownerId');
         const owner = await this.carService.getOwner(ownerId);
-        console.time(`Transform ${data.car._id}`);
+        // console.time(`Transform ${data.car._id}`);
         const car = await autouncleTransformer.transform({ owner, ...data });
-        console.timeEnd(`Transform ${data.car._id}`);
+        // console.timeEnd(`Transform ${data.car._id}`);
 
         await autouncleJsonBuilder.addItem(car, firstCar);
 

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

@@ -35,9 +35,9 @@ export class FacebookShopExporter implements Exporter {
       for (let i = 0; i < chunkData.length; i += 1) {
         const data = chunk.data[i];
 
-        console.time(`Transform ${data.car._id}`);
+        // console.time(`Transform ${data.car._id}`);
         const transformedCar = await facebookShopTransformer.transform(data);
-        console.timeEnd(`Transform ${data.car._id}`);
+        // console.timeEnd(`Transform ${data.car._id}`);
 
         await facebookShopXmkBuilder.addItem(transformedCar);
         this.carService.counter.countCar(data.images);

package/src/exporters/fb.exporter.ts

@@ -35,9 +35,9 @@ export class FbExporter implements Exporter {
       for (const data of chunkData) {
         const ownerId = get(data.car, 'metaData.ownerId', null);
         const owner = await this.carService.getOwner(ownerId);
-        console.time(`Transform ${data.car._id}`);
+        // console.time(`Transform ${data.car._id}`);
         const car = await fbTransformer.transform({ owner, ...data });
-        console.timeEnd(`Transform ${data.car._id}`);
+        // console.timeEnd(`Transform ${data.car._id}`);
 
         await fbXmlBuilder.addItem(car as FbXmlItem);
         this.carService.counter.countCar(data.images);

package/src/exporters/meinstadt.exporter.ts

@@ -36,9 +36,9 @@ export class MeinstadtExporter implements Exporter {
       chunk.data = chunk.data.filter(e => this.carService.filterCar(e, this.rulesService.rules));
 
       for (const data of chunk.data) {
-        console.time(`Transform ${data.car._id}`);
+        // console.time(`Transform ${data.car._id}`);
         const car = await meinstadtTransformer.transform(data);
-        console.timeEnd(`Transform ${data.car._id}`);
+        // console.timeEnd(`Transform ${data.car._id}`);
         await meinstadtJsonBuilder.addItem(car as MeinstadtJsonItem, firstCar);
         this.carService.counter.countCar(data.images);
 

package/src/exporters/mobile.exporter.ts

@@ -38,9 +38,9 @@ export class MobileExporter implements Exporter {
         for (let i = 0; i < chunk.data.length; i += 1) {
           const data = chunk.data[i];
           const { car, images } = data;
-          console.time(`Transform ${data.car._id}`);
+          // console.time(`Transform ${data.car._id}`);
           const transformedData = await mobileTransformer.transform(car, images);
-          console.timeEnd(`Transform ${data.car._id}`);
+          // console.timeEnd(`Transform ${data.car._id}`);
 
           await writeFile(fileName, Buffer.from(`${convertToCSV(transformedData)}\n`), { flag: 'a' });
 

package/src/exporters/modix.exporter.ts

@@ -40,9 +40,9 @@ export class ModixExporter implements Exporter {
         for (let i = 0; i < chunk.data.length; i += 1) {
           const data = chunk.data[i];
 
-          console.time(`Transform ${data.car._id}`);
+          // console.time(`Transform ${data.car._id}`);
           const transformedCar = await modixTransformer.transform(data, mappingBuilder.getMappingRules({ reversTransforming: true }));
-          console.timeEnd(`Transform ${data.car._id}`);
+          // console.timeEnd(`Transform ${data.car._id}`);
           await modixXmlBuilder.addItem(transformedCar);
 
           this.carService.counter.countCar(data.images);

package/src/exporters/ooyyo.exporter.ts

@@ -33,9 +33,9 @@ export class OoyyoExporter implements Exporter {
 
         for (let i = 0; i < chunkData.length; i += 1) {
           const { car, images } = chunkData[i];
-          console.time(`Transform ${car._id}`);
+          // console.time(`Transform ${car._id}`);
           await ooyyoXmlBuilder.addItem(await ooyyoTransformer.transform(car, images));
-          console.timeEnd(`Transform ${car._id}`);
+          // console.timeEnd(`Transform ${car._id}`);
           this.carService.counter.countCar(images);
         }
     });

package/src/exporters/rubrikk.exporter.ts

@@ -36,9 +36,9 @@ export class RubrikkExporter implements Exporter {
       for (let i = 0; i < chunkData.length; i += 1) {
         const data = chunkData[i];
 
-        console.time(`Transform ${data.car._id}`);
+        // console.time(`Transform ${data.car._id}`);
         const transformedCar = await rubrikkTransformer.transform(data);
-        console.timeEnd(`Transform ${data.car._id}`);
+        // console.timeEnd(`Transform ${data.car._id}`);
 
         await rubrikkXmlBuilder.addItem(transformedCar);
         this.carService.counter.countCar(data.images);

package/src/exporters/trovit.exporter.ts

@@ -35,9 +35,9 @@ export class TrovitExporter implements Exporter {
       for (let i = 0; i < chunk.data.length; i += 1) {
         const data = chunk.data[i];
 
-        console.time(`Transform ${data.car._id}`);
+        // console.time(`Transform ${data.car._id}`);
         const transformedCar = await trovitTransformer.transform(data);
-        console.timeEnd(`Transform ${data.car._id}`);
+        // console.timeEnd(`Transform ${data.car._id}`);
 
         await trovitXmlBuilder.addItem(transformedCar);
         this.carService.counter.countCar(data.images);

package/src/formats/modix-xml.builder.ts

@@ -139,7 +139,7 @@ export class ModixXmlBuilder extends XMLBuilderBase {
     let item = `\n<media>\n<images url="${imageData.url}/">\n`;
 
     imageData.imageList.forEach(image => {
-      item += `<image name="${image.atributes?.name}" />\n`;
+      item += `<image name="${image.atributes?.name}" position="${image.atributes?.position}" />\n`;
     });
 
     item += '\n</images>\n</media>';

package/src/services/car.service.ts

@@ -1,4 +1,5 @@
-import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Inject, Injectable } from '@nestjs/common';
 import { getMonthsDiff } from '../utils/date-time.utils';
 import { DataSchemes } from '@bytebrand/car-schema';
 import { Cache } from 'cache-manager';

package/src/services/images.service.ts

@@ -14,13 +14,75 @@ import { ImageType } from '../enums';
 
 @Injectable()
 export class ImagesService {
+  private readonly IMAGES_SORT_ORDER: { [imageCode: string]: number } = {
+    ext_f_right: 1,
+    ext_f_cowl: 2,
+    ext_f_left: 3,
+    ext_l_main: 4,
+    ext_b_left: 5,
+    ext_b_main: 6,
+    ext_b_trunk: 7,
+    ext_b_right: 8,
+    ext_r_main: 9,
+    ext_f_main: 10,
+    ext_f_main_opened: 11,
+    ext_f_left_opened: 12,
+    ext_l_main_opened: 13,
+    ext_b_left_opened: 14,
+    ext_b_main_opened: 15,
+    ext_b_right_opened: 16,
+    ext_r_main_opened: 17,
+    ext_f_right_opened: 18,
+    conext_f_main: 19,
+    conext_f_left: 20,
+    conext_l_main: 21,
+    conext_b_left: 22,
+    conext_b_main: 23,
+    conext_b_right: 24,
+    conext_r_main: 25,
+    conext_f_right: 26,
+    ext_feat_engine: 27,
+    int_f_ipanel1: 28,
+    int_f_ipanel2: 29,
+    int_f_ipanel5: 30,
+    int_f_driverseats: 31,
+    int_f_assistantseats: 32,
+    int_b_rearseats: 33,
+    int_f_fandrseats: 34,
+    int_f_driverdashboard: 35,
+    int_f_doordriverside: 36,
+    int_f_stickshift: 37,
+    int_b_trunk: 38,
+    int_t_sunroof: 39,
+    int_t_panorama_sunroof: 40,
+    int_f_ipanel3: 41,
+    int_f_ipanel4: 42,
+    int_feat_seatheating: 43,
+    ext_feat_ledlights: 44,
+    ext_feat_cruisecontrol: 45,
+    int_feat_climatization: 46,
+    int_feat_bluetooth: 47,
+    ext_feat_rainsensor: 48,
+    ext_feat_rims: 49,
+    ext_feat_parkassistant: 50,
+    ext_feat_lightsensor: 51,
+    int_feat_handsfree: 52,
+    int_feat_headupdisplay: 53,
+    ext_feat_trafficsignrec: 54,
+    ext_feat_auxiliaryheating: 55,
+    ext_feat_laneassistant: 56,
+    int_feat_startstop: 57,
+    int_feat_breakassistant: 58,
+    ext_feat_nightassistant: 59,
+  };
+
   private readonly DEFAULT_IMAGES = [
     'https://images.auto.de/carimage/noimage/7pNvWELuWhZX/large-cached.jpeg',
     'https://images.auto.de/carimage/noimage/GvyXmrpaf1D6/large-cached.jpeg',
     'https://images.auto.de/carimage/noimage/pFyfBsqBHEso/large-cached.jpeg',
   ];
 
-  constructor(private readonly configService: ConfigService, private readonly userService: UserService) {}
+  constructor(private readonly configService: ConfigService, private readonly userService: UserService) { }
 
   async getImages(
     car: DataSchemes.Car,
@@ -44,7 +106,7 @@ export class ImagesService {
       return this.DEFAULT_IMAGES;
     }
 
-    const sortedImages = this.sortImages(images, car);
+    const sortedImages = this.sortImages(images);
     const transformedImages = this.generateImageLinks(sortedImages, get(car, '_id'));
 
     if (!ignoreDefImages && transformedImages.length < 17) {
@@ -67,7 +129,7 @@ export class ImagesService {
   ): Promise<string[]> {
     const imageUrl = this.configService.config.marketingImageUrl;
 
-    const transformedImages = this.transformImagesArrayIntoObject(images);
+    const transformedImages = this.transformImagesArrayIntoObject(this.sortImages(images));
     const config = await this.userService.getMarketingImageConfig(this.configService.config.marketingImageConfigId);
     const marketingImageConfigs = config.marketingImages.map(i => ({ marketingImageCodes: i.imageCodes }));
 
@@ -91,13 +153,14 @@ export class ImagesService {
     return imageUrls;
   }
 
-  private transformImagesArrayIntoObject(images: ImboImageResponseInterface[]) {
-    const result: { [imageCode: string]: string } = {};
-    images.forEach(image => {
+  private transformImagesArrayIntoObject(images: ImboImageResponseInterface[]): { [imageCode: string]: string } {
+    return images.reduce((result, image) => {
       const imageCode = image?.imageCodePredicted?.split('-')[0];
-      result[imageCode] = image.imageIdentifier;
-    });
-    return result;
+      if (imageCode) {
+        result[imageCode] = image.imageIdentifier;
+      }
+      return result;
+    }, {});
   }
 
   protected getChannelPath(imageUrl: string, carId: string): string {
@@ -114,31 +177,14 @@ export class ImagesService {
     return `${this.getChannelPath(imageUrl, carId)}/${channelCode.replace(/ /g, '-')}-${imageId}.${imageExtension}`;
   }
 
-  private sortImages(images: ImboImageResponseInterface[], car: DataSchemes.Car): ImboImageResponseInterface[] {
-    const firstImageId = get(car, 'metaData.mainImageId', null);
-    const secondImageId = get(car, 'metaData.secImageId', null);
-    const thirdImageId = get(car, 'metaData.thirdImageId', null);
-
-    if (firstImageId) {
-      images.forEach((image, index) => {
-        if (firstImageId === image?.imageIdentifier) {
-          const tmp = images[index];
-          images[index] = images[0];
-          images[0] = tmp;
-        }
-        if (secondImageId === image?.imageIdentifier) {
-          const tmp = images[index];
-          images[index] = images[1];
-          images[1] = tmp;
-        }
-        if (thirdImageId === image?.imageIdentifier) {
-          const tmp = images[index];
-          images[index] = images[2];
-          images[2] = tmp;
-        }
-      });
-      return images.filter(i => i); // sometimes thirdImageId exists but image is not
-    }
-    return images;
+  sortImages(images: ImboImageResponseInterface[]): ImboImageResponseInterface[] {
+    return images.sort((a, b) => {
+      const imageCodePredictedA = a.imageCodePredicted.includes('-') ? a.imageCodePredicted.split('-')[1] : a.imageCodePredicted;
+      const imageCodePredictedB = b.imageCodePredicted.includes('-') ? b.imageCodePredicted.split('-')[1] : b.imageCodePredicted;
+      const orderA = this.IMAGES_SORT_ORDER[imageCodePredictedA] || 100;
+      const orderB = this.IMAGES_SORT_ORDER[imageCodePredictedB] || 100;
+  
+      return orderA - orderB;
+    });
   }
 }

package/src/services/user.service.ts

@@ -1,4 +1,5 @@
-import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Inject, Injectable } from '@nestjs/common';
 
 import { MarketingImageConfigInterface, MarketingImageConfigsInterface } from '@bytebrand/autode-request';
 import { CronicleUtils } from '@bytebrand/cronicle-helper';

package/src/transformers/fb.transformer.ts

@@ -16,7 +16,8 @@ import {
   truncate,
 } from 'lodash';
 
-import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Inject, Injectable } from '@nestjs/common';
 
 import { DePostalCodesEntryInterface } from '@bytebrand/car-basic-data-scope/dist/interfaces/DePostalCodesInterface';
 import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictionaries';
@@ -70,12 +71,12 @@ export class FbTransformer {
     const autodeId = toString(get(car, '_id', ''));
     const year = this.getYear(car);
     const dealerInfo = this.getDealerItems(car);
-    console.time(`Address ${car._id}`);
+    // console.time(`Address ${car._id}`);
     const address = await this.getAddress(car, owner);
-    console.timeEnd(`Address ${car._id}`);
-    console.time(`Images ${car._id}`);
+    // console.timeEnd(`Address ${car._id}`);
+    // console.time(`Images ${car._id}`);
     const image_links = await this.imagesService.getImages(car, images, ImageType.marketing, false);
-    console.timeEnd(`Images ${car._id}`);
+    // console.timeEnd(`Images ${car._id}`);
     const transformedImages = image_links.map(el => {
       return { url: el };
     });

package/src/transformers/modix.transformer.ts

@@ -11,7 +11,7 @@ import { DataSchemes } from '@bytebrand/car-schema';
 
 import { imageItem, IAtributeWrapItem, ModixXmlItem } from '../interfaces';
 import { isNotEmptyArray, isValidVin, xmlStringReplacer } from '../utils';
-import { ConfigService } from '../services';
+import { ConfigService, ImagesService } from '../services';
 import {
   BodyColorList,
   VehicleClassList,
@@ -25,7 +25,7 @@ import {
 
 @Injectable()
 export class ModixTransformer {
-  constructor(private readonly configService: ConfigService) {}
+  constructor(private readonly configService: ConfigService, private readonly imagesService: ImagesService) {}
 
   async transform(
     chunkData: { car: DataSchemes.Car; images: ImboImageResponseInterface[] },
@@ -205,7 +205,7 @@ export class ModixTransformer {
     const imageList: IAtributeWrapItem[] = [];
 
     if (isNotEmptyArray(images)) {
-      images.forEach((image: ImboImageResponseInterface, index) => {
+      this.imagesService.sortImages(images).forEach((image: ImboImageResponseInterface, index) => {
         imageList.push({ value: null, atributes: { name: `${image.imageIdentifier}/large`, position: index + 1 } });
       });
     }