@bytebrand/export-cars 1.26.16 → 1.26.18

package/package.json

@@ -1,62 +1,62 @@
-{
-  "name": "@bytebrand/export-cars",
-  "version": "1.26.16",
-  "description": "",
-  "author": "bytebrand",
-  "license": "UNLICENSED",
-  "scripts": {
-    "prebuild": "rimraf dist",
-    "build": "nest build",
-    "prepublishOnly": "npm run build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "lint": "eslint -c .eslintrc.js --ext .ts src/",
-    "start:dev": "nest start --watch"
-  },
-  "dependencies": {
-    "@bytebrand/autode-request": "^1.19.2",
-    "@bytebrand/car-basic-data-scope": "^9.11.24",
-    "@bytebrand/car-description": "^1.17.20",
-    "@bytebrand/car-schema": "^3.14.15",
-    "@bytebrand/chunkable": "^5.19.8",
-    "@bytebrand/cronicle-helper": "^1.21.8",
-    "@bytebrand/fe-financing": "^5.14.19",
-    "@bytebrand/i18n-dictionaries": "^1.5.0",
-    "@bytebrand/import-helper": "^0.45.0",
-    "@bytebrand/schema-tools": "^3.18.8",
-    "@bytebrand/zipper": "^2.2.0",
-    "@nestjs/cache-manager": "^2.1.0",
-    "@nestjs/common": "^10.2.7",
-    "@nestjs/core": "^10.2.7",
-    "axios": "^1.5.1",
-    "bottleneck": "^2.19.5",
-    "cache-manager": "^5.2.4",
-    "csv-write-stream": "^2.0.0",
-    "google-spreadsheet": "^3.3.0",
-    "lodash": "^4.17.21",
-    "moment": "^2.29.4",
-    "nest-commander": "~3.15.0",
-    "reflect-metadata": "^0.1.13",
-    "vin-generator": "^1.0.1"
-  },
-  "devDependencies": {
-    "@nestjs/cli": "^10.1.18",
-    "@types/google-spreadsheet": "^3.3.0",
-    "@types/inquirer": "^8.2.4",
-    "@types/lodash": "^4.14.186",
-    "@types/node": "^16.18.58",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
-    "eslint": "^8.0.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "gts": "^3.1.1",
-    "prettier": "^2.3.2",
-    "ts-node": "^10.0.0",
-    "tsconfig-paths": "4.1.0",
-    "typescript": "^5.2.2"
-  },
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "gitHead": "e827f35865032821bf3a081f03a026d3d3f8a540"
-}
+{
+  "name": "@bytebrand/export-cars",
+  "version": "1.26.18",
+  "description": "",
+  "author": "bytebrand",
+  "license": "UNLICENSED",
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "nest build",
+    "prepublishOnly": "npm run build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "lint": "eslint -c .eslintrc.js --ext .ts src/",
+    "start:dev": "nest start --watch"
+  },
+  "dependencies": {
+    "@bytebrand/autode-request": "^1.19.2",
+    "@bytebrand/car-basic-data-scope": "^9.11.24",
+    "@bytebrand/car-description": "^1.17.20",
+    "@bytebrand/car-schema": "^3.14.15",
+    "@bytebrand/chunkable": "^5.19.8",
+    "@bytebrand/cronicle-helper": "^1.21.8",
+    "@bytebrand/fe-financing": "^5.14.19",
+    "@bytebrand/i18n-dictionaries": "^1.5.0",
+    "@bytebrand/import-helper": "^0.45.0",
+    "@bytebrand/schema-tools": "^3.18.8",
+    "@bytebrand/zipper": "^2.2.0",
+    "@nestjs/cache-manager": "^2.1.0",
+    "@nestjs/common": "^10.2.7",
+    "@nestjs/core": "^10.2.7",
+    "axios": "^1.5.1",
+    "bottleneck": "^2.19.5",
+    "cache-manager": "^5.2.4",
+    "csv-write-stream": "^2.0.0",
+    "google-spreadsheet": "^3.3.0",
+    "lodash": "^4.17.21",
+    "moment": "^2.29.4",
+    "nest-commander": "~3.15.0",
+    "reflect-metadata": "^0.1.13",
+    "vin-generator": "^1.0.1"
+  },
+  "devDependencies": {
+    "@nestjs/cli": "^10.1.18",
+    "@types/google-spreadsheet": "^3.3.0",
+    "@types/inquirer": "^8.2.4",
+    "@types/lodash": "^4.14.186",
+    "@types/node": "^16.18.58",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
+    "eslint": "^8.0.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "gts": "^3.1.1",
+    "prettier": "^2.3.2",
+    "ts-node": "^10.0.0",
+    "tsconfig-paths": "4.1.0",
+    "typescript": "^5.2.2"
+  },
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "gitHead": "e827f35865032821bf3a081f03a026d3d3f8a540"
+}

package/src/configs/config.ts

@@ -23,6 +23,10 @@ export class Config {
     numberIN: string;
     dateIN: string;
   };
+  // When set, CarService.filterCar exports a car only if price.currentSalesPrice
+  // is a valid number in (0, maxCurrentSalesPrice] — missing/invalid price means
+  // the car is not exported. Unset = no price cap for this export type.
+  maxCurrentSalesPrice?: number;
   pathesConfig: {
     localDirectory: string;
     localConvertedDirectory: string;

package/src/configs/facebook-shop.config.ts

@@ -1,11 +1,13 @@
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 import { ExportType, FileType } from '../enums';
+import { MAX_FEED_SALES_PRICE_EUR } from '../constants/feed-price.constants';
 
 export class FacebookShopConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.FACEBOOK_SHOP}-export`;
+    this.maxCurrentSalesPrice = MAX_FEED_SALES_PRICE_EUR;
     this.imageUrl = this.environmentConfig[params.environment].baseImageUrl;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.FACEBOOK_SHOP}.${FileType.XML}`,

package/src/configs/fb.config.ts

@@ -1,4 +1,5 @@
 import { ExportType, FileType, ImageType } from 'src/enums';
+import { MAX_FEED_SALES_PRICE_EUR } from '../constants/feed-price.constants';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -6,6 +7,7 @@ export class FbConfig extends Config {
   constructor(params: Params) {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.FB}-export`;
+    this.maxCurrentSalesPrice = MAX_FEED_SALES_PRICE_EUR;
     this.imageUrl = this.environmentConfig[params.environment].imageUrl;
     this.imageType = ImageType.marketing;
     this.marketingImageConfigId = this.environmentConfig[params.environment].fbMarketingImageId;

package/src/configs/google.config.ts

@@ -1,4 +1,5 @@
 import { ExportType, FileType, ImageType } from 'src/enums';
+import { MAX_FEED_SALES_PRICE_EUR } from '../constants/feed-price.constants';
 import { Params } from '../interfaces/params.interface';
 import { Config } from './config';
 
@@ -7,6 +8,7 @@ export class GoogleConfig extends Config {
     super(params);
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.GOOGLE}-export`;
     this.imageType = ImageType.default;
+    this.maxCurrentSalesPrice = MAX_FEED_SALES_PRICE_EUR;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.GOOGLE}.${FileType.XML}`,
     ];

package/src/constants/feed-price.constants.ts

@@ -0,0 +1,4 @@
+// Shared eligibility cap for the Google Vehicle Ads and Meta AIA/AMA feeds:
+// only cars whose end-customer selling price (price.currentSalesPrice) is
+// ≤ €80,000 may be exported. €80,000.00 itself is still included.
+export const MAX_FEED_SALES_PRICE_EUR = 80_000;

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

@@ -35,7 +35,9 @@ export class FacebookShopExporter implements Exporter {
       const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
 
       for (let i = 0; i < chunkData.length; i += 1) {
-        const data = chunk.data[i];
+        // chunkData, not chunk.data: indexing the unfiltered array here used to
+        // re-admit cars that filterCar had just rejected (and drop valid ones).
+        const data = chunkData[i];
 
         // console.time(`Transform ${data.car._id}`);
         const items = await facebookShopTransformer.transform(data);

package/src/services/car.service.ts

@@ -3,7 +3,9 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DataSchemes } from '@bytebrand/car-schema';
 import { Cache } from 'cache-manager';
 import Bottleneck from 'bottleneck';
+import { get, toNumber } from 'lodash';
 import { RequestService } from './request.service';
+import { ConfigService } from './config.service';
 import { DateRule } from '../rules/date.rule';
 import { NumberRule } from '../rules/number.rule';
 import { StringRule } from '../rules/string.rule';
@@ -17,6 +19,7 @@ export class CarService {
   constructor(
     @Inject(CACHE_MANAGER) private cacheManager: Cache,
     private requestService: RequestService,
+    private configService: ConfigService,
   ) { }
 
   private _counter: CarsCounter;
@@ -33,6 +36,16 @@ export class CarService {
     if (!((car?.metaData?.imagesCount ?? 0) > 0)) {
       return false;
     }
+    // Shared price cap for export types that set maxCurrentSalesPrice (Google
+    // Vehicle Ads, Meta AIA/AMA): the end-customer selling price must be a valid
+    // number ≤ the cap; a missing/invalid/non-positive price also excludes the car.
+    const maxPrice = this.configService.config.maxCurrentSalesPrice;
+    if (maxPrice) {
+      const price = toNumber(get(car, 'price.currentSalesPrice', null));
+      if (!isFinite(price) || price <= 0 || price > maxPrice) {
+        return false;
+      }
+    }
     return rules.every(e => e.applyRule(car));
   }
 

package/src/transformers/facebook-shop.transformer.ts

@@ -98,9 +98,9 @@ export class FacebookShopTransformer {
 
     return offers.map((offer): FacebookShopItem => ({
       ...base,
-      // Plain long auto.de ID � the `_${offerType}` suffix (ADV-160, one item per offer) broke
-      // matching once only the financing offer is exported; re-add a suffix ONLY if multiple
-      // offer types per vehicle are ever exported again.
+      // Plain long auto.de ID � the `_${offerType}` suffix (ADV-160, one item per offer) broke
+      // matching once only the financing offer is exported; re-add a suffix ONLY if multiple
+      // offer types per vehicle are ever exported again.
       vehicle_offer_id: vehicleId,
       title: offer.title,
       offer_description: offer.description,