@bytebrand/export-cars 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -65,5 +65,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "d5ac6fed61ba0e2f5a476b547a1b039fb97e881a"
+  "gitHead": "61c542cb69c0f3b94250dc2ac4b30b47b29b170a"
 }

package/src/config/kleinanzeigeFocus.config.ts

@@ -7,6 +7,6 @@ export class KleinanzeigeFocusConfig extends Config {
     this.pathesConfig.localConvertedDirectory = this.environmentConfig[params.environment].localConvertedDirectory;
     this.pathesConfig.remoteDirectory = this.environmentConfig[params.environment].remoteDirectory;
     this.imageUrl = this.environmentConfig[params.environment].imageUrl;
-    this.outputFiles = ['api_export_cars_RUBRIKK.xml', 'autode.tar.gz'];
+    this.outputFiles = ['api_export_cars_focus.xml'];
   }
 }

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

@@ -164,15 +164,9 @@ export interface RubrikkXmlItem {
   advertiser__email: string;
   advertiser__name_company_name: string;
   advertiser__phone: string;
-  advertiser__type: string;
-  advertiser__company_employee: string;
-  location__abroad_region: string;
   location__country: string;
   location__municipality_city: string;
   location__zip_postal_code: string;
-  location__streetaddress: string;
-  location__latitude: number;
-  location__longitude: number;
   motoring__body_type: string;
   motoring__color: string;
   motoring__drivetrain: string;

package/src/transformers/rubrikk.transformer.ts

@@ -1,7 +1,6 @@
 import { escape, get, isEmpty, join, toNumber, toSafeInteger, toString, trim } from 'lodash';
 import { Injectable } from '@nestjs/common';
 
-import { DePostalCodesEntryInterface } from '@bytebrand/car-basic-data-scope/dist/interfaces/DePostalCodesInterface';
 import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictionaries';
 import { DePostalCodesService } from '@bytebrand/car-basic-data-scope';
 import { TranslatorExtended } from '@bytebrand/schema-tools';
@@ -32,8 +31,6 @@ export class RubrikkTransformer {
     images: ImboImageResponseInterface[];
   }): Promise<RubrikkXmlItem> {
     const autodeId = toString(get(car, '_id', ''));
-    const region = await this.getRegion(car);
-    const { longitude, latitude } = await this.getCoords(car);
 
     return {
       //Common Fields
@@ -50,8 +47,8 @@ export class RubrikkTransformer {
       ad__number_ad__number_reference_id: toString(get(car, 'metaData.vehicleId', '')),
 
       //Categorization
-      category_original: 'Vehicles',
-      maincategory_original: 'Cars',
+      category_original: 'Autos',
+      maincategory_original: 'Fahrzeuge',
 
       //Advertiser Info
       advertiser__company_homepage_url: 'https://www.auto.de',
@@ -59,34 +56,28 @@ export class RubrikkTransformer {
         'https://autode-static.de/wp-content/themes/autode/front/img/header/b_logo_autode.svg',
       advertiser__email: 'auto@auto.de',
       advertiser__name_company_name: 'Auto.de',
-      advertiser__phone: '+498000008300',
-      advertiser__type: 'Dealer',
-      advertiser__company_employee: 'auto.de',
+      advertiser__phone: '+498004030182',
 
       // Geography Info
-      location__abroad_region: region,
       location__country: 'Deutschland',
       location__municipality_city: get(car, 'location.city', ''),
       location__zip_postal_code: toString(get(car, 'location.zipCode', '')),
-      location__streetaddress: this.getStreetAddress(car),
-      location__longitude: longitude,
-      location__latitude: latitude,
 
       // Motoring Fields
       motoring__body_type: this.translateSelector(get(car, 'mainData.category', '')),
       motoring__color: this.getColor(car),
-      motoring__drivetrain: this.getDrivetrain(car),
+      motoring__drivetrain: this.getDriveType(car),
       motoring__emission_class: this.translateSelector(get(car, 'environmentEmissions.emissionClass', '')),
       motoring__emission_co2: get(car, 'environmentEmissions.co2', null),
       motoring__emission_co2_unit: 'g/km',
       motoring__emission_sticker: this.translateSelector(get(car, 'environmentEmissions.emissionSticker', '')),
       motoring__engine_displacement_cubic_centimeters: toNumber(get(car, 'engineData.cubicCapacity', null)),
       motoring__fuel_consumption_combined: get(car, 'consumption.consumptionCombined', null),
-      motoring__fuel_consumption_combined_unit: 'l',
+      motoring__fuel_consumption_combined_unit: this.getUrbanUnit(car),
       motoring__fuel_consumption_extra_urban: get(car, 'consumption.consumptionOuter', null),
-      motoring__fuel_consumption_extra_urban_unit: 'l',
+      motoring__fuel_consumption_extra_urban_unit: this.getUrbanUnit(car),
       motoring__fuel_consumption_urban: get(car, 'consumption.consumptionInner', null),
-      motoring__fuel_consumption_urban_unit: 'l',
+      motoring__fuel_consumption_urban_unit: this.getUrbanUnit(car),
       motoring__fuel_type: this.translateSelector(get(car, 'consumption.fuel', '')),
       motoring__make: toString(get(car, 'mainData.make', '')),
       motoring__mileage_kilometers: get(car, 'mainData.mileage', null),
@@ -100,6 +91,11 @@ export class RubrikkTransformer {
     };
   }
 
+  private getUrbanUnit(car: DataSchemes.Car) {
+    const fuel_type = this.translateSelector(get(car, 'consumption.fuel', ''));
+    return fuel_type === 'Elektro' ? 'kWt/100km' : 'l/100km';
+  }
+
   private translateSelector(selector: string): string {
     if (isEmpty(selector) || selector === 'selector_unknown') {
       return '';
@@ -130,20 +126,20 @@ export class RubrikkTransformer {
 
   private getCarLink(car: DataSchemes.Car): string {
     const autodeId = toString(get(car, '_id', ''));
-    return `https://www.${this.configService.config.url}/search/vehicle/${autodeId}?source=classifieds&medium=listing&campaign=focus`;
+    return `https://${this.configService.config.url}/search/vehicle/${autodeId}?source=classifieds&medium=listing&campaign=focus`;
   }
 
   private getImageLink(car: DataSchemes.Car): string {
     const mainImageId = get(car, 'metaData.mainImageId', '');
     return mainImageId
-      ? `https://images.auto.de/carimage/${car._id}/${mainImageId}/large-cached.webp`
-      : 'https://images.auto.de/carimage/noimage/7pNvWELuWhZX/large-cached.jpeg';
+      ? `${this.configService.config.imageUrl}carimage/${car._id}/${mainImageId}/large-cached.webp`
+      : `${this.configService.config.imageUrl}/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.url}/carimage/${carId}/${image.imageIdentifier}/large`;
+        return `https://${this.configService.config.url}/carimage/${carId}/${image.imageIdentifier}/large`;
       });
     }
     return [];
@@ -167,64 +163,23 @@ export class RubrikkTransformer {
     return get(available, energyClass);
   }
 
-  private getStreetAddress(car: DataSchemes.Car): string {
-    const street = get(car, 'location.street', '');
-    const streetNumber = get(car, 'location.streetNumber', '');
-    return trim(escape(join([street, streetNumber], ' ')));
-  }
-
-  private async getRegion(car: DataSchemes.Car): Promise<string> {
-    const city: string = get(car, 'location.city', '');
-    const zipCode: number = toNumber(get(car, 'location.zipCode', ''));
-
-    const locationEntity = await this.getLocationByInfo({ city, zip: toSafeInteger(zipCode) });
-    return get(locationEntity, 'Place Name', 'Deutschland');
-  }
-
-  private async getCoords(car: DataSchemes.Car): Promise<Pick<DataSchemes.Location, 'latitude' | 'longitude'>> {
-    const city: string = get(car, 'location.city', '');
-    const zipCode: number = toNumber(get(car, 'location.zipCode', ''));
-    const locationEntity = await this.getLocationByInfo({ city, zip: toSafeInteger(zipCode) });
-
-    const data: Pick<DataSchemes.Location, 'latitude' | 'longitude'> = {
-      latitude: get(car, 'location.latitude'),
-      longitude: get(car, 'location.longitude'),
-    };
-
-    if (data.latitude && data.longitude) return data;
-
-    return {
-      longitude: get(locationEntity, 'Longitude'),
-      latitude: get(locationEntity, 'Latitude'),
-    };
-  }
-
-  private async getLocationByInfo(info: { zip: number; city: string }): Promise<DePostalCodesEntryInterface> {
-    let entry: DePostalCodesEntryInterface = await this.postalCodesService.getLocationByPostalCode(info.zip);
-
-    if (!entry) {
-      entry = await this.postalCodesService.getLocationByCity(info.city);
-    }
-    return entry;
-  }
-
   private getColor(car: DataSchemes.Car): string {
-    let colorSelection = get(car, 'exterior.exteriorColor', 'other');
+    let colorSelection = get(car, 'exterior.exteriorColor', 'selector_unknown');
     if (!colorSelection || colorSelection === 'selector_unknown') {
-      colorSelection = 'other';
+      colorSelection = 'selector_unknown';
     }
     return this.translator.translateVal(colorSelection);
   }
 
   private getDrivetrain(car: DataSchemes.Car): string {
     const available = {
-      selector_unknown: 'Other',
-      selector_driveType_frontWheelDrive: 'FWD',
-      selector_driveType_rearWheelDrive: 'RWD',
-      selector_driveType_allWheelDrive: 'AWD',
+      selector_gearbox_manualShift: 'Manual',
+      selector_gearbox_semiAutomatic: 'Automatic',
+      selector_gearbox_automatic: 'Automatic',
+      selector_unknown: 'N/A',
     };
-    const driveType = get(car, 'driveSuspension.driveType', 'selector_unknown');
-    return get(available, driveType);
+    const transmission = get(car, 'driveSuspension.gearbox', 'selector_unknown');
+    return get(available, transmission);
   }
 
   private getYear(car: DataSchemes.Car): number {
@@ -234,4 +189,16 @@ export class RubrikkTransformer {
     }
     return 0;
   }
+
+  private getDriveType(car: DataSchemes.Car): string {
+    const available = {
+      selector_unknown: 'N/A',
+      selector_driveType_frontWheelDrive: 'FWD',
+      selector_driveType_rearWheelDrive: 'RWD',
+      selector_driveType_allWheelDrive: 'AWD',
+    };
+
+    const driveType = get(car, 'driveSuspension.driveType', 'selector_unknown');
+    return get(available, driveType) || 'N/A';
+  }
 }