@bytebrand/export-cars 1.10.12 → 1.11.0

package/src/transformers/as24.transformer.ts

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

package/src/transformers/auto24.transfomer.ts

@@ -7,7 +7,7 @@ import { ImboImageResponseInterface } from '@bytebrand/chunkable';
 import { Auto24XmlItem } from '../interfaces';
 import { Injectable } from '@nestjs/common';
 import { ConfigService, ImagesService } from '../services';
-import { isNotEmptyArray } from '../utils/validator.utils';
+import { isNotEmptyArray } from '../utils';
 
 @Injectable()
 export class Auto24Transformer {
@@ -19,7 +19,12 @@ 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, this.configService.config.imageType);
+    const transformedImages = await this.imageService.getImages(
+      car,
+      imboImages,
+      this.configService.config.imageType,
+      false,
+    );
     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}`;

package/src/transformers/autouncle.transformer.ts

@@ -1,6 +1,6 @@
 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';
@@ -35,7 +35,7 @@ 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 image_urls = await this.imageService.getImages(car, images, this.configService.config.imageType, false);
     const transformed_images = image_urls.map(url => {
       return { url };
     });

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

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

package/src/transformers/fb-description.transformer.ts

@@ -43,7 +43,7 @@ export class FbDescription {
         {
           title: 'title.cylinders',
           value: {
-            key: get(this.car, 'engineData.cylinders') as string,
+            key: get(this.car, 'engineData.cylinders', '') as string,
           },
         },
         {
@@ -169,7 +169,7 @@ export class FbDescription {
         {
           title: 'title.base',
           value: {
-            key: get(this.car, 'driveSuspension.wheelBase') as string,
+            key: get(this.car, 'driveSuspension.wheelBase', '') as string,
           },
         },
         {
@@ -191,13 +191,13 @@ export class FbDescription {
         {
           title: 'title.doors',
           value: {
-            key: get(this.car, 'mainData.doors') as string,
+            key: get(this.car, 'mainData.doors', '') as string,
           },
         },
         {
           title: 'title.seats',
           value: {
-            key: get(this.car, 'mainData.seats') as string,
+            key: get(this.car, 'mainData.seats', '') as string,
           },
         },
         {

package/src/transformers/fb.transformer.ts

@@ -29,7 +29,7 @@ import { Description } from '../interfaces/description.interface';
 import { FbDescription } from './fb-description.transformer';
 import { ConfigService, ImagesService } from '../services';
 import { FbEquipment } from './fb-equipment.transformer';
-import { isValidVin } from '../utils/validator.utils';
+import { isValidVin } from '../utils';
 import { UserService } from 'src/services';
 import { ImageType } from '../enums';
 import {
@@ -41,7 +41,6 @@ import {
   TIMESTAMP_FIRST_YEAR,
 } from '../constants/fb.constants';
 
-
 @Injectable()
 export class FbTransformer {
   private translator: TranslatorExtended;
@@ -49,10 +48,10 @@ export class FbTransformer {
   private imagesService: ImagesService;
 
   constructor(
-    @Inject(CACHE_MANAGER) private cacheManager: Cache,    
-    private readonly configService: ConfigService, 
-    private readonly userService: UserService
-    ) {
+    @Inject(CACHE_MANAGER) private cacheManager: Cache,
+    private readonly configService: ConfigService,
+    private readonly userService: UserService,
+  ) {
     this.imagesService = new ImagesService(configService, userService);
     const dict = { ...de, ...deVehicleProps, ...deVehicleDetailsPage };
     this.translator = new TranslatorExtended(dict);
@@ -72,7 +71,7 @@ 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 image_links = await this.imagesService.getImages(car, images, ImageType.marketing, false);
     const transformedImages = image_links.map(el => {
       return { url: el };
     });
@@ -138,7 +137,7 @@ export class FbTransformer {
     const firstRegistration = get(car, 'mainData.firstRegistration', 0) as number;
     const firstRegistrationYear = moment(firstRegistration * 1000).format('YYYY');
 
-    const constructionYear = get(car, 'mainData.constructionYear') as string;
+    const constructionYear = get(car, 'mainData.constructionYear', '') as string;
 
     const metaCreationDate = get(car, 'metaData.creationDate') as number;
     const metaCreationYear = moment(metaCreationDate * 1000).format('YYYY');
@@ -329,11 +328,15 @@ export class FbTransformer {
     const cacheKey = `${info.city}_${info.zip}`;
 
     let entry = await this.cacheManager.get(cacheKey);
-    if (entry) { return entry as DePostalCodesEntryInterface; };
-    if (entry === 'no_data') { return undefined; }
+    if (entry) {
+      return entry as DePostalCodesEntryInterface;
+    }
+    if (entry === 'no_data') {
+      return undefined;
+    }
 
     entry = await this.postalCodesService.getLocationByPostalCode(info.zip);
-    entry && await this.cacheManager.set(cacheKey, entry);
+    entry && (await this.cacheManager.set(cacheKey, entry));
 
     if (!entry) {
       entry = await this.postalCodesService.getLocationByCity(info.city);
@@ -342,7 +345,6 @@ export class FbTransformer {
       } else {
         await this.cacheManager.set(cacheKey, 'no_data');
       }
-
     }
     return entry as DePostalCodesEntryInterface;
   }

package/src/transformers/google.transformer.ts

@@ -6,7 +6,6 @@ import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictio
 import { Injectable } from '@nestjs/common';
 import { ConfigService, ImagesService, UserService } from '../services';
 import { GoogleXmlItem } from '../interfaces';
-import { ImageType } from '../enums';
 
 @Injectable()
 export class GoogleTransformer {
@@ -23,7 +22,12 @@ 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);
+    const transformedImages = await this.imageService.getImages(
+      car,
+      images,
+      this.configService.config.imageType,
+      false,
+    );
 
     return {
       id: carId,

package/src/transformers/index.ts

@@ -1,3 +1,4 @@
 export * from './rubrikk.transformer';
 export * from './modix.transformer';
 export * from './facebook-shop.transformer';
+export * from './trovit.transformer';

package/src/transformers/meinstadt.transformer.ts

@@ -9,13 +9,18 @@ import { de } from '@bytebrand/i18n-dictionaries';
 import { ConfigService, ImagesService } from '../services';
 import { MeinstadtJsonItem } from '../interfaces';
 
-
 @Injectable()
 export class MeinstadtTransformer {
   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);
+  async transform({
+    car,
+    images,
+  }: {
+    car: DataSchemes.Car;
+    images: ImboImageResponseInterface[];
+  }): Promise<Partial<MeinstadtJsonItem>> {
+    const carImages = await this.imageService.getImages(car, images, this.configService.config.imageType, false);
 
     const carId = toString(get(car, '_id', null));
 

package/src/transformers/mobile.transformer.ts

@@ -9,10 +9,9 @@ import { DataSchemes } from '@bytebrand/car-schema';
 
 import { MappingService, UserService, ImagesService } from '../services';
 import { MappingRules } from '../interfaces/mapping-rules.interface';
-import { isNotEmptyArray } from '../utils/validator.utils';
+import { isNotEmptyArray } from '../utils';
 import { ConfigService } from '../services';
 
-
 const vinGenerator = require('vin-generator');
 
 @Injectable()
@@ -24,7 +23,7 @@ export class MobileTransformer {
     private userService: UserService,
     private configService: ConfigService,
     private imagesService: ImagesService,
-  ) { }
+  ) {}
 
   async transform(carData: DataSchemes.Car, images: ImboImageResponseInterface[]): Promise<unknown> {
     this.currentCar = carData;
@@ -353,7 +352,12 @@ export class MobileTransformer {
   }
 
   private async getImages(car: DataSchemes.Car, images): Promise<string | null> {
-    const transformedImages = await this.imagesService.getImages(car, images, this.configService.config.imageType);
+    const transformedImages = await this.imagesService.getImages(
+      car,
+      images,
+      this.configService.config.imageType,
+      false,
+    );
     let imagesAsALine;
     if (isNotEmptyArray(transformedImages)) {
       imagesAsALine = transformedImages.map((el: string) => el).join(';');

package/src/transformers/modix.transformer.ts

@@ -9,8 +9,8 @@ import { ImboImageResponseInterface } from '@bytebrand/chunkable';
 import { ImportOrigins } from '@bytebrand/cronicle-helper';
 import { DataSchemes } from '@bytebrand/car-schema';
 
-import { imageItem, IModixWrapItem, ModixXmlItem } from '../interfaces';
-import { isNotEmptyArray, isValidVin, ampersandReplacer } from '../utils';
+import { imageItem, IAtributeWrapItem, ModixXmlItem } from '../interfaces';
+import { isNotEmptyArray, isValidVin, xmlStringReplacer } from '../utils';
 import { ConfigService } from '../services';
 import {
   BodyColorList,
@@ -38,9 +38,8 @@ export class ModixTransformer {
       maindata: {
         category: this.getCategoryData(car),
         manufacturer: this.getManufactureData(car),
-        model: { value: ampersandReplacer(get(car, 'mainData.model', '')) },
-        // NOTES:: replace angle brackets to make xml valid
-        submodel: { value: ampersandReplacer(get(car, 'mainData.subModel', '')).replace(/[<>]/g, '') },
+        model: { value: xmlStringReplacer(get(car, 'mainData.model', '')) },
+        submodel: { value: xmlStringReplacer(get(car, 'mainData.subModel', '')) },
         mileage: { value: toNumber(get(car, 'mainData.mileage', null)), atributes: { scaleUnit: 'km' } },
         cylinderCapacity: { value: toString(get(car, 'engineData.cylinders', null)) },
         enginePower: { value: toNumber(get(car, 'engineData.powerKW', null)), atributes: { scaleUnit: 'kW' } },
@@ -113,12 +112,12 @@ export class ModixTransformer {
     };
   }
 
-  private getCategoryData(car: DataSchemes.Car): IModixWrapItem {
+  private getCategoryData(car: DataSchemes.Car): IAtributeWrapItem {
     const vehicle_class = get(car, 'mainData.vehicleClass', 'selector_unknown');
     return get(VehicleClassList, vehicle_class);
   }
 
-  private getManufactureData(car: DataSchemes.Car): IModixWrapItem {
+  private getManufactureData(car: DataSchemes.Car): IAtributeWrapItem {
     const carMake = toString(get(car, 'mainData.make', ''));
     const manufactureData = findLast(ManufactureList, item => toLowercase(item.name) === toLowercase(carMake));
     // temporary
@@ -128,23 +127,23 @@ export class ModixTransformer {
     return { value: manufactureData?.name || carMake, atributes: { id: manufactureData?.id || null } };
   }
 
-  private getFuelData(car: DataSchemes.Car): IModixWrapItem {
+  private getFuelData(car: DataSchemes.Car): IAtributeWrapItem {
     const fuel_selector = get(car, 'consumption.fuel', '');
     return get(FuelList, fuel_selector);
   }
 
-  private getTransmissionData(car: DataSchemes.Car): IModixWrapItem {
+  private getTransmissionData(car: DataSchemes.Car): IAtributeWrapItem {
     const transmission_selector = get(car, 'driveSuspension.gearbox', 'selector_unknown');
     return get(TransmissionList, transmission_selector);
   }
 
-  private getAccident(car: DataSchemes.Car): IModixWrapItem {
+  private getAccident(car: DataSchemes.Car): IAtributeWrapItem {
     const accident = get(car, 'maindata.accidentDamaged', null);
 
     return { value: accident };
   }
 
-  private getUsageData(car: DataSchemes.Car): IModixWrapItem {
+  private getUsageData(car: DataSchemes.Car): IAtributeWrapItem {
     const usageType = get(car, 'maindata.usageType', '');
     const usage_by_selector = get(UsageTypeList, usageType);
 
@@ -156,17 +155,17 @@ export class ModixTransformer {
     return get(UsageConditionList, condition);
   }
 
-  private getBodyStyleData(car: DataSchemes.Car): IModixWrapItem {
+  private getBodyStyleData(car: DataSchemes.Car): IAtributeWrapItem {
     const body_style_selector = get(car, 'mainData.category', 'selector_unknown');
     return get(CategoryList, body_style_selector);
   }
 
-  private getPainId(car: DataSchemes.Car): IModixWrapItem {
+  private getPainId(car: DataSchemes.Car): IAtributeWrapItem {
     const metallic = get(car, 'exterior.metallic', false);
     return metallic ? { value: 'metallic', atributes: { id: 3 } } : { value: 'solid', atributes: { id: 1 } };
   }
 
-  private getColorNameData(car): IModixWrapItem {
+  private getColorNameData(car): IAtributeWrapItem {
     const colorSelection = get(car, 'exterior.exteriorColor', 'selector_unknown');
     return get(BodyColorList, colorSelection);
   }
@@ -203,7 +202,7 @@ export class ModixTransformer {
     const car_id = toString(get(car, '_id', ''));
     const url = `${this.configService.config.imageUrl}/carimage/${car_id}`;
 
-    const imageList: IModixWrapItem[] = [];
+    const imageList: IAtributeWrapItem[] = [];
 
     if (isNotEmptyArray(images)) {
       images.forEach((image: ImboImageResponseInterface, index) => {

package/src/transformers/ooyyo.transformer.ts

@@ -48,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: await this.imageService.getImages(car, imboImages, this.configService.config.imageType),
+      pictures: await this.imageService.getImages(car, imboImages, this.configService.config.imageType, false),
       location: {
         city: toString(get(car, 'location.city', '')),
         postcode: toString(get(car, 'location.zipCode', '')),

package/src/transformers/rubrikk.transformer.ts

@@ -32,7 +32,7 @@ export class RubrikkTransformer {
   }): Promise<RubrikkXmlItem> {
     return {
       //Common Fields
-      ad__all_imageurls: await this.imageService.getImages(car, images, this.configService.config.imageType),
+      ad__all_imageurls: await this.imageService.getImages(car, images, this.configService.config.imageType, false),
       ad__condition_new_used_etc: this.getCondition(car),
       ad__description: toString(get(car, 'offer.offerDescription', '')),
       ad__headline: this.getTitle(car),

package/src/transformers/trovit.transformer.ts

@@ -0,0 +1,63 @@
+import { Injectable } from '@nestjs/common';
+
+import { ImboImageResponseInterface } from '@bytebrand/chunkable';
+import { DataSchemes } from '@bytebrand/car-schema';
+
+import { ConfigService, ImagesService, TransformerService, UserService } from '../services';
+import { TrovitXmlItem } from '../interfaces';
+import { get } from 'lodash';
+import { CarDescriptionFactory, DescriptionTypeEnum } from '@bytebrand/car-description';
+import { xmlStringReplacer } from '../utils';
+
+@Injectable()
+export class TrovitTransformer {
+  constructor(
+    private readonly configService: ConfigService,
+    private readonly imageService: ImagesService,
+    private readonly transformService: TransformerService,
+    private readonly userService: UserService,
+  ) {}
+
+  async transform({
+    car,
+    images,
+  }: {
+    car: DataSchemes.Car;
+    images: ImboImageResponseInterface[];
+  }): Promise<TrovitXmlItem> {
+    return {
+      id: { value: this.transformService.identifier(car) },
+      url: { value: this.transformService.link(car, 'source=classifieds&ampmedium=listing&ampcampaign=trovit') },
+      title: { value: xmlStringReplacer(this.transformService.title(car)) },
+      content: { value: xmlStringReplacer(await this.getDescription(car)) },
+      price: { value: this.transformService.price(car), atributes: { currency: 'EUR' } },
+      car_type: { value: this.transformService.bodyStyle(car) },
+      dealer: { value: 'auto.de Handels GmbH' },
+      postcode: { value: this.transformService.postCode(car) },
+      vin_database: { value: this.transformService.vinCode(car) },
+      make: { value: xmlStringReplacer(this.transformService.make(car)) },
+      model: { value: xmlStringReplacer(this.transformService.model(car)) },
+      color: { value: this.transformService.color(car) },
+      year: { value: this.transformService.year(car) },
+      mileage: { value: this.transformService.mileage(car) },
+      doors: { value: this.transformService.doors(car) },
+      seats: { value: this.transformService.seats(car) },
+      engine_size: { value: this.transformService.engineSizeInCCM(car), atributes: { unit: 'cc' } },
+      cylinders: { value: this.transformService.cylinders(car) },
+      fuel: { value: this.transformService.fuelType(car) },
+      transmission: { value: this.transformService.transmission(car) },
+      power: { value: this.transformService.powerPS(car), atributes: { unit: 'ps' } },
+      fuel_consumption: { value: this.transformService.fuelConsumption(car), atributes: { unit: 'l/100km' } },
+      co2_emissions: { value: this.transformService.cO2Emission(car), atributes: { unit: 'g/km' } },
+      pictures: await this.imageService.getImages(car, images, this.configService.config.imageType, true),
+      is_new: { value: this.transformService.isNewBoolean(car) },
+    };
+  }
+
+  private async getDescription(car: DataSchemes.Car): Promise<string> {
+    const dealerId = get(car, 'metaData.ownerId');
+    const descriptionSchema = await this.userService.getDefaultSummaryByDealerId(dealerId);
+    const descriptionBuilder = CarDescriptionFactory.create(DescriptionTypeEnum.Mobile, car);
+    return descriptionBuilder.transform(descriptionSchema);
+  }
+}

package/src/utils/converter.utils.ts

@@ -10,6 +10,6 @@ export function convertToCSV(data: unknown): string {
   return converted.join(';');
 }
 
-export const ampersandReplacer = (str: string): string => {
-  return typeof str === 'string' ? str.replace(/&/g, '&') : '';
+export const xmlStringReplacer = (str: string): string => {
+  return typeof str === 'string' ? str.replace(/&/g, '&amp;').replace(/[<>]/g, '') : '';
 };

package/dist/interfaces/autoborse.intreface.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=autoborse.intreface.js.map

package/dist/interfaces/autoborse.intreface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"autoborse.intreface.js","sourceRoot":"","sources":["../../src/interfaces/autoborse.intreface.ts"],"names":[],"mappings":""}

package/dist/interfaces/modix/modix-wrap-item.intreface.d.ts

@@ -1,6 +0,0 @@
-export interface IModixWrapItem {
-    value: string;
-    atributes?: {
-        [key: string]: any;
-    };
-}

package/dist/interfaces/modix/modix-wrap-item.intreface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"modix-wrap-item.intreface.js","sourceRoot":"","sources":["../../../src/interfaces/modix/modix-wrap-item.intreface.ts"],"names":[],"mappings":""}

package/src/interfaces/modix/modix-wrap-item.intreface.ts

@@ -1,6 +0,0 @@
-export interface IModixWrapItem {
-  value: string;
-  atributes?: {
-    [key: string]: any;
-  };
-}