@bytebrand/export-cars 1.7.1 → 1.9.0

package/src/transformers/modix.transformer.ts

@@ -11,8 +11,7 @@ import { DataSchemes } from '@bytebrand/car-schema';
 
 import { imageItem, IModixWrapItem, ModixXmlItem } from '../interfaces';
 import { isNotEmptyArray, isValidVin } from '../utils/validator.utils';
-import { CategoryList } from '../constants/modix/category.constant';
-import { ConfigService } from '../services/config.service';
+import { ConfigService } from '../services';
 import {
   BodyColorList,
   VehicleClassList,
@@ -21,20 +20,21 @@ import {
   TransmissionList,
   UsageConditionList,
   UsageTypeList,
+  CategoryList,
 } from '../constants';
 
 
-
 @Injectable()
 export class ModixTransformer {
-  constructor(private readonly configService: ConfigService) { }
-
-  async transform(chunkData: { car: DataSchemes.Car; images: ImboImageResponseInterface[]; }, mappingRules: MappingRulesInterface[]): Promise<ModixXmlItem> {
+  constructor(private readonly configService: ConfigService) {}
 
+  async transform(
+    chunkData: { car: DataSchemes.Car; images: ImboImageResponseInterface[] },
+    mappingRules: MappingRulesInterface[],
+  ): Promise<ModixXmlItem> {
     const { car, images } = chunkData;
-    // await this.buildOptions(car, mappingRules);
-    return {
 
+    return {
       //Main data
       maindata: {
         category: this.getCategoryData(car),
@@ -211,8 +211,17 @@ export class ModixTransformer {
     return { url, imageList };
   }
 
-  private async buildOptions(car: DataSchemes.Car, mappingRules: MappingRulesInterface[]): Promise<Omit<DataSchemes.Car, 'state'>> {
-    const transformer = TransformerFactory.createTransformer(ImportOrigins.MODIX, car, { importSelectorMappingLog: () => { } } as any, [{ make: 'make', model: 'model' }], ['alt_model']);
+  private async buildOptions(
+    car: DataSchemes.Car,
+    mappingRules: MappingRulesInterface[],
+  ): Promise<Omit<DataSchemes.Car, 'state'>> {
+    const transformer = TransformerFactory.createTransformer(
+      ImportOrigins.MODIX,
+      car,
+      { importSelectorMappingLog: () => {} } as any,
+      [{ make: 'make', model: 'model' }],
+      ['alt_model'],
+    );
     const { car: transformedCar } = await transformer.transform(mappingRules);
 
     return omit(transformedCar, ['state']);

package/src/transformers/ooyyo.transformer.ts

@@ -5,19 +5,18 @@ import * as moment from 'moment';
 import { DataSchemes } from '@bytebrand/car-schema';
 import { OoyyoXmlItem } from '../interfaces';
 import { ImboImageResponseInterface } from '@bytebrand/chunkable';
-import { ConfigService } from '../services/config.service';
+import { ConfigService, ImagesService } from '../services';
 import { Injectable } from '@nestjs/common';
-import { isNotEmptyArray } from '../utils/validator.utils';
 
 @Injectable()
 export class OoyyoTransformer {
   private translator: Translator;
 
-  constructor(private configService: ConfigService) {
+  constructor(private configService: ConfigService, private imageService: ImagesService) {
     this.translator = new Translator(de);
   }
 
-  transform(car: DataSchemes.Car, imboImages: ImboImageResponseInterface[]): OoyyoXmlItem {
+  async transform(car: DataSchemes.Car, imboImages: ImboImageResponseInterface[]): Promise<OoyyoXmlItem> {
     const autodeid = toString(get(car, '_id', ''));
     const creationDate = get(car, 'metaData.creationDate') as number;
     const constructionYear = get(car, 'mainData.constructionYear') as number;
@@ -49,7 +48,7 @@ export class OoyyoTransformer {
       doors: toString(get(car, 'mainData.doors', '')),
       seats: toString(get(car, 'mainData.seats', '')),
       gears: toString(get(car, 'driveSuspension.gears', '')),
-      pictures: this.getImagesField(autodeid, imboImages),
+      pictures: await this.imageService.getImages(car, imboImages, this.configService.config.imageType),
       location: {
         city: toString(get(car, 'location.city', '')),
         postcode: toString(get(car, 'location.zipCode', '')),
@@ -107,17 +106,4 @@ export class OoyyoTransformer {
     const format = onlyTime ? 'hh:mm:ss' : 'DD/MM/YYYY';
     return moment(timestamp * 1000).format(format);
   }
-
-  private getImagesField(carId: string, images: ImboImageResponseInterface[]): string[] {
-    if (isNotEmptyArray(images)) {
-      return images.map((image: ImboImageResponseInterface) => {
-        return this.buildLargeImageUrl(carId, image.imageIdentifier);
-      });
-    }
-    return [];
-  }
-
-  private buildLargeImageUrl(carId: string, imageId: string): string {
-    return `${this.configService.config.imageUrl}/carimage/${carId}/${imageId}/large`;
-  }
 }

package/src/transformers/rubrikk.transformer.ts

@@ -3,21 +3,21 @@ import { Injectable } from '@nestjs/common';
 
 import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictionaries';
 import { DePostalCodesService } from '@bytebrand/car-basic-data-scope';
+import { ImboImageResponseInterface } from '@bytebrand/chunkable';
 import { TranslatorExtended } from '@bytebrand/schema-tools';
 import { DataSchemes } from '@bytebrand/car-schema';
 
 import { RubrikkXmlItem } from '../interfaces';
-import { ConfigService } from '../services';
+import { ConfigService, ImagesService } from '../services';
+
 import * as moment from 'moment/moment';
-import { ImboImageResponseInterface } from '@bytebrand/chunkable';
-import { isNotEmptyArray } from '../utils/validator.utils';
 
 @Injectable()
 export class RubrikkTransformer {
   private translator: TranslatorExtended;
   private postalCodesService: DePostalCodesService;
 
-  constructor(private readonly configService: ConfigService) {
+  constructor(private readonly configService: ConfigService, private readonly imageService: ImagesService) {
     const dict = { ...de, ...deVehicleProps, ...deVehicleDetailsPage };
     this.postalCodesService = DePostalCodesService.getInstance();
     this.translator = new TranslatorExtended(dict);
@@ -30,11 +30,9 @@ export class RubrikkTransformer {
     car: DataSchemes.Car;
     images: ImboImageResponseInterface[];
   }): Promise<RubrikkXmlItem> {
-    const autodeId = toString(get(car, '_id', ''));
-
     return {
       //Common Fields
-      ad__all_imageurls: this.getImagesLinks(autodeId, images),
+      ad__all_imageurls: await this.imageService.getImages(car, images, this.configService.config.imageType),
       ad__condition_new_used_etc: this.getCondition(car),
       ad__description: toString(get(car, 'offer.offerDescription', '')),
       ad__headline: this.getTitle(car),
@@ -135,15 +133,6 @@ export class RubrikkTransformer {
       : `${this.configService.config.baseImageUrl}/carimage/noimage/7pNvWELuWhZX/large-cached.jpeg`;
   }
 
-  private getImagesLinks(carId: string, images: ImboImageResponseInterface[]): string[] {
-    if (isNotEmptyArray(images)) {
-      return images.map((image: ImboImageResponseInterface) => {
-        return `${this.configService.config.baseImageUrl}/carimage/${carId}/${image.imageIdentifier}/large`;
-      });
-    }
-    return [];
-  }
-
   private getEnergyClass(car: DataSchemes.Car): string {
     const available = {
       selector_energyEfficiencyClass_a: 'A',

package/dist/services/marketing-images.service.js

@@ -1,58 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MarketingImagesService = void 0;
-class MarketingImagesService {
-    configService;
-    userService;
-    constructor(configService, userService) {
-        this.configService = configService;
-        this.userService = userService;
-    }
-    async getImagesUrl(images, imageUrl, carId) {
-        const transformedImages = this.transformImagesArrayIntoObject(images);
-        const configs = (await this.getMarketingImageConfigs());
-        const marketingImageConfigs = this.transform(configs);
-        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({ url: this.getImagePathWithExtenstion(imageUrl, carId, imageId, configs) });
-                    break;
-                }
-            }
-        }
-        return imageUrls;
-    }
-    async getMarketingImageConfigs() {
-        const configs = await this.userService.getMarketingImageConfigs();
-        const { id } = configs.find(config => config.channelCode.includes(this.configService.config.exportType));
-        return this.userService.getMarketingImageConfig(id);
-    }
-    transformImagesArrayIntoObject(images) {
-        const result = {};
-        images.forEach(image => {
-            const imageCode = image.imageCodePredicted.split('-')[0];
-            result[imageCode] = image.imageIdentifier;
-        });
-        return result;
-    }
-    transform(config) {
-        return config.marketingImages.map(marketingImage => {
-            return {
-                marketingImageCodes: marketingImage.imageCodes,
-            };
-        });
-    }
-    getChannelPath(imageUrl, carId) {
-        return `${imageUrl}/${[carId[0], carId[1], carId[2], carId].join('/')}`;
-    }
-    getImagePathWithExtenstion(imageUrl, carId, imageId, config) {
-        const { channelCode, imageExtension } = config;
-        return `${this.getChannelPath(imageUrl, carId)}/${channelCode.replace(/ /g, '-')}-${imageId}.${imageExtension}`;
-    }
-}
-exports.MarketingImagesService = MarketingImagesService;
-//# sourceMappingURL=marketing-images.service.js.map

package/dist/services/marketing-images.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"marketing-images.service.js","sourceRoot":"","sources":["../../src/services/marketing-images.service.ts"],"names":[],"mappings":"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"}

package/src/services/marketing-images.service.ts

@@ -1,70 +0,0 @@
-import { MarketingImageConfigInterface, MarketingImageConfigsInterface } from '@bytebrand/autode-request';
-import { ConfigService } from './config.service';
-import { UserService } from './user.service';
-
-export class MarketingImagesService {
-  constructor(
-    private readonly configService: ConfigService,
-    private readonly userService: UserService
-  ) {}
-
-  async getImagesUrl(images: any, imageUrl: string, carId: string): Promise<{ url: string }[]> {
-    const transformedImages = this.transformImagesArrayIntoObject(images);
-    const configs = (await this.getMarketingImageConfigs()) as any;
-    const marketingImageConfigs = this.transform(configs);
-
-    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({ url: this.getImagePathWithExtenstion(imageUrl, carId, imageId, configs) });
-          break;
-        }
-      }
-    }
-
-    return imageUrls;
-  }
-
-  async getMarketingImageConfigs(): Promise<MarketingImageConfigsInterface> {
-    const configs = await this.userService.getMarketingImageConfigs();
-    const { id } = configs.find(config => config.channelCode.includes(this.configService.config.exportType));
-
-    return this.userService.getMarketingImageConfig(id);
-  }
-
-  private transformImagesArrayIntoObject(images: { [imageCode: string]: string }[]) {
-    const result: { [imageCode: string]: string } = {};
-    images.forEach(image => {
-      const imageCode = image.imageCodePredicted.split('-')[0];
-      result[imageCode] = image.imageIdentifier;
-    });
-    return result;
-  }
-
-  private transform(config: MarketingImageConfigInterface): { marketingImageCodes: string[] }[] {
-    return config.marketingImages.map(marketingImage => {
-      return {
-        marketingImageCodes: marketingImage.imageCodes,
-      };
-    });
-  }
-
-  protected getChannelPath(imageUrl: string, carId: string): string {
-    return `${imageUrl}/${[carId[0], carId[1], carId[2], carId].join('/')}`;
-  }
-
-  protected getImagePathWithExtenstion(
-    imageUrl: string,
-    carId: string,
-    imageId: string,
-    config: MarketingImageConfigsInterface,
-  ): string {
-    const { channelCode, imageExtension } = config;
-    return `${this.getChannelPath(imageUrl, carId)}/${channelCode.replace(/ /g, '-')}-${imageId}.${imageExtension}`;
-  }
-}