@bytebrand/export-cars 1.22.19 → 1.22.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.22.19",
+  "version": "1.22.21",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",

package/src/formats/google-xml.builder.ts

@@ -62,10 +62,11 @@ export class GoogleXmlBuilder extends XMLBuilderBase {
     </g:${rootTag}>`;
   }
 
-  private getInstallmentElement(rootTag: string, data: { paybackPeriod: string; monthlyInstallment: string }): string {
+  private getInstallmentElement(rootTag: string, data: { paybackPeriod: string; monthlyInstallment: string; apr?: string }): string {
     return `<g:${rootTag}>
       <g:months>${data.paybackPeriod}</g:months>
-      <g:amount>${data.monthlyInstallment} EUR</g:amount>
+      <g:amount>${data.monthlyInstallment} EUR</g:amount>${data.apr ? `
+      <g:apr>${data.apr}</g:apr>` : ''}
     </g:${rootTag}>`;
   }
 

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

@@ -172,13 +172,13 @@ export interface GoogleXmlItem {
   sale_price?: string;
   availability?: string;
   energy_efficiency_class?: string;
-  installment?: { paybackPeriod: any; monthlyInstallment: any };
+  installment?: { paybackPeriod: any; monthlyInstallment: any; apr: string };
 
   vehicle_fulfillment: {
     option: string;
     store_code: string;
   };
-  certification: {
+  certification?: {
     certification_authority: string;
     certification_name: string;
     certification_code?: string;
@@ -187,16 +187,18 @@ export interface GoogleXmlItem {
   link_template: string;
   additional_image_link: string[];
   model: string;
-  VIN: string;
+  VIN?: string;
   trim: string;
   year: number;
   mileage: string;
   vehicle_option: string[];
-  body_style: string,
+  body_style?: string,
   engine: string,
   date_first_registered: string,
   fuel_consumption: string,
-  energy_consumption: string,
+  energy_consumption?: string,
+  electric_range?: string,
+  fuel_consumption_discharged_battery?: string,
   co2_emissions: string,
   identifier_exists: string,
   ads_redirect?: string;

package/src/transformers/google.transformer.ts

@@ -7,6 +7,7 @@ import { ImboImageResponseInterface } from '@bytebrand/chunkable';
 import { Injectable } from '@nestjs/common';
 import { ConfigService, ImagesService, TransformerService, UserService } from '../services';
 import { GoogleXmlItem } from '../interfaces';
+import { isValidVin } from '../utils';
 import moment from 'moment';
 
 const GOOGLE_MAX_TRIM_LENGTH = 50;
@@ -50,20 +51,16 @@ export class GoogleTransformer {
       ...transformedImages.feat
     ]
 
-    return {
+    const item: GoogleXmlItem = {
       google_product_category: '916',
       vehicle_fulfillment: {
         option: 'online',
         store_code: 'Online_shop'
       },
-      certification: {
-        certification_authority: 'BMWK',
-        certification_name: 'Vehicle_CO2_Class',
-        certification_value: `${this.getEnergyClass(car)}`
-      },
+      certification: this.getCertification(car),
       title: this.getTitle(car),
       product_type: this.getCategory(car),
-      VIN: this.transformService.vinCode(car),
+      VIN: this.getVin(car),
       id: carId,
       image_link: allImages[0],
       additional_image_link: allImages.slice(1, 10),
@@ -84,7 +81,9 @@ export class GoogleTransformer {
       engine: this.mapFuel(car),
       date_first_registered: this.getDateFirstRegistered(car),
       fuel_consumption: `${this.transformService.fuelConsumption(car)}l/100km`,
-      energy_consumption: this.getWLTP(car),
+      energy_consumption: this.getEnergyConsumption(car),
+      electric_range: this.getElectricRange(car),
+      fuel_consumption_discharged_battery: this.getFuelConsumptionDischargedBattery(car),
       co2_emissions: `${this.transformService.cO2Emission(car)}g/km`,
       description: this.processText((await this.getDescription(car))),
       identifier_exists: 'no',
@@ -101,18 +100,41 @@ export class GoogleTransformer {
       installment: this.getInstallment(car),
       // custom_label_0: `${this.getInstallment(car)} EUR mtl.`,
     };
+
+    // Google rejects empty/partial values — getElement() emits `<tag/>` for falsy
+    // values, which Merchant treats as "missing". Drop optional attributes that have
+    // no data (certification when CO2 class unknown, EV-only metrics on non-EV cars,
+    // installment when APR is missing) instead of emitting empty tags.
+    const optionalKeys: Array<keyof GoogleXmlItem> = [
+      'certification',
+      'energy_consumption',
+      'electric_range',
+      'fuel_consumption_discharged_battery',
+      'installment',
+      'VIN',
+      'body_style',
+    ];
+    for (const key of optionalKeys) {
+      if (!item[key]) {
+        delete item[key];
+      }
+    }
+
+    return item;
   }
 
   private checkCarValidity(car: DataSchemes.Car, images: ImboImageResponseInterface[]) {
     if (images.length === 0)
       return false
 
-    if (!this.mapBodyStyle(car))
-      return false
-
     return true
   }
 
+  private getVin(car: DataSchemes.Car): string | undefined {
+    const vin = get(car, 'metaData.vin', '');
+    return isValidVin(vin) ? vin : undefined;
+  }
+
   private getTitle(car: DataSchemes.Car): string {
     const model = toString(get(car, 'mainData.model', ''));
     const brand = trim(this.getBrand(car));
@@ -240,16 +262,62 @@ export class GoogleTransformer {
     };
     const energyClass = get(car, 'environmentEmissions.energyEfficiencyClass', 'selector_unknown');
     const value = get(available, energyClass);
-    return value.replace(/\+/g, '');
+    return value ? value.replace(/\+/g, '') : '';
+  }
+
+  private getCertification(car: DataSchemes.Car) {
+    const value = this.getEnergyClass(car);
+    if (!value || value === 'default') {
+      return undefined;
+    }
+    return {
+      certification_authority: 'BMWK',
+      certification_name: 'Vehicle_CO2_Class',
+      certification_value: value,
+    };
+  }
+
+  private getEnergyConsumption(car: DataSchemes.Car): string | undefined {
+    const fuel = get(car, 'consumption.fuel');
+    const isElectricOrHybrid =
+      ['selector_fuel_electrical', 'selector_fuel_hybridElectricalPetrol', 'selector_fuel_hybridElectricalDiesel'].includes(fuel) ||
+      !!get(car, 'engineData.hybridPlugin');
+    if (!isElectricOrHybrid) {
+      return undefined;
+    }
+    const power = get(car, 'consumption.wltpPowerCombined') || get(car, 'consumption.consumptionPowerCombined');
+    return power ? `${power}kWh/100km` : undefined;
+  }
+
+  private getElectricRange(car: DataSchemes.Car): string | undefined {
+    const range = get(car, 'battery.batteryRangeElectric') || get(car, 'battery.wltpRange');
+    return range ? `${range}km` : undefined;
+  }
+
+  private getFuelConsumptionDischargedBattery(car: DataSchemes.Car): string | undefined {
+    if (!get(car, 'engineData.hybridPlugin')) {
+      return undefined;
+    }
+    const consumption = get(car, 'consumption.consumptionCombined') || get(car, 'consumption.wltpCombined');
+    return consumption ? `${consumption}l/100km` : undefined;
   }
 
   private getInstallment(car: DataSchemes.Car) {
     const monthlyInstallment = round(get(car, 'rate.monthlyInstallment', null));
     const paybackPeriod = round(get(car, 'rate.paybackPeriod', null));
+    const apr = toString(get(car, 'financing.annualPercentageRate', '')).trim();
+
+    // Google requires `apr` inside the installment block; a partial installment
+    // block (without apr) makes Google reject the whole attribute. If financing
+    // data is incomplete, omit installment entirely so the rest of the item stays valid.
+    if (!monthlyInstallment || !paybackPeriod || !apr) {
+      return undefined;
+    }
 
     return {
       paybackPeriod,
       monthlyInstallment,
+      apr,
     };
   }
 
@@ -280,7 +348,7 @@ export class GoogleTransformer {
       selector_unknown: 'Other',
     };
     const fuel = get(car, 'consumption.fuel', 'selector_unknown');
-    let engine = get(available, fuel)
+    let engine = get(available, fuel, 'Other')
     const hybridPlugin = car?.engineData?.hybridPlugin;
     if (engine === 'Hybrid' && hybridPlugin)
       engine = 'plug-in_hybrid';