@bytebrand/export-cars 1.26.12 → 1.26.14

package/dist/utils/converter.utils.d.ts

@@ -1,3 +1,4 @@
 export declare function convertToCSV(data: unknown): string;
 export declare const xmlStringReplacer: (str: string) => string;
+export declare function normalizeFeedText(text: string): string;
 export declare function parseCsvToObjects<T>(csv: string): T[];

package/dist/utils/converter.utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCsvToObjects = exports.xmlStringReplacer = exports.convertToCSV = void 0;
+exports.parseCsvToObjects = exports.normalizeFeedText = exports.xmlStringReplacer = exports.convertToCSV = void 0;
 const lodash_1 = require("lodash");
 function convertToCSV(data) {
     const converted = [];
@@ -16,6 +16,16 @@ const xmlStringReplacer = (str) => {
     return typeof str === 'string' ? str.replace(/&/g, '&amp;').replace(/[<>]/g, '') : '';
 };
 exports.xmlStringReplacer = xmlStringReplacer;
+const DISALLOWED_TEXT_CHARS = /[^\p{L}\p{N} .,\-/()%"°]/gu;
+const EDGE_SEPARATORS = /^[\s.,\-/]+|[\s.,\-/]+$/g;
+function normalizeFeedText(text) {
+    return (text || '')
+        .replace(DISALLOWED_TEXT_CHARS, ' ')
+        .replace(/([.,\-/])\1+/g, '$1')
+        .replace(/\s+/g, ' ')
+        .replace(EDGE_SEPARATORS, '');
+}
+exports.normalizeFeedText = normalizeFeedText;
 function parseCsvToObjects(csv) {
     const rows = [];
     let row = [];

package/dist/utils/converter.utils.js.map

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

package/package.json

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

package/src/exporters/fb.exporter.ts

@@ -8,6 +8,11 @@ import { FbXmlBuilder } from '../formats/fb-xml.builder';
 import { ModuleRef } from '@nestjs/core';
 import { FbTransformer } from '../transformers/fb.transformer';
 import { FbXmlItem } from '../interfaces';
+import { META_PUSH_PRIORITY_ALLOWED_VALUES, META_PUSH_PRIORITY_STANDARD } from '../constants/fb.constants';
+
+// dealer_priority_1 first, then dealer_priority_2, then everyone else (standard/unlisted) —
+// mirrors the CSV's own priority tiers (see MappingService.getMetaPushPriorityMapping).
+const PRIORITY_ORDER = [...META_PUSH_PRIORITY_ALLOWED_VALUES, META_PUSH_PRIORITY_STANDARD];
 
 @Injectable()
 export class FbExporter implements Exporter {
@@ -29,6 +34,12 @@ export class FbExporter implements Exporter {
 
     const fbTransformer = await this.moduleRef.create(FbTransformer);
 
+    // Buffered (not streamed straight to XML) so the whole feed can be sorted by dealer
+    // priority before writing — see the sort below. FbXmlItem doesn't declare custom_label_4
+    // (that interface predates ADV-159/161); the transformer always sets it, so extend locally
+    // rather than touching the shared interface other export types also cast through.
+    const cars: (FbXmlItem & { custom_label_4: string })[] = [];
+
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
       const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
       chunk.data = null;
@@ -42,15 +53,24 @@ export class FbExporter implements Exporter {
         console.timeEnd(`Transform ${data.car._id}`);
 
         if (!car) {
-          console.log(`Skip car ${data.car._id} because it has no real images`);
+          console.log(`Skip car ${data.car._id} — no real images`);
           continue;
         }
 
-        await fbXmlBuilder.addItem(car as FbXmlItem);
+        cars.push(car as FbXmlItem & { custom_label_4: string });
         this.carService.counter.countCar(data.images);
       }
     });
 
+    // ADV-161-follow-up: order by the meta push priority sheet (metaPushPriorityCsvUrl)
+    // instead of filtering non-listed dealers out — dealer_priority_1 first, then
+    // dealer_priority_2, then everyone else, in whatever order they were transformed.
+    cars.sort((a, b) => PRIORITY_ORDER.indexOf(a.custom_label_4) - PRIORITY_ORDER.indexOf(b.custom_label_4));
+
+    for (const car of cars) {
+      await fbXmlBuilder.addItem(car);
+    }
+
     await fbXmlBuilder.buildEnd();
     console.log(this.carService.counter.getCountedCars());
   }

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

@@ -46,13 +46,8 @@ export class FbDescription {
             key: get(this.car, 'engineData.cylinders', '') as string,
           },
         },
-        {
-          title: 'accordion.captionCapacity',
-          value: {
-            key: 'title.cubicCapacity',
-            data: { cubicCapacity: get(this.car, 'engineData.cubicCapacity') },
-          },
-        },
+        // "Hubraum" is not exported: the value key resolved to the label itself
+        // (title.cubicCapacity === "Hubraum"), so every listing read "Hubraum: Hubraum".
         {
           title: 'accordion.captionPower',
           value: {
@@ -166,12 +161,8 @@ export class FbDescription {
             },
           },
         },
-        {
-          title: 'title.base',
-          value: {
-            key: get(this.car, 'driveSuspension.wheelBase', '') as string,
-          },
-        },
+        // "Radstand" is not exported: driveSuspension.wheelBase is stored as null across the
+        // catalogue, so every listing read "Radstand: ;".
         {
           title: 'title.loadingVolume',
           value: {

package/src/transformers/fb.transformer.ts

@@ -1,7 +1,6 @@
 import { Cache } from 'cache-manager';
 import * as moment from 'moment';
 import {
-  escape,
   findIndex,
   get,
   includes,
@@ -12,7 +11,6 @@ import {
   join,
   toSafeInteger,
   toString,
-  trim,
   truncate,
 } from 'lodash';
 
@@ -30,15 +28,15 @@ import { Description } from '../interfaces/description.interface';
 import { FbDescription } from './fb-description.transformer';
 import { ConfigService, ImagesService, MappingService } from '../services';
 import { FbEquipment } from './fb-equipment.transformer';
-import { isValidVin } from '../utils';
+import { isValidVin, normalizeFeedText } from '../utils';
 import { UserService } from 'src/services';
-import { ImageType } from '../enums';
 import {
   DEFAULT_ADDR1,
   DEFAULT_CITY,
   DEFAULT_ZIP,
   FB_MAX_TRIM_LENGTH,
   FB_MIN_MILEAGES,
+  META_AIA_MODE_FINANCING,
   META_PUSH_PRIORITY_ALLOWED_VALUES,
   META_PUSH_PRIORITY_STANDARD,
   TIMESTAMP_FIRST_YEAR,
@@ -74,10 +72,12 @@ export class FbTransformer {
     images: ImboImageResponseInterface[];
     owner: unknown;
   }): Promise<unknown> {
-    // ignoreDefImages=true: cars with no real photos must be excluded, not padded with
-    // placeholders (matches facebook-shop.transformer.ts's AMA feed policy).
-    const image_links = await this.imagesService.getImages(car, images, ImageType.marketing, true);
-    if (!image_links.length) {
+    // Meta AIA financing overlay is the ONLY image this feed ships — same HEAD-checked path as
+    // the AMA facebook-shop feed. getMetaAiaImage returns null when the car has no eligible photo
+    // OR the composite hasn't actually been rendered/landed on the CDN yet, so every exported item
+    // is guaranteed a real, existing image (no placeholders, no 404s, no zero-image cars).
+    const metaAiaImage = await this.imagesService.getMetaAiaImage(car._id, images, META_AIA_MODE_FINANCING);
+    if (!metaAiaImage) {
       return null;
     }
 
@@ -107,7 +107,7 @@ export class FbTransformer {
       make: toString(get(car, 'mainData.make', '')),
       model: toString(get(car, 'mainData.model', '')),
       trim: this.getTrim(car),
-      image: image_links.slice(0, 20), // Meta caps the whole image array at 20 items
+      image: [metaAiaImage], // single Meta AIA financing overlay, per feed spec
       year: toString(year),
       mileage: {
         value: this.getMileage(car),
@@ -188,18 +188,23 @@ export class FbTransformer {
   }
 
   private getTitle(car: DataSchemes.Car): string {
-    let year = toString(get(car, 'mainData.constructionYear', ''));
-    if (year === '0') {
-      year = '';
-    }
+    // mainData.constructionYear holds a raw epoch for part of the catalogue — the same
+    // corruption getFirstValidYear() already guards <year> against. Without the guard titles
+    // ship as "1609459200 Ford Galaxy …"; an invalid year is dropped instead.
+    const year = toString(getFirstValidYear(toString(get(car, 'mainData.constructionYear', ''))));
     const make = toString(get(car, 'mainData.make', ''));
     const model = toString(get(car, 'mainData.model', ''));
     const subModel = toString(get(car, 'mainData.subModel', ''));
-    return trim(escape(join([year, make, model, subModel], ' ')));
+    // No escape() here: FbXmlBuilder writes <title> inside CDATA, so HTML entities are not
+    // decoded by the consumer and leak literally ("Monte Carlo &amp; KESSY").
+    return normalizeFeedText(join([year, make, model, subModel], ' '));
   }
 
   private getTrim(car: DataSchemes.Car): string {
-    const trim = toString(get(car, 'mainData.subModel', ''));
+    // Same subModel source as the title, so it needs the same cleanup. Normalise before
+    // truncating: on the raw string the cut could land mid-junk, and lodash's "..." omission
+    // marker would then be collapsed by the repeated-separator rule.
+    const trim = normalizeFeedText(toString(get(car, 'mainData.subModel', '')));
     return truncate(trim, { length: FB_MAX_TRIM_LENGTH, separator: ' ' });
   }
 

package/src/utils/converter.utils.ts

@@ -14,6 +14,25 @@ export const xmlStringReplacer = (str: string): string => {
   return typeof str === 'string' ? str.replace(/&/g, '&amp;').replace(/[<>]/g, '') : '';
 };
 
+// Dealer-supplied subModel strings are full of decorative punctuation ("*AHK*Leder*Navi*",
+// "|ACC|PANO/AHK", "#PANO #NAVI #SONY #", "Head-Up+B&O+ACC") which must not reach Meta. Keep
+// letters, digits and the punctuation that carries meaning in German trim names — "." "," "-"
+// "/" "(" ")" "%", "°" (360° Kamera) and '"' (Zoll). Everything else, "&" included, becomes a
+// space rather than being deleted, so neighbouring words never fuse ("B&O" -> "B O").
+const DISALLOWED_TEXT_CHARS = /[^\p{L}\p{N} .,\-/()%"°]/gu;
+// Leading/trailing separators only; '"' and "%" are legitimate endings (`LM18"`, `-35%`).
+const EDGE_SEPARATORS = /^[\s.,\-/]+|[\s.,\-/]+$/g;
+
+// Applies to the free-text feed fields only (title, trim). URLs, dealer_email and dealer_phone
+// carry "/" ":" "@" "+" as load-bearing characters and must never be run through this.
+export function normalizeFeedText(text: string): string {
+  return (text || '')
+    .replace(DISALLOWED_TEXT_CHARS, ' ')
+    .replace(/([.,\-/])\1+/g, '$1') // "L4H2 //Klimaanlage" -> "L4H2 /Klimaanlage"
+    .replace(/\s+/g, ' ')
+    .replace(EDGE_SEPARATORS, '');
+}
+
 // Parses a "Publish to web" Google Sheets CSV export (RFC4180-ish, quoted fields may
 // contain commas/newlines) into row arrays, then maps rows to objects keyed by header.
 export function parseCsvToObjects<T>(csv: string): T[] {