@bytebrand/export-cars 1.10.0 → 1.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -21,12 +21,10 @@
     "@bytebrand/car-schema": "^3.12.24",
     "@bytebrand/chunkable": "^5.13.2",
     "@bytebrand/cronicle-helper": "^1.15.1",
-    "@bytebrand/fe-financing": "^5.4.3",
     "@bytebrand/i18n-dictionaries": "^1.4.2",
     "@bytebrand/import-helper": "^0.35.1",
     "@bytebrand/schema-tools": "^3.13.24",
     "@bytebrand/zipper": "^2.1.1",
-    "@nestjs/axios": "^0.1.0",
     "@nestjs/common": "^9.0.0",
     "@nestjs/core": "^9.0.0",
     "bottleneck": "^2.19.5",
@@ -36,12 +34,8 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nest-commander": "^3.1.0",
-    "nest-winston": "^1.8.0",
     "reflect-metadata": "^0.1.13",
-    "rimraf": "^3.0.2",
-    "rxjs": "^7.2.0",
-    "vin-generator": "^1.0.1",
-    "winston": "^3.8.2"
+    "vin-generator": "^1.0.1"
   },
   "devDependencies": {
     "@nestjs/cli": "^9.0.0",
@@ -66,5 +60,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "37593dea01bef934aa28dee2dfc50c29fad9aeef"
+  "gitHead": "4fd5ec3e85f39f7932eead7b1dbd60dc780d39f0"
 }

package/src/configs/config.ts

@@ -5,7 +5,7 @@ export class Config {
   apikey: string;
   campaign: string;
   userActionsUrl: string;
-  marketingImageId: number;
+  marketingImageConfigId: number;
   upaUrl: string;
   imboUrl: string;
   imageUrl: string;
@@ -13,7 +13,6 @@ export class Config {
   imageType: ImageType;
   isNewCar: boolean;
   isCriteo: boolean;
-  criteoMarketingImagesConfigId: number;
   exportType: ExportType;
   domain: string;
   input: {
@@ -34,32 +33,23 @@ export class Config {
   dealersSpreadsheetTitle: string;
 
   protected environmentConfig = {
-    [Environment.LOCAL]: {
-      domain: 'autode-dev.de',
-      criteoMarketingImagesConfigId: 12,
-      localConvertedDirectory: 'resources/csv_dev',
-      remoteDirectory: 'import_dev',
-      imageUrl: 'https://images.autode-dev.de/cache_test',
-      baseImageUrl: 'https://images.autode-dev.de',
-      marketingImageId: 8,
-    },
     [Environment.DEVELOP]: {
       domain: 'autode-dev.de',
+      fbMarketingImageId: 8,
       criteoMarketingImagesConfigId: 12,
       localConvertedDirectory: 'resources/csv_dev',
       remoteDirectory: 'import_dev',
       imageUrl: 'https://images.autode-dev.de/cache_test',
       baseImageUrl: 'https://images.autode-dev.de',
-      marketingImageId: 8,
     },
     [Environment.PRODUCTION]: {
       domain: 'auto.de',
+      fbMarketingImageId: 1,
       criteoMarketingImagesConfigId: 3,
       localConvertedDirectory: 'resources/csv_prod',
       remoteDirectory: 'import',
       imageUrl: 'https://images.auto.de/generated_images',
       baseImageUrl: 'https://images.auto.de',
-      marketingImageId: 1,
     },
   };
 
@@ -67,9 +57,7 @@ export class Config {
     this.apikey = params.apikey;
     this.exportType = params.exportType;
     this.cpc = params.cpc;
-    this.criteoMarketingImagesConfigId = this.environmentConfig[params.environment].criteoMarketingImagesConfigId;
     this.domain = this.environmentConfig[params.environment].domain;
-    this.marketingImageId = this.environmentConfig[params.environment].marketingImageId;
     this.baseImageUrl = this.environmentConfig[params.environment].baseImageUrl;
     this.mappingSpreadsheetId = '147qz9sTgs1wi13ua8YKa0IgfxAn1X_qH6LkGnAnzeyY';
     this.dealersSpreadsheetId = '1gWrcA-uRTpna1h66Mbe2Y7NA0tIhlUaQXBcS4a_UzOw';

package/src/configs/criteo.config.ts

@@ -8,6 +8,7 @@ export class CriteoConfig extends Config {
     this.campaign = ExportType.CRITEO;
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.CRITEO}-export`;
     this.imageType = ImageType.marketing;
+    this.marketingImageConfigId = this.environmentConfig[params.environment].criteoMarketingImagesConfigId;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.CRITEO}.${FileType.XML}`,
     ];

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

@@ -8,6 +8,7 @@ export class FacebookShopConfig extends Config {
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.FACEBOOK_SHOP}-export`;
     this.imageUrl = this.environmentConfig[params.environment].baseImageUrl;
     this.imageType = ImageType.marketing;
+    this.marketingImageConfigId = this.environmentConfig[params.environment].fbMarketingImageId;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.FACEBOOK_SHOP}.${FileType.XML}`,
     ];

package/src/configs/fb.config.ts

@@ -8,6 +8,7 @@ export class FbConfig extends Config {
     this.pathesConfig.localConvertedDirectory = `resources/${ExportType.FB}-export`;
     this.imageUrl = this.environmentConfig[params.environment].imageUrl;
     this.imageType = ImageType.marketing;
+    this.marketingImageConfigId = this.environmentConfig[params.environment].fbMarketingImageId;
     this.outputFiles = [
       `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.FB}.${FileType.XML}`,
     ];

package/src/export.command.ts

@@ -1,5 +1,5 @@
 import { createInterface } from 'readline';
-import { Command, CommandRunner, InquirerService } from 'nest-commander';
+import { Command, CommandRunner } from 'nest-commander';
 import { ConfigService } from './services';
 import { Input } from './interfaces/input.interface';
 import { exportSchema } from './export.schema';
@@ -13,7 +13,6 @@ import { LoggerService } from '@bytebrand/cronicle-helper';
 })
 export class ExportRunner extends CommandRunner {
   constructor(
-    private readonly inquirer: InquirerService,
     private configService: ConfigService,
     private moduleRef: ModuleRef,
   ) {

package/src/services/images.service.ts

@@ -1,17 +1,20 @@
+import { get, toString } from 'lodash';
+
 import { Injectable } from '@nestjs/common';
-import { DataSchemes } from '@bytebrand/car-schema';
+
+import { MarketingImageConfigsInterface } from '@bytebrand/autode-request';
 import { ImboImageResponseInterface } from '@bytebrand/chunkable';
-import { get, toString } from 'lodash';
+import { DataSchemes } from '@bytebrand/car-schema';
+
+import { FB_MAX_IMAGE_COUNT_FOR_DEAFULT } from '../constants/fb.constants';
 import { isNotEmptyArray } from '../utils/validator.utils';
 import { ConfigService } from './config.service';
-import { ImageType } from '../enums';
-import { MarketingImageConfigInterface, MarketingImageConfigsInterface } from '@bytebrand/autode-request';
 import { UserService } from './user.service';
-import { FB_MAX_IMAGE_COUNT_FOR_DEAFULT } from '../constants/fb.constants';
+import { ImageType } from '../enums';
 
 @Injectable()
 export class ImagesService {
-  constructor(private readonly configService: ConfigService, private readonly userService: UserService) {}
+  constructor(private readonly configService: ConfigService, private readonly userService: UserService) { }
 
   async getImages(
     car: DataSchemes.Car,
@@ -74,7 +77,7 @@ export class ImagesService {
 
     const carId = toString(get(car, '_id', ''));
 
-    const transformedImages = this.generateImageLinks(images, carId);
+    const transformedImages = this.generateImageLinks(images.filter(i => i), carId);
     if (transformedImages.length < 17) {
       transformedImages.push(...defaultImages);
     }
@@ -90,10 +93,9 @@ export class ImagesService {
   async getMarketingImages(images: any, carId: string): Promise<string[]> {
     const imageUrl = this.configService.config.imageUrl;
     const transformedImages = this.transformImagesArrayIntoObject(images);
-    const configs = this.configService.config.isCriteo
-      ? await this.userService.getMarketingImageConfig(this.configService.config.criteoMarketingImagesConfigId)
-      : ((await this.getMarketingImageConfigs()) as any);
-    const marketingImageConfigs = this.transform(configs);
+
+    const config = await this.userService.getMarketingImageConfig(this.configService.config.marketingImageConfigId);
+    const marketingImageConfigs = config.marketingImages.map(i => ({ marketingImageCodes: i.imageCodes }));
 
     const defImages = [
       'https://images.auto.de/carimage/noimage/7pNvWELuWhZX/large-cached.jpeg',
@@ -110,7 +112,7 @@ export class ImagesService {
         const imageCode = marketingImage.marketingImageCodes[i];
         const imageId = transformedImages[imageCode];
         if (imageId) {
-          imageUrls.push(this.getImagePathWithExtenstion(imageUrl, carId, imageId, configs));
+          imageUrls.push(this.getImagePathWithExtenstion(imageUrl, carId, imageId, config));
           break;
         }
       }
@@ -121,14 +123,6 @@ export class ImagesService {
     return imageUrls;
   }
 
-  async getMarketingImageConfigs(): Promise<MarketingImageConfigsInterface> {
-    const configs = await this.userService.getMarketingImageConfigs();
-    const responseData = configs.find(config => config.channelCode.includes(this.configService.config.exportType));
-    let id;
-    !responseData?.id ? (id = this.configService.config.marketingImageId) : (id = responseData.id);
-    return this.userService.getMarketingImageConfig(id);
-  }
-
   private transformImagesArrayIntoObject(images: { [imageCode: string]: string }[]) {
     const result: { [imageCode: string]: string } = {};
     images.forEach(image => {
@@ -138,14 +132,6 @@ export class ImagesService {
     return result;
   }
 
-  private transform(config: MarketingImageConfigInterface): { marketingImageCodes: string[] }[] {
-    return config.marketingImages.map(marketingImage => {
-      return {
-        marketingImageCodes: marketingImage.imageCodes,
-      };
-    });
-  }
-
   protected getChannelPath(imageUrl: string, carId: string): string {
     return `${imageUrl}/${[carId[0], carId[1], carId[2], carId].join('/')}`;
   }

package/src/services/user.service.ts

@@ -1,9 +1,11 @@
 import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
+
+import { MarketingImageConfigInterface, MarketingImageConfigsInterface } from '@bytebrand/autode-request';
+
 import { RequestService } from './request.service';
 import { Cache } from 'cache-manager';
 import { get } from 'lodash';
-import { MarketingImageConfigInterface, MarketingImageConfigsInterface } from '@bytebrand/autode-request';
-import { ExportType, FileType } from '../enums';
+
 
 @Injectable()
 export class UserService {

package/src/transformers/by-owner.transformer.ts

@@ -3,7 +3,6 @@ import { Translator, TranslatorExtended } from '@bytebrand/schema-tools';
 import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictionaries';
 import { DataSchemes } from '@bytebrand/car-schema';
 import { Injectable } from '@nestjs/common';
-import { normalizeRateObject, getMonthlyInstallment, getComputedFinancing } from '@bytebrand/fe-financing';
 import * as moment from 'moment';
 
 type transformFn = (car: DataSchemes.Car, translator: TranslatorExtended) => string;
@@ -24,23 +23,11 @@ export class ByOwnerTransformer {
 
       price: 'price.currentSalesPrice',
       '(old price) strike price': 'price.wasPrice',
-      rate: (car: DataSchemes.Car) => {
-        const { rate } = normalizeRateObject({ ...car });
-        return getMonthlyInstallment(rate);
-      },
+      rate: (car: DataSchemes.Car) => car.rate.monthlyInstallment,
       'discount in %': this.mapToNumber('price.historyPriceDifferencePerCent', 1, 0),
       'discount in €': this.mapToNumber('price.historyPriceDifference', 1, 0),
-      'first_installment in €': (car: DataSchemes.Car) => {
-        const { rate } = normalizeRateObject({ ...car });
-        const price = getComputedFinancing(rate) as ReturnType<typeof getComputedFinancing> & {
-          firstInstallment: number;
-        };
-        return price.firstInstallment;
-      },
-      'amount of month': (car: DataSchemes.Car) => {
-        const { rate } = normalizeRateObject({ ...car });
-        return rate.paybackPeriod;
-      },
+      'first_installment in €': (car: DataSchemes.Car) => car.rate.firstInstallment,
+      'amount of month': (car: DataSchemes.Car) => car.rate.paybackPeriod,
 
       Name: (car: DataSchemes.Car): string => {
         const make = toString(get(car, 'mainData.make', ''));

package/src/transformers/fb.transformer.ts

@@ -1,5 +1,5 @@
-import { TranslatorExtended } from '@bytebrand/schema-tools';
-import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictionaries';
+import { Cache } from 'cache-manager';
+import * as moment from 'moment';
 import {
   escape,
   findIndex,
@@ -15,17 +15,23 @@ import {
   trim,
   truncate,
 } from 'lodash';
-import * as moment from 'moment';
-import { DataSchemes } from '@bytebrand/car-schema';
-import { DePostalCodesService } from '@bytebrand/car-basic-data-scope';
+
+import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
+
 import { DePostalCodesEntryInterface } from '@bytebrand/car-basic-data-scope/dist/interfaces/DePostalCodesInterface';
-import { ConfigService, ImagesService } from '../services';
+import { de, deVehicleDetailsPage, deVehicleProps } from '@bytebrand/i18n-dictionaries';
+import { DePostalCodesService } from '@bytebrand/car-basic-data-scope';
 import { ImboImageResponseInterface } from '@bytebrand/chunkable';
-import { isValidVin } from '../utils/validator.utils';
-import { Injectable } from '@nestjs/common';
-import { FbDescription } from './fb-description.transformer';
+import { TranslatorExtended } from '@bytebrand/schema-tools';
+import { DataSchemes } from '@bytebrand/car-schema';
+
 import { Description } from '../interfaces/description.interface';
+import { FbDescription } from './fb-description.transformer';
+import { ConfigService, ImagesService } from '../services';
 import { FbEquipment } from './fb-equipment.transformer';
+import { isValidVin } from '../utils/validator.utils';
+import { UserService } from 'src/services';
+import { ImageType } from '../enums';
 import {
   DEFAULT_ADDR1,
   DEFAULT_CITY,
@@ -34,8 +40,7 @@ import {
   FB_MIN_MILEAGES,
   TIMESTAMP_FIRST_YEAR,
 } from '../constants/fb.constants';
-import { UserService } from 'src/services';
-import { ImageType } from '../enums';
+
 
 @Injectable()
 export class FbTransformer {
@@ -43,7 +48,11 @@ export class FbTransformer {
   private postalCodesService: DePostalCodesService;
   private imagesService: ImagesService;
 
-  constructor(private readonly configService: ConfigService, private readonly userService: UserService) {
+  constructor(
+    @Inject(CACHE_MANAGER) private cacheManager: Cache,    
+    private readonly configService: ConfigService, 
+    private readonly userService: UserService
+    ) {
     this.imagesService = new ImagesService(configService, userService);
     const dict = { ...de, ...deVehicleProps, ...deVehicleDetailsPage };
     this.translator = new TranslatorExtended(dict);
@@ -317,10 +326,17 @@ export class FbTransformer {
   }
 
   private async getLocationByInfo(info: { zip: number; city: string }): Promise<DePostalCodesEntryInterface> {
-    let entry: DePostalCodesEntryInterface = await this.postalCodesService.getLocationByPostalCode(info.zip);
+    const cacheKey = `${info.city}_${info.zip}`;
+
+    let entry: DePostalCodesEntryInterface = await this.cacheManager.get(cacheKey);
+    if (entry) { return entry };
+
+    entry = await this.postalCodesService.getLocationByPostalCode(info.zip);
+    await this.cacheManager.set(cacheKey, entry);
 
     if (!entry) {
       entry = await this.postalCodesService.getLocationByCity(info.city);
+      await this.cacheManager.set(cacheKey, entry);
     }
     return entry;
   }