@bytebrand/export-cars 1.9.0 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -66,5 +66,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "16478e91b8dadf07e870437edeef4a0e82ca6627"
+  "gitHead": "37593dea01bef934aa28dee2dfc50c29fad9aeef"
 }

package/src/configs/alleskralle.config.ts

@@ -1,12 +1,13 @@
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
-import { ExportType, FileType } from '../enums';
+import { ExportType, FileType, ImageType } from '../enums';
 
 export class AlleskralleConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.campaign = ExportType.ALLESKRALLE;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.ALLESKRALLE}-export`;
+    this.imageType = ImageType.default;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.ALLESKRALLE}.${FileType.XML}`,
     ];

package/src/configs/as24.config.ts

@@ -1,4 +1,4 @@
-import { ExportType } from 'src/enums';
+import { ExportType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -6,6 +6,7 @@ export class As24Config extends Config {
   constructor(params: Params) {
     super(params);
     this.campaign = ExportType.AS24;
+    this.imageType = ImageType.default;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.AS24}-export`;
     this.mappingSpreadsheetTitle = 'mobile';
   }

package/src/configs/auto24.config.ts

@@ -1,11 +1,12 @@
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
-import { ExportType, FileType } from '../enums';
+import { ExportType, FileType, ImageType } from '../enums';
 
 export class Auto24Config extends Config {
   constructor(params: Params) {
     super(params);
     this.campaign = ExportType.AUTO24;
+    this.imageType = ImageType.default;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.AUTO24}-export`;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.AUTO24}.${FileType.XML}`,

package/src/configs/autoboerse.config.ts

@@ -1,4 +1,4 @@
-import { ExportType, FileType } from 'src/enums';
+import { ExportType, FileType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -7,7 +7,7 @@ export class AutoboerseConfig extends Config {
     super(params);
     this.campaign = ExportType.AUTOBOERSE;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.AUTOBOERSE}-export`;
-
+    this.imageType = ImageType.default;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.AUTOBOERSE}.${FileType.XML}`,
     ];

package/src/configs/autouncle.config.ts

@@ -1,4 +1,4 @@
-import { ExportType, FileType } from 'src/enums';
+import { ExportType, FileType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -6,6 +6,7 @@ export class AutouncleConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.AUTOUNCLE}-export`;
+    this.imageType = ImageType.default;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.AUTOUNCLE}.${FileType.JSON}`,
     ];

package/src/configs/by-owner.config.ts

@@ -1,13 +1,14 @@
-import { ExportType } from 'src/enums';
+import { ExportType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
 /**
-* @deprecated
-*/
+ * @deprecated
+ */
 export class ByOwnerConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.BY_OWNER}-export`;
+    this.imageType = ImageType.default;
   }
 }

package/src/configs/config.ts

@@ -5,6 +5,7 @@ export class Config {
   apikey: string;
   campaign: string;
   userActionsUrl: string;
+  marketingImageId: number;
   upaUrl: string;
   imboUrl: string;
   imageUrl: string;
@@ -40,6 +41,7 @@ export class Config {
       remoteDirectory: 'import_dev',
       imageUrl: 'https://images.autode-dev.de/cache_test',
       baseImageUrl: 'https://images.autode-dev.de',
+      marketingImageId: 8,
     },
     [Environment.DEVELOP]: {
       domain: 'autode-dev.de',
@@ -48,6 +50,7 @@ export class Config {
       remoteDirectory: 'import_dev',
       imageUrl: 'https://images.autode-dev.de/cache_test',
       baseImageUrl: 'https://images.autode-dev.de',
+      marketingImageId: 8,
     },
     [Environment.PRODUCTION]: {
       domain: 'auto.de',
@@ -56,6 +59,7 @@ export class Config {
       remoteDirectory: 'import',
       imageUrl: 'https://images.auto.de/generated_images',
       baseImageUrl: 'https://images.auto.de',
+      marketingImageId: 1,
     },
   };
 
@@ -65,6 +69,7 @@ export class Config {
     this.cpc = params.cpc;
     this.criteoMarketingImagesConfigId = this.environmentConfig[params.environment].criteoMarketingImagesConfigId;
     this.domain = this.environmentConfig[params.environment].domain;
+    this.marketingImageId = this.environmentConfig[params.environment].marketingImageId;
     this.baseImageUrl = this.environmentConfig[params.environment].baseImageUrl;
     this.mappingSpreadsheetId = '147qz9sTgs1wi13ua8YKa0IgfxAn1X_qH6LkGnAnzeyY';
     this.dealersSpreadsheetId = '1gWrcA-uRTpna1h66Mbe2Y7NA0tIhlUaQXBcS4a_UzOw';

package/src/configs/dasparking.config.ts

@@ -1,12 +1,13 @@
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
-import { ExportType, FileType } from '../enums';
+import { ExportType, FileType, ImageType } from '../enums';
 
 export class DasparkingConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.DASPARKING}-export`;
     this.campaign = ExportType.DASPARKING;
+    this.imageType = ImageType.default;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.DASPARKING}.${FileType.XML}`,
     ];

package/src/configs/eauto.config.ts

@@ -1,4 +1,4 @@
-import { ExportType, FileType } from 'src/enums';
+import { ExportType, FileType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -9,8 +9,7 @@ export class EautoConfig extends Config {
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.EAUTO}-export`;
     this.imageUrl = `https://images.${this.domain}/carimage`;
     this.mappingSpreadsheetTitle = 'mobile_yescar';
-    this.outputFiles = [
-      `${this.pathesConfig.localConvertedDirectory}/416.${FileType.CSV}`
-    ]
+    this.imageType = ImageType.default;
+    this.outputFiles = [`${this.pathesConfig.localConvertedDirectory}/416.${FileType.CSV}`];
   }
 }

package/src/configs/facebook-shop.config.ts

@@ -1,12 +1,13 @@
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
-import { ExportType, FileType } from '../enums';
+import { ExportType, FileType, ImageType } from '../enums';
 
 export class FacebookShopConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.FACEBOOK_SHOP}-export`;
     this.imageUrl = this.environmentConfig[params.environment].baseImageUrl;
+    this.imageType = ImageType.marketing;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.FACEBOOK_SHOP}.${FileType.XML}`,
     ];

package/src/configs/fb.config.ts

@@ -1,4 +1,4 @@
-import { ExportType, FileType } from 'src/enums';
+import { ExportType, FileType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -7,8 +7,9 @@ export class FbConfig extends Config {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.FB}-export`;
     this.imageUrl = this.environmentConfig[params.environment].imageUrl;
+    this.imageType = ImageType.marketing;
     this.outputFiles = [
-      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.FB}.${FileType.XML}`
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.FB}.${FileType.XML}`,
     ];
   }
 }

package/src/configs/google.config.ts

@@ -1,4 +1,4 @@
-import { ExportType, FileType } from 'src/enums';
+import { ExportType, FileType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -6,8 +6,9 @@ export class GoogleConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.GOOGLE}-export`;
+    this.imageType = ImageType.default;
     this.outputFiles = [
-      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.GOOGLE}.${FileType.XML}`
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.GOOGLE}.${FileType.XML}`,
     ];
   }
 }

package/src/configs/marktde.config.ts

@@ -1,4 +1,4 @@
-import { ExportType, FileType } from 'src/enums';
+import { ExportType, FileType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -9,9 +9,10 @@ export class MarktdeConfig extends Config {
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.MARKTDE}-export`;
     this.imageUrl = `https://images.${this.domain}/carimage`;
     this.mappingSpreadsheetTitle = 'mobile_yescar';
+    this.imageType = ImageType.default;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.MARKTDE}.${FileType.CSV}`,
-      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.MARKTDE}.${FileType.ZIP}`
-    ]
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.MARKTDE}.${FileType.ZIP}`,
+    ];
   }
 }

package/src/configs/meinstadt.config.ts

@@ -1,11 +1,12 @@
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
-import { ExportType, FileType } from '../enums';
+import { ExportType, FileType, ImageType } from '../enums';
 
 export class MeinstadtConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.MEINSTADT}-export`;
+    this.imageType = ImageType.default;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.MEINSTADT}.${FileType.JSON}`,
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.MEINSTADT}.${FileType.ZIP}`,

package/src/configs/yescar.config.ts

@@ -1,4 +1,4 @@
-import { ExportType } from 'src/enums';
+import { ExportType, ImageType } from 'src/enums';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -12,5 +12,6 @@ export class YescarConfig extends Config {
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.YESCAR}-export`;
     this.imageUrl = `https://images.${this.domain}/carimage`;
     this.mappingSpreadsheetTitle = 'mobile_yescar';
+    this.imageType = ImageType.default;
   }
 }

package/src/export.command.ts

@@ -1,6 +1,6 @@
 import { createInterface } from 'readline';
 import { Command, CommandRunner, InquirerService } from 'nest-commander';
-import { ConfigService } from './services/config.service';
+import { ConfigService } from './services';
 import { Input } from './interfaces/input.interface';
 import { exportSchema } from './export.schema';
 import { ModuleRef } from '@nestjs/core';

package/src/exporters/autouncle.exporter.ts

@@ -19,7 +19,7 @@ export class AutouncleExporter implements Exporter {
     private loaderService: LoaderService,
     private rulesService: RulesService,
     private moduleRef: ModuleRef,
-  ) { }
+  ) {}
 
   async export(): Promise<void> {
     const [fileName] = this.configService.config.outputFiles;
@@ -28,12 +28,12 @@ export class AutouncleExporter implements Exporter {
 
     const autouncleJsonBuilder = new AutouncleJsonBuilder(fileName);
     await autouncleJsonBuilder.buildStart();
-    
+
     const autouncleTransformer = await this.moduleRef.create(AutouncleTransformer);
 
     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');
@@ -43,8 +43,10 @@ export class AutouncleExporter implements Exporter {
         await autouncleJsonBuilder.addItem(car, firstCar);
 
         this.carService.counter.countCar(data.images);
-        
-        if (firstCar) { firstCar = false; }
+
+        if (firstCar) {
+          firstCar = false;
+        }
       }
     });
 

package/src/exporters/fb.exporter.ts

@@ -30,9 +30,9 @@ export class FbExporter implements Exporter {
     const fbTransformer = await this.moduleRef.create(FbTransformer);
 
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
-      // const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
-      // chunk.data = null;
-      for (const data of chunk.data) {
+      const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
+      chunk.data = null;
+      for (const data of chunkData) {
         const ownerId = get(data.car, 'metaData.ownerId', null);
         const owner = await this.carService.getOwner(ownerId);
         const car = await fbTransformer.transform({ owner, ...data });

package/src/exporters/meinstadt.exporter.ts

@@ -8,7 +8,7 @@ import { Zipper } from '@bytebrand/zipper';
 import { CarService, RulesService, LoaderService, ConfigService } from '../services';
 import { MeinstadtTransformer } from '../transformers/meinstadt.transformer';
 import { MeinstadtJsonBuilder } from '../formats/meinstadt-json.builder';
-import { MeinstadtJsonItem } from '../interfaces/export-item.interface';
+import { MeinstadtJsonItem } from '../interfaces';
 import { Exporter } from '../interfaces/exporter.interface';
 
 @Injectable()
@@ -19,7 +19,7 @@ export class MeinstadtExporter implements Exporter {
     private rulesService: RulesService,
     private loaderService: LoaderService,
     private moduleRef: ModuleRef,
-  ) { }
+  ) {}
 
   async export(): Promise<void> {
     const [fileJson, fileGZ] = this.configService.config.outputFiles;
@@ -33,14 +33,16 @@ 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 });
         await meinstadtJsonBuilder.addItem(car as MeinstadtJsonItem, firstCar);
         this.carService.counter.countCar(data.images);
 
-        if (firstCar) { firstCar = false; }
+        if (firstCar) {
+          firstCar = false;
+        }
       }
     });
 

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

@@ -56,6 +56,11 @@ export interface Auto24XmlItem {
   companyname: string;
   extras: string;
   sellertype: string;
+  condition: string;
+  dealer_homepage_url: string;
+  dealer_email: string;
+  dealer_name: string;
+  dealer_phone: string;
 }
 
 export interface OoyyoXmlItem extends FbXmlItem {

package/src/services/images.service.ts

@@ -96,10 +96,10 @@ export class ImagesService {
     const marketingImageConfigs = this.transform(configs);
 
     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' },
+      '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 = [];
@@ -123,8 +123,9 @@ export class ImagesService {
 
   async getMarketingImageConfigs(): Promise<MarketingImageConfigsInterface> {
     const configs = await this.userService.getMarketingImageConfigs();
-    const { id } = configs.find(config => config.channelCode.includes(this.configService.config.exportType));
-
+    const responseData = configs.find(config => config.channelCode.includes(this.configService.config.exportType));
+    let id;
+    !responseData?.id ? (id = this.configService.config.marketingImageId) : (id = responseData.id);
     return this.userService.getMarketingImageConfig(id);
   }
 

package/src/transformers/as24.transformer.ts

@@ -1,11 +1,10 @@
 import { get, isEmpty, isNil, set, toNumber, toSafeInteger, upperFirst } from 'lodash';
 import { DataSchemes } from '@bytebrand/car-schema';
 import { CarDescriptionFactory, DescriptionTypeEnum } from '@bytebrand/car-description';
-import { MappingService } from '../services/mapping.service';
+import { MappingService, UserService } from '../services';
 import { MappingRules } from '../interfaces/mapping-rules.interface';
 import { Injectable } from '@nestjs/common';
 import { LoggerService } from '@bytebrand/cronicle-helper';
-import { UserService } from '../services';
 
 @Injectable()
 export class As24Transformer {
@@ -114,7 +113,7 @@ export class As24Transformer {
 
   protected numberToNumber(field: number): number {
     const result = isNil(field) ? null : toNumber(field);
-    return (result < 0 || isNaN(result)) ? undefined : result;
+    return result < 0 || isNaN(result) ? undefined : result;
   }
 
   protected numberToInteger(field: number): number {

package/src/transformers/auto24.transfomer.ts

@@ -8,7 +8,6 @@ import { Auto24XmlItem } from '../interfaces';
 import { Injectable } from '@nestjs/common';
 import { ConfigService, ImagesService } from '../services';
 import { isNotEmptyArray } from '../utils/validator.utils';
-import { ImageType } from '../enums';
 
 @Injectable()
 export class Auto24Transformer {
@@ -20,7 +19,7 @@ export class Auto24Transformer {
 
   async transform(car: DataSchemes.Car, imboImages: ImboImageResponseInterface[]): Promise<Auto24XmlItem> {
     const carId = toString(get(car, '_id', ''));
-    const transformedImages = await this.imageService.getImages(car, imboImages, ImageType.default);
+    const transformedImages = await this.imageService.getImages(car, imboImages, this.configService.config.imageType);
     let userlink = `https://www.${this.configService.config.domain}/search/vehicle/${carId}`;
     if (this.configService.config.campaign) {
       userlink += `?source=classifieds&medium=listing&campaign=${this.configService.config.campaign}`;
@@ -49,6 +48,11 @@ export class Auto24Transformer {
       companyname: 'www.auto.de',
       extras: this.getExtrasField(car),
       sellertype: 'dealer',
+      condition: this.getCondition(car),
+      dealer_homepage_url: 'https://www.auto.de',
+      dealer_email: ' auto@auto.de',
+      dealer_name: ' Auto.de',
+      dealer_phone: '+498004030182',
     };
   }
 
@@ -133,4 +137,14 @@ export class Auto24Transformer {
       })
       .join(', ');
   }
+
+  private getCondition(car: DataSchemes.Car): string {
+    const available = {
+      selector_condition_new: 'Neu',
+      selector_condition_used: 'Gebraucht',
+      selector_unknown: 'Gebraucht',
+    };
+    const condition = get(car, 'mainData.condition', 'selector_unknown');
+    return get(available, condition);
+  }
 }

package/src/transformers/autouncle.transformer.ts

@@ -1,10 +1,11 @@
 import { TranslatorExtended } from '@bytebrand/schema-tools';
 import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictionaries';
-import { get, toString, isEmpty, toSafeInteger } from 'lodash';
+import {get, toString, isEmpty, toSafeInteger } from 'lodash';
 import * as moment from 'moment';
 import { DataSchemes } from '@bytebrand/car-schema';
 import { DePostalCodesService } from '@bytebrand/car-basic-data-scope';
 import { DePostalCodesEntryInterface } from '@bytebrand/car-basic-data-scope/dist/interfaces/DePostalCodesInterface';
+
 import { ConfigService, ImagesService } from '../services';
 import { Injectable } from '@nestjs/common';
 import { DEFAULT_ADDR1, DEFAULT_CITY, DEFAULT_ZIP, MIN_MILEAGES } from '../constants/autouncle.contants';
@@ -34,7 +35,10 @@ export class AutouncleTransformer {
   }): Promise<AutouncleJsonItem> {
     const autodeId = toString(get(car, '_id', ''));
     const address = await this.getAddress(car, owner);
-
+    const image_urls = await this.imageService.getImages(car, images, this.configService.config.imageType);
+    const transformed_images = image_urls.map(url => {
+      return { url };
+    });
     return {
       back_link: `https://www.${this.configService.config.domain}/search/vehicle/${autodeId}?source=classifieds&medium=cpc&campaign=autouncle`,
       make: toString(get(car, 'mainData.make', '')),
@@ -61,7 +65,7 @@ export class AutouncleTransformer {
       seller_name: 'auto.de',
       seller_id: toString(get(car, 'metaData.ownerId', '')),
       description: toString(get(car, 'offer.offerDescription', '')),
-      images: this.getImagesField(car, images),
+      images: transformed_images,
       fuel_economy: toString(get(car, 'consumption.consumptionCombined', '')),
       co2_emission: toString(get(car, 'environmentEmissions.co2', '')),
       co2_effiency_class: toString(get(car, 'environmentEmissions.energyEfficiencyClass', '')),
@@ -229,10 +233,4 @@ export class AutouncleTransformer {
   private has4WD(): string {
     return '';
   }
-
-  private getImagesField(car: DataSchemes.Car, images: ImboImageResponseInterface[]): { url: string }[] {
-    return this.imageService.getDefaultImages(car, images).map(url => {
-      return { url };
-    });
-  }
 }

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

@@ -7,7 +7,7 @@ import { TranslatorExtended } from '@bytebrand/schema-tools';
 import { DataSchemes } from '@bytebrand/car-schema';
 
 import { FacebookShopItem } from '../interfaces';
-import { ConfigService } from '../services';
+import { ConfigService, ImagesService } from '../services';
 import { Description } from '../interfaces/description.interface';
 import { FbDescription } from './fb-description.transformer';
 import { FbEquipment } from './fb-equipment.transformer';
@@ -16,12 +16,14 @@ import { FbEquipment } from './fb-equipment.transformer';
 export class FacebookShopTransformer {
   private translator: TranslatorExtended;
 
-  constructor(private readonly configService: ConfigService) {
+  constructor(private readonly configService: ConfigService, private readonly imageService: ImagesService) {
     const dict = { ...de, ...deVehicleProps, ...deVehicleDetailsPage };
     this.translator = new TranslatorExtended(dict);
   }
 
-  async transform({ car }: { car: DataSchemes.Car }): Promise<FacebookShopItem> {
+  async transform({ car, images }: { car: DataSchemes.Car; images: any }): Promise<FacebookShopItem> {
+    const imageLinks = await this.imageService.getImages(car, images, this.configService.config.imageType);
+
     return {
       id: { value: get(car, 'metaData.vehicleId'), isGoogle: true },
       title: { value: this.getTitle(car), isGoogle: true },
@@ -30,9 +32,9 @@ export class FacebookShopTransformer {
       condition: { value: this.getCondition(car), isGoogle: true },
       price: { value: this.getPrice(car), isGoogle: true },
       link: { value: this.getCarLink(car), isGoogle: true },
-      image_link: { value: this.getImageLink(car), isGoogle: true },
+      image_link: { value: imageLinks[0], isGoogle: true },
       brand: { value: get(car, 'mainData.make', ''), isGoogle: true },
-      additional_image_link: { value: this.getImageLink(car), isGoogle: false },
+      additional_image_link: { value: imageLinks[0], isGoogle: false },
       quantity_to_sell_on_facebook: { value: 1, isGoogle: true },
       google_product_category: { value: '916', isGoogle: true },
       sale_price: { value: this.getPrice(car), isGoogle: true },
@@ -83,12 +85,4 @@ export class FacebookShopTransformer {
   private getDescription(car: DataSchemes.Car): Description[] {
     return FbDescription.create(car, this.translator, new FbEquipment()).getDescriptionArray();
   }
-
-  //todo: move to image service
-  private getImageLink(car: DataSchemes.Car): string {
-    const mainImageId = get(car, 'metaData.mainImageId', '');
-    return mainImageId
-      ? `${this.configService.config.baseImageUrl}/carimage/${car._id}/${mainImageId}/large-cached.webp`
-      : `${this.configService.config.baseImageUrl}/carimage/noimage/7pNvWELuWhZX/large-cached.jpeg`;
-  }
 }

package/src/transformers/fb.transformer.ts

@@ -63,6 +63,10 @@ export class FbTransformer {
     const year = this.getYear(car);
     const dealerInfo = this.getDealerItems(car);
     const address = await this.getAddress(car, owner);
+    const image_links = await this.imagesService.getImages(car, images, ImageType.marketing);
+    const transformedImages = image_links.map(el => {
+      return { url: el };
+    });
 
     return {
       fb_page_id: '176306386132',
@@ -77,7 +81,7 @@ export class FbTransformer {
       make: toString(get(car, 'mainData.make', '')),
       model: toString(get(car, 'mainData.model', '')),
       trim: this.getTrim(car),
-      image: await this.imagesService.getImages(car, images, ImageType.marketing),
+      image: transformedImages,
       year: toString(year),
       mileage: {
         value: this.getMileage(car),
@@ -282,14 +286,17 @@ export class FbTransformer {
       },
     };
   }
+
   private isEmptyLocation(location: DePostalCodesEntryInterface): boolean {
     if (!location) return true;
     return !location['Place Name'] || !(location.Latitude && location.Longitude);
   }
+
   private isEmptyAddress(address: unknown): boolean {
     if (!address) return true;
     return ['city', 'zip', 'country'].every((key: string) => isEmpty(address[key]));
   }
+
   private async getCoords(
     car: DataSchemes.Car,
     locationEntry: DePostalCodesEntryInterface,
@@ -325,6 +332,7 @@ export class FbTransformer {
     }
     return this.translator.translateVal(colorSelection);
   }
+
   private getInteriorColor(car: DataSchemes.Car): string {
     let colorSelection = get(car, 'interior.interiorColor', 'other');
     if (!colorSelection || colorSelection === 'selector_unknown') {

package/src/transformers/google.transformer.ts

@@ -23,6 +23,7 @@ export class GoogleTransformer {
 
   async transform({ car, images }: { car: DataSchemes.Car; images: Array<any> }): Promise<GoogleXmlItem> {
     const carId = toString(get(car, '_id', ''));
+    const transformedImages = await this.imageService.getImages(car, images, this.configService.config.imageType);
 
     return {
       id: carId,
@@ -31,7 +32,7 @@ export class GoogleTransformer {
       google_product_category: this.getBreadcrumbs(car),
       product_type: this.getCategory(car),
       link: this.getLink(car),
-      image_link: await this.imageService.getImages(car, images, ImageType.marketing)[0],
+      image_link: transformedImages[0],
       condition: this.mapState(car),
       availability: this.getAvailability(car),
       brand: get(car, 'mainData.make', ''),