@bytebrand/export-cars 1.26.5 → 1.26.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.26.5",
+  "version": "1.26.7",
   "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} — no real images, or dealer ${ownerId} not in the priority list`);
+          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/services/images.service.ts

@@ -85,8 +85,6 @@ export class ImagesService {
     'https://images.auto.de/carimage/noimage/pFyfBsqBHEso/large-cached.jpeg',
   ];
 
-  private hasLoggedMarketingImageDebug = false;
-
   constructor(private readonly configService: ConfigService, private readonly userService: UserService) { }
 
   async getImages(car: DataSchemes.Car, images: ImboImageResponseInterface[], imageType: ImageType, ignoreDefImages: boolean): Promise<Array<string>> {
@@ -191,27 +189,17 @@ export class ImagesService {
       return ignoreDefImages ? [] : [...this.DEFAULT_IMAGES];
     }
 
-    // marketingImageUrl (config.ts environmentConfig[env].imageUrl) points at /cache_test on
-    // dev — a leftover from the old "fb" channel, not where image-generator publishes meta_aia
-    // composites (always under /generated_images on both dev and prod). Build the meta_aia base
-    // from the plain image host instead of trusting that per-env path.
+    // marketingImageUrl AND config.imageUrl (FbConfig overrides the latter to the same
+    // per-env value right after super()) both point at the old "fb" channel's base path
+    // (/cache_test on dev, already /generated_images on prod) — not where image-generator
+    // publishes meta_aia composites. baseImageUrl is the one field neither Config nor FbConfig
+    // ever suffixes with a path, so it's the only safe base to build /generated_images on.
     const imageUrl = config.channelCode === 'meta_aia'
-      ? `${this.configService.config.imageUrl}/generated_images`
+      ? `${this.configService.config.baseImageUrl}/generated_images`
       : this.configService.config.marketingImageUrl;
 
     const marketingImageConfigs = config.marketingImages.map(i => ({ marketingImageCodes: i.imageCodes }));
 
-    if (this.configService.config.exportType === ExportType.FB && !this.hasLoggedMarketingImageDebug) {
-      this.hasLoggedMarketingImageDebug = true;
-      console.log(
-        'getMarketingImages debug —',
-        'config.id:', config.id,
-        'config.channelCode:', config.channelCode,
-        'requested imageCodes per slot:', JSON.stringify(marketingImageConfigs.map(c => c.marketingImageCodes)),
-        'photo codes available on this car:', JSON.stringify(Object.keys(transformedImages)),
-      );
-    }
-
     const imageWithUrls: Partial<ImboImageResponseInterface & { url: string }>[] = [];
     for (let i = 0; i < marketingImageConfigs.length; i++) {
       const marketingImage = marketingImageConfigs[i];
@@ -219,15 +207,9 @@ export class ImagesService {
         const imageCode = marketingImage.marketingImageCodes[i];
         const imageId = transformedImages[imageCode];
         if (imageId) {
-          const url = this.getImagePathWithExtension(imageUrl, carId, imageId, config);
-          // meta_aia cards are composited async and may not exist yet for a given car —
-          // verify the file is real before publishing the link, not just the placeholder.
-          if (config.channelCode === 'meta_aia' && !(await this.imageExists(url))) {
-            break;
-          }
           imageWithUrls.push({
             imageCodePredicted: imageCode,
-            url,
+            url: this.getImagePathWithExtension(imageUrl, carId, imageId, config),
           });
           break;
         }
@@ -244,22 +226,6 @@ export class ImagesService {
     return imageWithUrls.map(i => i.url);
   }
 
-  // Imbo serves a 400x300 JPEG placeholder (measured 7996 bytes on both auto.de and
-  // autode-dev.de) with a 404 status when a transformation isn't ready yet. nginx in front of
-  // Imbo has been seen caching that placeholder body regardless of status code (see
-  // nginx-image-cache-negative-caching), so check Content-Length rather than trusting the
-  // HTTP status alone.
-  private readonly PLACEHOLDER_MAX_BYTES = 8000;
-
-  private async imageExists(url: string): Promise<boolean> {
-    try {
-      const { status, headers } = await axios.head(url, { timeout: 5000 });
-      return status === 200 && Number(headers['content-length'] ?? 0) > this.PLACEHOLDER_MAX_BYTES;
-    } catch {
-      return false;
-    }
-  }
-
   private transformImagesArrayIntoObject(images: ImboImageResponseInterface[]): { [imageCode: string]: string } {
     return images.reduce((result, image) => {
       const imageCode = image?.imageCodePredicted?.split('-')[0];

package/src/transformers/fb.transformer.ts

@@ -32,7 +32,7 @@ import { ConfigService, ImagesService, MappingService } from '../services';
 import { FbEquipment } from './fb-equipment.transformer';
 import { isValidVin } from '../utils';
 import { UserService } from 'src/services';
-import { Environment, ImageType } from '../enums';
+import { ImageType } from '../enums';
 import {
   DEFAULT_ADDR1,
   DEFAULT_CITY,
@@ -84,17 +84,6 @@ export class FbTransformer {
     const autodeId = toString(get(car, '_id', ''));
     const year = this.getYear(car);
     const ownerId = get(car, 'metaData.ownerId', null);
-
-    // ADV-161-follow-up: on prod, only publish dealers listed in the meta push priority sheet
-    // (metaPushPriorityCsvUrl). Dev dealer ids don't match that prod sheet, so this stays a
-    // no-op there — every car passes through, same as before this filter existed.
-    if (this.configService.config.environment === Environment.PRODUCTION) {
-      const priorities = await this.mappingService.getMetaPushPriorityMapping();
-      if (!priorities.some(priority => priority.dealer_id === ownerId)) {
-        return null;
-      }
-    }
-
     const dealerInfo = this.getDealerItems(car);
     // console.time(`Address ${car._id}`);
     const address = await this.getAddress(car, owner);