@bytebrand/export-cars 1.10.7 → 1.10.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.10.7",
+  "version": "1.10.9",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "dcba2bbf1e165d57f7d705f9f5ae8ead15290c9e"
+  "gitHead": "656a154e9410d0bccd17b7e9070b179747fd6e4f"
 }

package/src/exporters/meinstadt.exporter.ts

@@ -33,10 +33,10 @@ export class MeinstadtExporter 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 car = await meinstadtTransformer.transform({ ...data });
+        const car = await meinstadtTransformer.transform(data);
         await meinstadtJsonBuilder.addItem(car as MeinstadtJsonItem, firstCar);
         this.carService.counter.countCar(data.images);
 

package/src/interfaces/export-item.interface.ts

@@ -97,7 +97,7 @@ export interface MeinstadtJsonItem {
   sellerType: string;
   usageState: string;
   imagesCount: number;
-  images: string;
+  images: string[];
   power: number;
   'transmissionType/transmission': string;
   'customerType/sellerType': string;

package/src/services/images.service.ts

@@ -14,6 +14,12 @@ import { ImageType } from '../enums';
 
 @Injectable()
 export class ImagesService {
+  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) { }
 
   async getImages(
@@ -24,63 +30,22 @@ export class ImagesService {
     if (imageType === ImageType.default) {
       return this.getDefaultImages(car, images);
     } else {
-      const carId = toString(get(car, '_id', ''));
-      return await this.getMarketingImages(images, carId);
+      return await this.getMarketingImages(car, images);
     }
   }
 
   getDefaultImages(car: DataSchemes.Car, images: ImboImageResponseInterface[]): Array<string> {
-    const defaultImages = [
-      '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/gY1zF8PXzH2W/large-cached.jpeg',
-      'https://images.auto.de/carimage/noimage/pFyfBsqBHEso/large-cached.jpeg',
-    ];
-
     if (!isNotEmptyArray(images)) {
-      return defaultImages;
-    }
-
-    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) {
-      images.forEach((image, index) => {
-        if (secondImageId === image?.imageIdentifier) {
-          const tmp = images[index];
-          images[index] = images[1];
-          images[1] = tmp;
-        }
-      });
-    }
-
-    if (thirdImageId) {
-      images.forEach((image, index) => {
-        if (thirdImageId === image?.imageIdentifier) {
-          const tmp = images[index];
-          images[index] = images[2];
-          images[2] = tmp;
-        }
-      });
+      return this.DEFAULT_IMAGES;
     }
 
-    const carId = toString(get(car, '_id', ''));
+    this.sortImages(images, car);
+    const transformedImages = this.generateImageLinks(images, get(car, '_id'));
 
-    const transformedImages = this.generateImageLinks(images.filter(i => i), carId);
     if (transformedImages.length < 17) {
-      transformedImages.push(...defaultImages);
+      transformedImages.push(...this.DEFAULT_IMAGES);
     }
+
     return transformedImages;
   }
 
@@ -90,40 +55,34 @@ export class ImagesService {
     });
   }
 
-  async getMarketingImages(images: any, carId: string): Promise<string[]> {
+  async getMarketingImages(car: DataSchemes.Car, images: ImboImageResponseInterface[]): Promise<string[]> {
     const imageUrl = this.configService.config.marketingImageUrl;
-    const transformedImages = this.transformImagesArrayIntoObject(images);
 
+    const transformedImages = this.transformImagesArrayIntoObject(images);
     const config = await this.userService.getMarketingImageConfig(this.configService.config.marketingImageConfigId);
     const marketingImageConfigs = config.marketingImages.map(i => ({ marketingImageCodes: i.imageCodes }));
 
-    const defImages = [
-      '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/gY1zF8PXzH2W/large-cached.jpeg',
-      'https://images.auto.de/carimage/noimage/pFyfBsqBHEso/large-cached.jpeg',
-    ];
-
     const imageUrls = [];
-
     for (let i = 0; i < marketingImageConfigs.length; i++) {
       const marketingImage = marketingImageConfigs[i];
       for (let i = 0; i < marketingImage.marketingImageCodes.length; i++) {
         const imageCode = marketingImage.marketingImageCodes[i];
         const imageId = transformedImages[imageCode];
         if (imageId) {
-          imageUrls.push(this.getImagePathWithExtenstion(imageUrl, carId, imageId, config));
+          imageUrls.push(this.getImagePathWithExtension(imageUrl, get(car, '_id', ''), imageId, config));
           break;
         }
       }
     }
+
     if (imageUrls.length < FB_MAX_IMAGE_COUNT_FOR_DEAFULT) {
-      imageUrls.push(...defImages);
+      imageUrls.push(...this.DEFAULT_IMAGES);
     }
+
     return imageUrls;
   }
 
-  private transformImagesArrayIntoObject(images: { [imageCode: string]: string }[]) {
+  private transformImagesArrayIntoObject(images: ImboImageResponseInterface[]) {
     const result: { [imageCode: string]: string } = {};
     images.forEach(image => {
       const imageCode = image.imageCodePredicted.split('-')[0];
@@ -136,7 +95,7 @@ export class ImagesService {
     return `${imageUrl}/${[carId[0], carId[1], carId[2], carId].join('/')}`;
   }
 
-  protected getImagePathWithExtenstion(
+  protected getImagePathWithExtension(
     imageUrl: string,
     carId: string,
     imageId: string,
@@ -145,4 +104,31 @@ export class ImagesService {
     const { channelCode, imageExtension } = config;
     return `${this.getChannelPath(imageUrl, carId)}/${channelCode.replace(/ /g, '-')}-${imageId}.${imageExtension}`;
   }
+
+  private sortImages(images: ImboImageResponseInterface[], car: DataSchemes.Car): void {
+    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;
+        }
+      });
+      images.filter(i => i); // sometimes thirdImageId exists but image is not
+    }
+  }
 }

package/src/transformers/facebook-shop.transformer.ts

@@ -56,11 +56,9 @@ export class FacebookShopTransformer {
   }
 
   private getTitle(car: DataSchemes.Car): string {
-    const year = toString(get(car, 'mainData.constructionYear', ''));
     const make = toString(get(car, 'mainData.make', ''));
     const model = toString(get(car, 'mainData.model', ''));
-    const subModel = toString(get(car, 'mainData.subModel', ''));
-    return trim(escape(join([year, make, model, subModel], ' ')));
+    return trim(escape(join([make, model], ' ')));
   }
 
   private getCondition(car: DataSchemes.Car): string {

package/src/transformers/meinstadt.transformer.ts

@@ -1,27 +1,30 @@
 import { get, toString } from 'lodash';
-import { DataSchemes } from '@bytebrand/car-schema';
 
-import { de } from '@bytebrand/i18n-dictionaries';
 import { Injectable } from '@nestjs/common';
-import { ConfigService } from '../services';
+
+import { ImboImageResponseInterface } from '@bytebrand/chunkable';
+import { DataSchemes } from '@bytebrand/car-schema';
+import { de } from '@bytebrand/i18n-dictionaries';
+
+import { ConfigService, ImagesService } from '../services';
 import { MeinstadtJsonItem } from '../interfaces';
 
+
 @Injectable()
 export class MeinstadtTransformer {
-  constructor(private configService: ConfigService) {}
+  constructor(private configService: ConfigService, private readonly imageService: ImagesService) {}
+
+  async transform({ car, images }: { car: DataSchemes.Car, images: ImboImageResponseInterface[] }): Promise<Partial<MeinstadtJsonItem>> {
+    const carImages = await this.imageService.getImages(car, images, this.configService.config.imageType);
+
+    const carId = toString(get(car, '_id', null));
 
-  async transform({ car }: { car: DataSchemes.Car }): Promise<Partial<MeinstadtJsonItem>> {
-    const autodeId = toString(get(car, '_id', null));
-    const imageId = get(car, 'metaData.mainImageId', null);
-    const imageUrl = imageId
-      ? `https://images.auto.de/carimage/${car._id}/${imageId}/large-cached.webp`
-      : 'https://images.auto.de/carimage/noimage/7pNvWELuWhZX/large-cached.jpeg';
     return {
       id: get(car, 'metaData.vehicleId', null),
       make: get(car, 'mainData.make', null),
       model: get(car, 'mainData.model', null),
       cpc: get(this.configService.config, 'cpc', '0.08'),
-      listingUrl: `https://www.${this.configService.config.domain}/search/vehicle/${autodeId}?source=classifieds&medium=listing&campaign=meinestadt`,
+      listingUrl: `https://www.${this.configService.config.domain}/search/vehicle/${carId}?source=classifieds&medium=listing&campaign=meinestadt`,
       title: this.getTitle(car),
       accidentFree: get(car, 'mainData.accidentDamaged', null),
       mileage: get(car, 'mainData.mileage', null),
@@ -41,10 +44,10 @@ export class MeinstadtTransformer {
       emissionSticker: this.translate(get(car, 'environmentEmissions.emissionSticker', null)),
       fuelType: this.translate(get(car, 'consumption.fuel', null)),
       'transmissionType/transmission': this.translate(get(car, 'driveSuspension.gearbox', null)),
-      imagesCount: get(car, 'metaData.imagesCount', null),
+      imagesCount: carImages.length,
       'customerType/sellerType': 'Händler',
       usageState: this.translate(this.getUsageState(car)),
-      images: imageUrl,
+      images: carImages,
     };
   }
 

package/src/transformers/mobile.transformer.ts

@@ -1,13 +1,17 @@
+import { get, isEmpty, isNil, set, toString, upperFirst } from 'lodash';
+
 import { Injectable } from '@nestjs/common';
+
+import { CarDescriptionFactory, DescriptionTypeEnum } from '@bytebrand/car-description';
+import { ImboImageResponseInterface } from '@bytebrand/chunkable';
+import { LoggerService } from '@bytebrand/cronicle-helper';
 import { DataSchemes } from '@bytebrand/car-schema';
-import { get, isEmpty, isNil, set, toString, upperFirst } from 'lodash';
-import { MappingService } from '../services/mapping.service';
+
+import { MappingService, UserService, ImagesService } from '../services';
 import { MappingRules } from '../interfaces/mapping-rules.interface';
-import { UserService } from '../services/user.service';
-import { CarDescriptionFactory, DescriptionTypeEnum } from '@bytebrand/car-description';
-import { ConfigService } from '../services/config.service';
 import { isNotEmptyArray } from '../utils/validator.utils';
-import { LoggerService } from '@bytebrand/cronicle-helper';
+import { ConfigService } from '../services';
+
 
 const vinGenerator = require('vin-generator');
 
@@ -19,9 +23,10 @@ export class MobileTransformer {
     private mappingService: MappingService,
     private userService: UserService,
     private configService: ConfigService,
-  ) {}
+    private imagesService: ImagesService,
+  ) { }
 
-  async transform(carData: DataSchemes.Car, images: unknown[]): Promise<unknown> {
+  async transform(carData: DataSchemes.Car, images: ImboImageResponseInterface[]): Promise<unknown> {
     this.currentCar = carData;
     const transformedCarData = {};
     const rules = await this.mappingService.getRules();
@@ -347,17 +352,11 @@ export class MobileTransformer {
     return `https://www.${this.configService.config.domain}${car._id}?source=classifieds&medium=listing&campaign=${this.configService.config.campaign}`;
   }
 
-  private getImages(car: DataSchemes.Car, images: unknown[]): string | null {
-    let res;
-    try {
-      res = this.getImagesField(car._id, get(car, 'metaData.mainImageId', null), images);
-    } catch (e) {
-      LoggerService.error(e);
-      throw e;
-    }
+  private async getImages(car: DataSchemes.Car, images): Promise<string | null> {
+    const transformedImages = await this.imagesService.getImages(car, images, this.configService.config.imageType);
     let imagesAsALine;
-    if (isNotEmptyArray(res)) {
-      imagesAsALine = res.map((el: { url: string }) => el.url).join(';');
+    if (isNotEmptyArray(transformedImages)) {
+      imagesAsALine = transformedImages.map((el: string) => el).join(';');
     }
     return imagesAsALine || null;
   }
@@ -474,32 +473,4 @@ export class MobileTransformer {
     }
     return mileage.toString();
   }
-
-  private getImagesField(carId: string, mainImageId: string, images: unknown[]): { url: string }[] {
-    const defImages = [
-      { url: 'https://images.auto.de/carimage/noimage/7pNvWELuWhZX/large-cached.jpeg' },
-      { url: 'https://images.auto.de/carimage/noimage/GvyXmrpaf1D6/large-cached.jpeg' },
-      { url: 'https://images.auto.de/carimage/noimage/gY1zF8PXzH2W/large-cached.jpeg' },
-      { url: 'https://images.auto.de/carimage/noimage/pFyfBsqBHEso/large-cached.jpeg' },
-    ];
-    if (isNotEmptyArray(images)) {
-      return images.sort(this.setMainImageFirst(mainImageId)).map((image: any) => {
-        return { url: this.buildLargeImageUrl(carId, image.imageIdentifier) };
-      });
-    }
-    return defImages;
-  }
-
-  private buildLargeImageUrl(carId: string, imageId: string): string {
-    const format = this.configService.config.campaign === 'eauto' ? 'jpeg' : 'webp';
-    return `${this.configService.config.imageUrl}/${carId}/${imageId}/large-cached.${format}`;
-  }
-
-  private setMainImageFirst(mainImageId: string): (current: any, next: any) => number {
-    return (current: any, next: any): number => {
-      if (current.imageIdentifier === mainImageId) return -1;
-      if (next.imageIdentifier === mainImageId) return 1;
-      return 0;
-    };
-  }
 }

package/src/transformers/ooyyo.transformer.ts

@@ -17,7 +17,7 @@ export class OoyyoTransformer {
   }
 
   async transform(car: DataSchemes.Car, imboImages: ImboImageResponseInterface[]): Promise<OoyyoXmlItem> {
-    const autodeid = toString(get(car, '_id', ''));
+    const carId = toString(get(car, '_id', ''));
     const creationDate = get(car, 'metaData.creationDate') as number;
     const constructionYear = get(car, 'mainData.constructionYear') as number;
     const firstRegistration = get(car, 'mainData.firstRegistration') as number;
@@ -29,7 +29,7 @@ export class OoyyoTransformer {
     }
 
     return {
-      url: `https://www.${this.configService.config.domain}/search/vehicle/${autodeid}?source=classifieds&medium=listing&campaign=ooyyo`,
+      url: `https://www.${this.configService.config.domain}/search/vehicle/${carId}?source=classifieds&medium=listing&campaign=ooyyo`,
       title: this.getTitle(car),
       content: trim(toString(get(car, 'offer.offerDescription', ''))),
       price: toString(get(car, 'price.currentSalesPrice', '')),