@bytebrand/export-cars 1.10.8 → 1.10.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.10.8",
+  "version": "1.10.10",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "26ce620428ff47711dc8142af5da04b9ddf380f0"
+  "gitHead": "45f8d5dbc712cd3f62ce8f4ee068ae5322930e10"
 }

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

@@ -39,8 +39,8 @@ export class ImagesService {
       return this.DEFAULT_IMAGES;
     }
 
-    this.sortImages(images, car);
-    const transformedImages = this.generateImageLinks(images, get(car, '_id'));
+    const sortedImages = this.sortImages(images, car);
+    const transformedImages = this.generateImageLinks(sortedImages, get(car, '_id'));
 
     if (transformedImages.length < 17) {
       transformedImages.push(...this.DEFAULT_IMAGES);
@@ -105,7 +105,7 @@ export class ImagesService {
     return `${this.getChannelPath(imageUrl, carId)}/${channelCode.replace(/ /g, '-')}-${imageId}.${imageExtension}`;
   }
 
-  private sortImages(images: ImboImageResponseInterface[], car: DataSchemes.Car): void {
+  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);
@@ -128,7 +128,8 @@ export class ImagesService {
           images[2] = tmp;
         }
       });
-      images.filter(i => i); // sometimes thirdImageId exists but image is not
+      return images.filter(i => i); // sometimes thirdImageId exists but image is not
     }
+    return images;
   }
 }

package/src/transformers/as24.transformer.ts

@@ -6,6 +6,9 @@ import { MappingRules } from '../interfaces/mapping-rules.interface';
 import { Injectable } from '@nestjs/common';
 import { LoggerService } from '@bytebrand/cronicle-helper';
 
+  /**
+   * @deprecated 02.03.2022
+   */
 @Injectable()
 export class As24Transformer {
   private currentCar: DataSchemes.Car;

package/src/transformers/by-owner.transformer.ts

@@ -7,6 +7,9 @@ import * as moment from 'moment';
 
 type transformFn = (car: DataSchemes.Car, translator: TranslatorExtended) => string;
 
+/**
+ * @deprecated 02.03.2022
+ */
 @Injectable()
 export class ByOwnerTransformer {
   private readonly translator: TranslatorExtended = new TranslatorExtended({

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

@@ -30,7 +30,6 @@ export class FacebookShopTransformer {
     images: ImboImageResponseInterface[];
   }): Promise<FacebookShopItem> {
     const imageLinks = await this.imageService.getImages(car, images, this.configService.config.imageType);
-    images.length && console.log(imageLinks, this.configService.config.imageType);
 
     return {
       id: { value: get(car, 'metaData.vehicleId'), isGoogle: true },

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,12 +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, UserService, ImagesService } from '../services';
 import { MappingRules } from '../interfaces/mapping-rules.interface';
-import { CarDescriptionFactory, DescriptionTypeEnum } from '@bytebrand/car-description';
-import { ConfigService } from '../services';
 import { isNotEmptyArray } from '../utils/validator.utils';
-import { LoggerService } from '@bytebrand/cronicle-helper';
+import { ConfigService } from '../services';
+
 
 const vinGenerator = require('vin-generator');
 
@@ -19,9 +24,9 @@ export class MobileTransformer {
     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();

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', '')),