@bytebrand/export-cars 1.0.14 → 1.0.17

package/dist/utils/parser.utils.d.ts

@@ -1,2 +1,3 @@
 import { RuleParser } from '../interfaces/rule-parser.interface';
 export declare function parseFields<T>(values: string, fc: RuleParser<T>): T[];
+export declare function parseDealersList(dealers: string): string[];

package/dist/utils/parser.utils.js

@@ -1,9 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFields = void 0;
+exports.parseDealersList = exports.parseFields = void 0;
+const lodash_1 = require("lodash");
 function parseFields(values, fc) {
     const fieldsArr = values.split(',');
     return fieldsArr.map((e) => fc(e));
 }
 exports.parseFields = parseFields;
+function parseDealersList(dealers) {
+    if (dealers) {
+        if ((0, lodash_1.indexOf)(dealers, ',') !== -1) {
+            return dealers.split(',').map((dealerId) => dealerId.trim());
+        }
+        return [dealers];
+    }
+    return [];
+}
+exports.parseDealersList = parseDealersList;
 //# sourceMappingURL=parser.utils.js.map

package/dist/utils/parser.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.utils.js","sourceRoot":"","sources":["../../src/utils/parser.utils.ts"],"names":[],"mappings":";;;AAEA,SAAgB,WAAW,CAAI,MAAc,EAAE,EAAiB;IAC9D,MAAM,SAAS,GAAa,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAS,EAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAHD,kCAGC"}
+{"version":3,"file":"parser.utils.js","sourceRoot":"","sources":["../../src/utils/parser.utils.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AAGjC,SAAgB,WAAW,CAAI,MAAc,EAAE,EAAiB;IAC9D,MAAM,SAAS,GAAa,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAS,EAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAHD,kCAGC;AAED,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,IAAI,OAAO,EAAE;QACX,IAAI,IAAA,gBAAO,EAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YAChC,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,OAAO,CAAC,OAAO,CAAC,CAAC;KAClB;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AARD,4CAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.0.14",
+  "version": "1.0.17",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -17,7 +17,7 @@
     "@bytebrand/autode-request": "^1.5.13",
     "@bytebrand/car-basic-data-scope": "~7.1.11",
     "@bytebrand/car-description": "^1.2.24",
-    "@bytebrand/car-schema": "^3.9.12",
+    "@bytebrand/car-schema": "^3.12.24",
     "@bytebrand/chunkable": "^5.4.4",
     "@bytebrand/cronicle-helper": "^1.7.4",
     "@bytebrand/fe-financing": "^5.3.1",
@@ -64,5 +64,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "096d9d9ff57b54b5fe3ac91597e463cd657f1a69"
+  "gitHead": "a89952f7214cc5ca0453df1973e09ba73b0d8770"
 }

package/src/config/alleskralle.config.ts

@@ -0,0 +1,15 @@
+import { Params } from '../interfaces/params.interface';
+import { parseDealersList } from '../utils/parser.utils';
+import { Config } from './config';
+
+export class AlleskralleConfig extends Config {
+  constructor(params: Params) {
+    super(params);
+    this.pathesConfig.localConvertedDirectory = this.environmentConfig[params.environment].localConvertedDirectory;
+    this.pathesConfig.remoteDirectory = this.environmentConfig[params.environment].remoteDirectory;
+    this.dealersList = params.dealers ? parseDealersList(params.dealers) : null;
+    this.campaign = 'alleskralle';
+    this.location = 'Deutschland';
+    this.outputFiles = ['api_export_cars_alleskralle.xml'];
+  }
+}

package/src/config/auto24.config.ts

@@ -1,5 +1,5 @@
-import { indexOf } from 'lodash';
 import { Params } from '../interfaces/params.interface';
+import { parseDealersList } from '../utils/parser.utils';
 import { Config } from './config';
 
 export class Auto24Config extends Config {
@@ -7,23 +7,7 @@ export class Auto24Config extends Config {
     super(params);
     this.pathesConfig.localConvertedDirectory = this.environmentConfig[params.environment].localConvertedDirectory;
     this.pathesConfig.remoteDirectory = this.environmentConfig[params.environment].remoteDirectory;
-    this.dealersList = this.getDealersList(params.dealers);
-    this.outputFiles = [
-      'api_export_cars_GERMAN.xml',
-      'api_export_moto_GERMAN.xml',
-      'api_export_nfz_GERMAN.xml',
-      'api_export_womo_GERMAN.xml',
-      'autode.tar.gz',
-    ];
-  }
-
-  private getDealersList(dealers: string): string[] {
-    if (dealers) {
-      if (indexOf(dealers, ',') !== -1) {
-        return dealers.split(',').map((dealerId: string) => dealerId.trim());
-      }
-      return [dealers];
-    }
-    return [];
+    this.dealersList = params.dealers ? parseDealersList(params.dealers) : null;
+    this.outputFiles = ['api_export_cars_GERMAN.xml', 'autode.tar.gz'];
   }
 }

package/src/config/config.ts

@@ -14,6 +14,7 @@ export class Config {
   isNewCar: boolean;
   isCriteo: boolean;
   criteoId: number;
+  location: string;
   exportType: ExportType;
   url: string;
   input: {
@@ -35,6 +36,8 @@ export class Config {
   googleSheetsApiKey: string;
   mappingSpreadsheetId: string;
   mappingSpreadsheetTitle: string;
+  dealersSpreadsheetId: string;
+  dealersSpreadsheetTitle: string;
 
   protected environmentConfig = {
     [Environment.LOCAL]: {
@@ -73,6 +76,8 @@ export class Config {
     this.url = this.environmentConfig[params.environment].url;
     this.googleSheetsApiKey = params.googleSheetsApiKey;
     this.mappingSpreadsheetId = '147qz9sTgs1wi13ua8YKa0IgfxAn1X_qH6LkGnAnzeyY';
+    this.dealersSpreadsheetId = '1gWrcA-uRTpna1h66Mbe2Y7NA0tIhlUaQXBcS4a_UzOw';
+    this.dealersSpreadsheetTitle = 'dealers_mapping';
     this.userActionsUrl = `https://www.${this.url}/service/user-actions`;
     this.imboUrl = `https://www.${this.url}/service/image-imbo`;
     this.imageUrl = `https://images.${this.url}`;

package/src/config/dasparking.config.ts

@@ -0,0 +1,15 @@
+import { Params } from '../interfaces/params.interface';
+import { parseDealersList } from '../utils/parser.utils';
+import { Config } from './config';
+
+export class DasparkingConfig extends Config {
+  constructor(params: Params) {
+    super(params);
+    this.pathesConfig.localConvertedDirectory = this.environmentConfig[params.environment].localConvertedDirectory;
+    this.pathesConfig.remoteDirectory = this.environmentConfig[params.environment].remoteDirectory;
+    this.dealersList = params.dealers ? parseDealersList(params.dealers) : null;
+    this.campaign = 'dasparking';
+    this.location = 'Deutschland';
+    this.outputFiles = ['api_export_cars_dasparking.xml'];
+  }
+}

package/src/enums/export-type.enum.ts

@@ -11,4 +11,6 @@ export enum ExportType {
   BY_OWNER = 'by-owner',
   AUTOUNCLE = 'autouncle',
   AS24 = 'as24',
+  ALLESKRALLE = 'alleskralle',
+  DASPARKING = 'dasparking',
 }

package/src/export.schema.ts

@@ -1,8 +1,10 @@
+import { AlleskralleConfig } from './config/alleskralle.config';
 import { As24Config } from './config/as24.config';
 import { Auto24Config } from './config/auto24.config';
 import { AutoboerseConfig } from './config/autoboerse.config';
 import { AutouncleConfig } from './config/autouncle.config';
 import { ByOwnerConfig } from './config/by-owner.config';
+import { DasparkingConfig } from './config/dasparking.config';
 import { EautoConfig } from './config/eauto.config';
 import { FbConfig } from './config/fb.config';
 import { GoogleConfig } from './config/google.config';
@@ -70,4 +72,12 @@ export const exportSchema = {
     config: As24Config,
     exporter: As24Exporter,
   },
+  [ExportType.ALLESKRALLE]: {
+    config: AlleskralleConfig,
+    exporter: Auto24Exporter,
+  },
+  [ExportType.DASPARKING]: {
+    config: DasparkingConfig,
+    exporter: Auto24Exporter,
+  },
 };

package/src/exporters/auto24.exporter.ts

@@ -26,31 +26,24 @@ export class Auto24Exporter implements Exporter {
       exists && (await CronicleUtils.unlink(file));
     }
 
-    const [fileCarXml, fileMotoXml, fileNfzXml, fileWomoXml, fileGZ] = this.configService.config.outputFiles;
-    console.log(fileCarXml);
-    const carsXmlBuilder = new Auto24XmlBuilder(fileCarXml);
-    const motoXmlBuilder = new Auto24XmlBuilder(fileMotoXml);
-    const nfzXmlBuilder = new Auto24XmlBuilder(fileNfzXml);
-    const womoXmlBuilder = new Auto24XmlBuilder(fileWomoXml);
+    const [fileXml, fileGZ] = this.configService.config.outputFiles;
 
-    await motoXmlBuilder.buildStart();
-    await nfzXmlBuilder.buildStart();
-    await womoXmlBuilder.buildStart();
+    const xmlBuilder = new Auto24XmlBuilder(fileXml);
 
     const auto24Transformer = await this.moduleRef.create(Auto24Transformer);
 
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
       if (chunk && chunk.data) {
         if (toNumber(chunk.id) === 0) {
-          await carsXmlBuilder.buildStart(chunk.total);
+          await xmlBuilder.buildStart(chunk.total);
         }
 
         for (let i = 0; i < chunk.data.length; i += 1) {
           const data = chunk.data[i];
           const { car, images } = data;
           const ownerId = get(car, 'metaData.ownerId');
-          if (this.configService.config.dealersList.indexOf(ownerId) !== -1) {
-            await carsXmlBuilder.addItem(auto24Transformer.transform(car, images));
+          if (!this.configService.config.dealersList || this.configService.config.dealersList.indexOf(ownerId) !== -1) {
+            await xmlBuilder.addItem(auto24Transformer.transform(car, images), this.configService.config.location);
             this.carService.counter.countCar(images);
           }
         }
@@ -58,11 +51,10 @@ export class Auto24Exporter implements Exporter {
       }
     });
 
-    await carsXmlBuilder.buildEnd();
-    await motoXmlBuilder.buildEnd();
-    await nfzXmlBuilder.buildEnd();
-    await womoXmlBuilder.buildEnd();
+    await xmlBuilder.buildEnd();
 
-    await Zipper.tar({ dest: fileGZ, fileList: [fileCarXml, fileMotoXml, fileNfzXml, fileWomoXml] });
+    if (fileGZ) {
+      await Zipper.tar({ dest: fileGZ, fileList: [fileXml] });
+    }
   }
 }

package/src/exporters/mobile.exporter.ts

@@ -13,10 +13,8 @@ import { Injectable } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import { HttpService } from '@nestjs/axios';
 import { lastValueFrom } from 'rxjs';
-import { createWriteStream } from 'fs';
 import { get } from 'lodash';
 import { RulesService } from '../services/rules.service';
-import { pipeline } from 'stream/promises';
 
 @Injectable()
 export class MobileExporter implements Exporter {

package/src/formats/auto24-xml.builder.ts

@@ -9,7 +9,7 @@ export class Auto24XmlBuilder extends XMLBuilderBase {
     <index_totalResults>${totalResults}</index_totalResults>`);
   }
 
-  async addItem(car: Auto24XmlItem): Promise<void> {
+  async addItem(car: Auto24XmlItem, location = ''): Promise<void> {
     let item = '';
 
     item += '\n<item>\n';
@@ -30,8 +30,12 @@ export class Auto24XmlBuilder extends XMLBuilderBase {
     item += this.getElementsList('images', 'image', car.images);
     item += this.getElement('price', car.price);
     item += this.getElement('power-kw', car.power);
-    item += this.getElement('zip', car.zip);
-    item += this.getElement('city', car.city, true);
+    if (location) {
+      item += this.getElement('location', location);
+    } else {
+      item += this.getElement('zip', car.zip);
+      item += this.getElement('city', car.city, true);
+    }
     item += this.getElement('mileage', car.mileage);
     item += this.getElement('companyname', car.companyname, true);
     item += this.getElement('extras', car.extras, true);

package/src/interfaces/dealers-mapping.interface.ts

@@ -0,0 +1,7 @@
+export interface DealersMapping {
+  firebaseUserId: string;
+  dealerId: string;
+  dealerEmail: string;
+  combinationId: string;
+  aos24Id?: string;
+}

package/src/interfaces/params.interface.ts

@@ -11,7 +11,6 @@ export interface Params {
   Date?: string;
   isNewCar?: boolean;
   isCriteo?: boolean;
-  fileXML?: string;
   dealers?: string;
   cpc?: string;
   ownerId?: string;

package/src/services/car.service.ts

@@ -41,7 +41,6 @@ export class CarService {
     if (!owner) {
       try {
         owner = await this.bottleneck.schedule(() => this.requestService.upaRequest.getDealerProfile(ownerId));
-        console.log('TEST');
       } catch (e) {
         console.log(e);
         if (e.statusCode !== HttpStatus.NOT_FOUND) {

package/src/services/mapping.service.ts

@@ -2,11 +2,13 @@ import { Injectable } from '@nestjs/common';
 import { MappingRules } from '../interfaces/mapping-rules.interface';
 import { GoogleSpreadsheet, GoogleSpreadsheetRow } from 'google-spreadsheet';
 import { ConfigService } from './config.service';
+import { DealersMapping } from '../interfaces/dealers-mapping.interface';
 
 @Injectable()
 export class MappingService {
   constructor(private configService: ConfigService) {}
   private rules: MappingRules[];
+  private dealers: any;
 
   async getRules(): Promise<MappingRules[]> {
     if (!this.rules) {
@@ -14,7 +16,7 @@ export class MappingService {
       spreadsheet.useApiKey(this.configService.config.googleSheetsApiKey);
       await spreadsheet.loadInfo();
       const rows = await spreadsheet.sheetsByTitle[this.configService.config.mappingSpreadsheetTitle].getRows();
-      const mappingRules = this.rowsToRules(rows);
+      const mappingRules = this.rowsToRules(rows) as MappingRules[];
 
       mappingRules.map((rule, _i, selfRules) => {
         this.removeEmptyKeys(rule);
@@ -28,7 +30,18 @@ export class MappingService {
     return this.rules;
   }
 
-  private rowsToRules(rows: GoogleSpreadsheetRow[]): MappingRules[] {
+  async getDealersMapping(): Promise<DealersMapping[]> {
+    if (!this.dealers) {
+      const spreadsheet = new GoogleSpreadsheet(this.configService.config.dealersSpreadsheetId);
+      spreadsheet.useApiKey(this.configService.config.googleSheetsApiKey);
+      await spreadsheet.loadInfo();
+      const rows = await spreadsheet.sheetsByTitle[this.configService.config.dealersSpreadsheetTitle].getRows();
+      this.dealers = this.rowsToRules(rows) as DealersMapping[];
+    }
+    return this.dealers;
+  }
+
+  private rowsToRules(rows: GoogleSpreadsheetRow[]): MappingRules[] | DealersMapping[] {
     return rows.map(row =>
       Object.assign(
         {},

package/src/transformers/auto24.transfomer.ts

@@ -19,10 +19,14 @@ export class Auto24Transformer {
 
   transform(car: DataSchemes.Car, imboImages: ImboImageResponseInterface[]): Auto24XmlItem {
     const autodeid = toString(get(car, '_id', ''));
+    let userlink = `https://www.${this.configService.config.url}/search/vehicle/${autodeid}`;
+    if (this.configService.config.campaign) {
+      userlink += `?source=classifieds&medium=listing&campaign=${this.configService.config.campaign}`;
+    }
 
     return {
       autodeid,
-      userlink: `https://www.${this.configService.config.url}/search/vehicle/${autodeid}`,
+      userlink,
       apilink: `https://www.${this.configService.config.url}/service/car-basic-data/api/v1/car/${autodeid}`,
       brand: toString(get(car, 'mainData.make', '')),
       modell: toString(get(car, 'mainData.model', '')),

package/src/transformers/google.transformer.ts

@@ -48,6 +48,9 @@ export class GoogleTransformer {
   }
 
   private async getDescription(car: DataSchemes.Car): Promise<string> {
+    if (this.configService.config.isCriteo) {
+      return '0€ Anzahlung möglich. 14 Tage Geld-zurück-Garantie. Lieferung bis vor die Haustür. 1 Jahr Garantie inklusive. Deutschlands großes Autoportal.';
+    }
     const dealerId = get(car, 'metaData.ownerId');
     const descriptionSchema = await this.userService.getDefaultSummaryByDealerId(dealerId);
     const descriptionBuilder = CarDescriptionFactory.create(DescriptionTypeEnum.Mobile, car);

package/src/transformers/mobile.transformer.ts

@@ -51,6 +51,10 @@ export class MobileTransformer {
     set(transformedCarData, 293, toString(get(carData, 'leasing.monthlyInstallment', '')));
     set(transformedCarData, 1, get(carData, 'metaData.vehicleId', null));
 
+    if (this.configService.config.campaign === 'eauto' && carData.offer.ftpFolder === 'auto_de_eautos') {
+      set(transformedCarData, 12, get(carData, 'offer.internalNumber', null));
+    }
+
     return transformedCarData;
   }
 
@@ -128,7 +132,7 @@ export class MobileTransformer {
         return this.getAutodeUrl(car);
       }
       case 'persistentId': {
-        return this.getPersistentId();
+        return this.getPersistentId(car);
       }
       case 'price.vatDeductible': {
         return this.getVatDeductible(car);
@@ -174,9 +178,16 @@ export class MobileTransformer {
     }
   }
 
-  private getPersistentId() {
+  private async getPersistentId(car: DataSchemes.Car) {
     switch (this.configService.config.campaign) {
       case 'eauto':
+        if (car.offer.ftpFolder === 'auto_de_eautos') {
+          const dealers = await this.mappingService.getDealersMapping();
+          const dealerId = dealers.find(dealer => dealer.firebaseUserId === car.metaData.ownerId)?.dealerId;
+          if (dealerId) {
+            return dealerId;
+          }
+        }
         return '416';
       default:
         return '04109003';

package/src/utils/parser.utils.ts

@@ -1,6 +1,17 @@
+import { indexOf } from 'lodash';
 import { RuleParser } from '../interfaces/rule-parser.interface';
 
 export function parseFields<T>(values: string, fc: RuleParser<T>): T[] {
   const fieldsArr: string[] = values.split(',');
   return fieldsArr.map((e: string): T => fc(e));
 }
+
+export function parseDealersList(dealers: string): string[] {
+  if (dealers) {
+    if (indexOf(dealers, ',') !== -1) {
+      return dealers.split(',').map((dealerId: string) => dealerId.trim());
+    }
+    return [dealers];
+  }
+  return [];
+}