@bytebrand/export-cars 1.26.35 → 1.26.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.26.35",
+  "version": "1.26.37",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -11,7 +11,7 @@
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "lint": "eslint -c .eslintrc.js --ext .ts src/",
     "start:dev": "nest start --watch",
-    "test": "ts-node --transpile-only test/google-feed-envkv.test.ts && ts-node --transpile-only test/google-feed-item-row.test.ts && ts-node --transpile-only test/publication-gate.test.ts && ts-node --transpile-only test/images-regression.test.ts && ts-node --transpile-only test/clean-images.test.ts && ts-node --transpile-only test/image-url-validator.test.ts && ts-node --transpile-only test/openai-image-fields.test.ts && ts-node --transpile-only test/openai-ads-mapping.test.ts && ts-node --transpile-only test/openai-ads-feed-run.test.ts && ts-node --transpile-only test/openai-ads-finance.test.ts && ts-node --transpile-only test/openai-ads-price-cap.test.ts && ts-node --transpile-only test/meinstadt-mapping.test.ts && ts-node --transpile-only test/meinstadt-feed-run.test.ts && ts-node --transpile-only test/autouncle-mapping.test.ts && ts-node --transpile-only test/autouncle-feed-run.test.ts"
+    "test": "ts-node --transpile-only test/google-feed-envkv.test.ts && ts-node --transpile-only test/google-feed-item-row.test.ts && ts-node --transpile-only test/publication-gate.test.ts && ts-node --transpile-only test/images-regression.test.ts && ts-node --transpile-only test/clean-images.test.ts && ts-node --transpile-only test/image-url-validator.test.ts && ts-node --transpile-only test/openai-image-fields.test.ts && ts-node --transpile-only test/openai-ads-mapping.test.ts && ts-node --transpile-only test/openai-ads-feed-run.test.ts && ts-node --transpile-only test/openai-ads-finance.test.ts && ts-node --transpile-only test/openai-ads-price-cap.test.ts && ts-node --transpile-only test/meinstadt-mapping.test.ts && ts-node --transpile-only test/meinstadt-feed-run.test.ts && ts-node --transpile-only test/autouncle-mapping.test.ts && ts-node --transpile-only test/autouncle-feed-run.test.ts && ts-node --transpile-only test/criteo-images.test.ts"
   },
   "dependencies": {
     "@bytebrand/autode-request": "^1.19.2",

package/src/exporters/criteo.exporter.ts

@@ -28,19 +28,24 @@ export class CriteoExporter implements Exporter {
 		await googleXmlBuilder.buildStart(this.configService.config.domain);
 
 		const criteoTransformer = await this.moduleRef.create(CriteoTransformer);
+		let withoutImage = 0;
 
 		await this.loaderService.process(async (chunk: FsChunkInterface) => {
 			chunk.data = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
 
 			for (const data of chunk.data) {
 				const car = await criteoTransformer.transform(data);
-				if (car)
+				if (car) {
 					await googleXmlBuilder.addItem(car);
+				} else {
+					withoutImage += 1;
+				}
 				this.carService.counter.countCar(data.images);
 			}
 		});
 
 		await googleXmlBuilder.buildEnd();
 		console.log(this.carService.counter.getCountedCars());
+		console.log(`criteo: ${withoutImage} cars skipped without a marketing image`);
 	}
 }

package/src/exporters/facebook-shop.exporter.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
-import { basename } from 'path';
 
 import { CronicleUtils } from '@bytebrand/cronicle-helper';
 import { FsChunkInterface } from '@bytebrand/chunkable';
@@ -25,9 +24,8 @@ export class FacebookShopExporter implements Exporter {
     await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
     await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
 
-    const selfUrl = `https://ftp.${this.configService.config.domain}/feeds/${basename(fileXml)}`;
     const facebookShopXmlBuilder = new FacebookShopXmlBuilder(fileXml);
-    await facebookShopXmlBuilder.buildStart(selfUrl);
+    await facebookShopXmlBuilder.buildStart();
 
     const facebookShopTransformer = await this.moduleRef.create(FacebookShopTransformer);
 

package/src/formats/facebook-shop.builder.ts

@@ -8,18 +8,17 @@ export class FacebookShopXmlBuilder extends XMLBuilderBase {
   // No xmlns:g / g: prefixes here — that namespace belongs to the old Google Merchant /
   // Facebook Shop product-catalog schema. Meta's Automotive Model Ads Vehicle Offers Feed
   // uses plain, undecorated tag names (see facebook-shop.builder field reference above).
-  async buildStart(selfUrl?: string): Promise<void> {
+  // Envelope is <listings>/<listing>, not RSS <rss><channel>/<item>: Meta Commerce Manager
+  // rejects the RSS form for a Vehicle Offers catalog as an invalid file format (ADV-369).
+  async buildStart(): Promise<void> {
     await this.write(
-      '<?xml version="1.0" encoding="utf-8"?>\n<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">' +
-        '\n<channel>\n<title>auto.de Vehicle Offers Feed</title>' +
-        '\n<description>Automotive Model Ads Vehicle Offers Feed für auto.de</description>' +
-        '\n<link>https://www.auto.de/</link>' +
-        `\n<atom:link href="${escape(selfUrl)}" rel="self" type="application/rss+xml" />\n`,
+      '<?xml version="1.0" encoding="utf-8"?>\n<listings>' +
+        '\n<title>auto.de Vehicle Offers Feed</title>\n',
     );
   }
 
   async addItem(car: FacebookShopItem): Promise<void> {
-    let item = '\n<item>\n';
+    let item = '\n<listing>\n';
 
     const { image, ...tags } = car;
 
@@ -32,7 +31,7 @@ export class FacebookShopXmlBuilder extends XMLBuilderBase {
       .map((url: string) => `<image><url>${escape(url)}</url></image>\n`)
       .join('');
 
-    item += '</item>';
+    item += '</listing>';
 
     await this.write(item);
   }
@@ -53,7 +52,7 @@ export class FacebookShopXmlBuilder extends XMLBuilderBase {
   }
 
   async buildEnd(): Promise<void> {
-    await this.write('\n</channel>\n</rss>\n');
+    await this.write('\n</listings>\n');
     await this.end();
   }
 }

package/src/transformers/criteo.transformer.ts

@@ -20,14 +20,19 @@ export class CriteoTransformer {
 		this.translator = new TranslatorExtended(dict);
 	}
 
-	async transform({ car, images }: { car: DataSchemes.Car; images: Array<any> }): Promise<CriteoXmlItem> {
+	// Returns null for a car without a real marketing image — such cars are not sent to Criteo
+	// (no noimage placeholders in the feed).
+	async transform({ car, images }: { car: DataSchemes.Car; images: Array<any> }): Promise<CriteoXmlItem | null> {
 		const carId = toString(get(car, '_id', ''));
 		const transformedImages = await this.imageService.getImages(
 			car,
 			images,
 			this.configService.config.imageType,
-			false,
+			true,
 		);
+		if (!transformedImages[0]) {
+			return null;
+		}
 
 		return {
 			id: carId,

package/test/criteo-images.test.ts

@@ -0,0 +1,54 @@
+// Run: npm test (ts-node, no test framework needed)
+// ADV-319: a car without a real Criteo marketing image is left out of the feed; no noimage placeholders.
+import * as assert from 'node:assert/strict';
+import { CriteoTransformer } from '../src/transformers/criteo.transformer';
+
+const car: any = {
+  _id: '00000000-0000-4000-8000-000000000001',
+  mainData: { make: 'Volkswagen', model: 'Golf', condition: 'selector_condition_used', category: 'selector_category_limousine' },
+  price: { currentSalesPrice: 19990 },
+  offer: { availabilityMode: 'selector_availabilityMode_always' },
+  metaData: { ownerId: 'test-dealer', imagesCount: 5 },
+};
+
+const makeTransformer = (images: string[]) => {
+  const calls: boolean[] = [];
+  const imageService: any = {
+    getImages: async (_car: any, _images: any, _type: any, ignoreDefImages: boolean) => {
+      calls.push(ignoreDefImages);
+      return images;
+    },
+  };
+  const configService: any = { config: { isCriteo: true, imageType: 'marketing', domain: 'autode-dev.de' } };
+  return { transformer: new CriteoTransformer({} as any, configService, imageService), calls };
+};
+
+const tests: Array<[string, () => Promise<void>]> = [
+  ['car with a marketing image is exported with it as image_link', async () => {
+    const url = 'https://images.autode-dev.de/generated_images/0/0/0/00000000-0000-4000-8000-000000000001/criteo-Test.jpg';
+    const { transformer, calls } = makeTransformer([url]);
+    const item = await transformer.transform({ car, images: [] });
+    assert.equal(item?.image_link, url);
+    assert.equal(item?.id, car._id);
+    assert.deepEqual(calls, [true]);
+  }],
+  ['car without a marketing image is skipped and placeholders are never requested', async () => {
+    const { transformer, calls } = makeTransformer([]);
+    assert.equal(await transformer.transform({ car, images: [] }), null);
+    assert.deepEqual(calls, [true]);
+  }],
+];
+
+(async () => {
+  let failed = 0;
+  for (const [name, fn] of tests) {
+    try {
+      await fn();
+      console.log(`ok   ${name}`);
+    } catch (e) {
+      failed += 1;
+      console.error(`FAIL ${name}\n     ${e.message}`);
+    }
+  }
+  if (failed) process.exit(1);
+})();