@bytebrand/export-cars 1.10.11 → 1.11.0

package/dist/utils/converter.utils.d.ts

@@ -1 +1,2 @@
 export declare function convertToCSV(data: unknown): string;
+export declare const xmlStringReplacer: (str: string) => string;

package/dist/utils/converter.utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToCSV = void 0;
+exports.xmlStringReplacer = exports.convertToCSV = void 0;
 const lodash_1 = require("lodash");
 function convertToCSV(data) {
     const converted = [];
@@ -12,4 +12,8 @@ function convertToCSV(data) {
     return converted.join(';');
 }
 exports.convertToCSV = convertToCSV;
+const xmlStringReplacer = (str) => {
+    return typeof str === 'string' ? str.replace(/&/g, '&amp;').replace(/[<>]/g, '') : '';
+};
+exports.xmlStringReplacer = xmlStringReplacer;
 //# sourceMappingURL=converter.utils.js.map

package/dist/utils/converter.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"converter.utils.js","sourceRoot":"","sources":["../../src/utils/converter.utils.ts"],"names":[],"mappings":";;;AAAA,mCAA6B;AAE7B,SAAgB,YAAY,CAAC,IAAa;IACxC,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC/B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAa,CAAC;QAC7B,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QAChE,IAAA,YAAG,EAAC,SAAS,EAAE,CAAC,EAAE,IAAI,QAAQ,GAAG,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AARD,oCAQC"}
+{"version":3,"file":"converter.utils.js","sourceRoot":"","sources":["../../src/utils/converter.utils.ts"],"names":[],"mappings":";;;AAAA,mCAA6B;AAE7B,SAAgB,YAAY,CAAC,IAAa;IACxC,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC/B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAa,CAAC;QAC7B,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QAChE,IAAA,YAAG,EAAC,SAAS,EAAE,CAAC,EAAE,IAAI,QAAQ,GAAG,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AARD,oCAQC;AAEM,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE;IACvD,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxF,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B"}

package/dist/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from './converter.utils';
+export * from './validator.utils';
+export * from './date-time.utils';

package/dist/utils/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./converter.utils"), exports);
+__exportStar(require("./validator.utils"), exports);
+__exportStar(require("./date-time.utils"), exports);
+//# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,oDAAkC;AAClC,oDAAkC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.10.11",
+  "version": "1.11.0",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -19,7 +19,7 @@
     "@bytebrand/car-basic-data-scope": "^9.8.23",
     "@bytebrand/car-description": "^1.7.24",
     "@bytebrand/car-schema": "^3.12.24",
-    "@bytebrand/chunkable": "^5.13.2",
+    "@bytebrand/chunkable": "^5.13.10",
     "@bytebrand/cronicle-helper": "^1.15.1",
     "@bytebrand/i18n-dictionaries": "^1.4.2",
     "@bytebrand/import-helper": "^0.35.1",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "99cb018c16172e25ddca83a388a1d56bc109921c"
+  "gitHead": "52e8a6afc5e3392fbdd35795da8fffc24f5ca754"
 }

package/src/app.module.ts

@@ -2,16 +2,22 @@ import Bottleneck from 'bottleneck';
 
 import { CacheModule, Module } from '@nestjs/common';
 
-import { ConfigService, RulesService, LoaderService, UserService, CarService, ImagesService } from './services';
-import { RequestService } from './services/request.service';
-import { MappingService } from './services/mapping.service';
+import {
+  TransformerService,
+  MappingService,
+  RequestService,
+  ConfigService,
+  RulesService,
+  LoaderService,
+  UserService,
+  CarService,
+  ImagesService,
+} from './services';
 import { InputQuestions } from './input.questions';
 import { ExportRunner } from './export.command';
 
 @Module({
-  imports: [
-    CacheModule.register(),
-  ],
+  imports: [CacheModule.register()],
   providers: [
     InputQuestions,
     ExportRunner,
@@ -23,11 +29,11 @@ import { ExportRunner } from './export.command';
     LoaderService,
     RulesService,
     ImagesService,
+    TransformerService,
     {
       provide: Bottleneck,
       useValue: new Bottleneck({ maxConcurrent: 10 }),
     },
   ],
 })
-
-export class AppModule { }
+export class AppModule {}

package/src/configs/index.ts

@@ -15,3 +15,4 @@ export * from './ooyyo.config';
 export * from './yescar.config';
 export * from './autoboerse.config';
 export * from './facebook-shop.config';
+export * from './trovit.config';

package/src/configs/trovit.config.ts

@@ -0,0 +1,14 @@
+import { ExportType, FileType, ImageType } from 'src/enums';
+import { Params } from '../interfaces/params.interface';
+import { Config } from './config';
+
+export class TrovitConfig extends Config {
+  constructor(params: Params) {
+    super(params);
+    this.pathesConfig.localConvertedDirectory = `resources/${ExportType.TROVIT}-export`;
+    this.imageType = ImageType.default;
+    this.outputFiles = [
+      `${this.pathesConfig.localConvertedDirectory}/api_export_cars_${ExportType.TROVIT}.${FileType.XML}`,
+    ];
+  }
+}

package/src/constants/modix/category.constant.ts

@@ -8,6 +8,5 @@ export const CategoryList: IModixItemsList = {
   selector_category_convertible: { value: 'Convertible', atributes: { id: 1 } },
   selector_category_suv: { value: 'Off - Road', atributes: { id: 11 } },
   selector_category_van: { value: 'Van', atributes: { id: 388 } },
-  // selector_category_transporter - there are 14 diffrenet
   selector_category_minibus: { value: 'Minibusses', atributes: { id: 251 } },
 };

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

@@ -25,4 +25,5 @@ export enum ExportType {
   KLEINANZEIGE_FOCUS = 'kleinanzeigefocus',
   CRITEO = 'criteo',
   FACEBOOK_SHOP = 'facebookshop',
+  TROVIT = 'trovit',
 }

package/src/export.schema.ts

@@ -18,6 +18,7 @@ import {
   ByOwnerConfig,
   FacebookShopConfig,
   CriteoConfig,
+  TrovitConfig,
 } from './configs';
 import {
   As24Exporter,
@@ -32,6 +33,7 @@ import {
   ModixExporter,
   RubrikkExporter,
   FacebookShopExporter,
+  TrovitExporter,
 } from './exporters';
 
 export const exportSchema = {
@@ -103,4 +105,8 @@ export const exportSchema = {
     config: FacebookShopConfig,
     exporter: FacebookShopExporter,
   },
+  [ExportType.TROVIT]: {
+    config: TrovitConfig,
+    exporter: TrovitExporter,
+  },
 };

package/src/exporters/index.ts

@@ -10,3 +10,4 @@ export * from './modix.exporter';
 export * from './ooyyo.exporter';
 export * from './rubrikk.exporter';
 export * from './facebook-shop.exporter';
+export * from './trovit.exporter';

package/src/exporters/trovit.exporter.ts

@@ -0,0 +1,49 @@
+import { Injectable } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+
+import { CronicleUtils } from '@bytebrand/cronicle-helper';
+import { FsChunkInterface } from '@bytebrand/chunkable';
+
+import { CarService, ConfigService, LoaderService, RulesService } from '../services';
+import { Exporter } from '../interfaces/exporter.interface';
+import { TrovitXmlBuilder } from '../formats';
+import { TrovitTransformer } from '../transformers';
+
+@Injectable()
+export class TrovitExporter implements Exporter {
+  constructor(
+    private carService: CarService,
+    private configService: ConfigService,
+    private loaderService: LoaderService,
+    private moduleRef: ModuleRef,
+    private rulesService: RulesService,
+  ) {}
+
+  async export(): Promise<void> {
+    const [fileXml] = this.configService.config.outputFiles;
+    await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
+    await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
+
+    const trovitXmlBuilder = new TrovitXmlBuilder(fileXml);
+    await trovitXmlBuilder.buildStart();
+
+    const trovitTransformer = await this.moduleRef.create(TrovitTransformer);
+
+    await this.loaderService.process(async (chunk: FsChunkInterface) => {
+      const chunkData = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
+
+      if (chunk && chunkData) {
+        for (let i = 0; i < chunk.data.length; i += 1) {
+          const data = chunk.data[i];
+
+          const transformedCar = await trovitTransformer.transform(data);
+
+          await trovitXmlBuilder.addItem(transformedCar);
+          this.carService.counter.countCar(data.images);
+        }
+      }
+    });
+
+    await trovitXmlBuilder.buildEnd();
+  }
+}

package/src/formats/index.ts

@@ -1,3 +1,4 @@
 export * from './rubrikk-xml.builder';
 export * from './modix-xml.builder';
 export * from './facebook-shop.builder';
+export * from './trovit-xml.builder';

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

@@ -0,0 +1,44 @@
+import { XMLBuilderBase } from '@bytebrand/cronicle-helper';
+import { TrovitXmlItem } from '../interfaces';
+
+export class TrovitXmlBuilder extends XMLBuilderBase {
+  async buildStart(): Promise<void> {
+    await this.write('<?xml version="1.0" encoding="utf-8"?>\n<trovit>\n');
+  }
+
+  async addItem(car: TrovitXmlItem): Promise<void> {
+    let item = '\n<ad>\n';
+
+    const tags = Object.keys(car);
+
+    for (const tag of tags) {
+      if (tag === 'pictures') {
+        item += this.mapPictures(car[tag]);
+      } else {
+        item += this.getElement(tag, car[tag]?.value, true, car[tag]?.atributes);
+      }
+    }
+    item += '</ad>';
+
+    await this.write(item);
+  }
+
+  async buildEnd(): Promise<void> {
+    await this.write('</trovit>');
+    await this.end();
+  }
+
+  mapPictures(images: Array<string>) {
+    let item = '<pictures>';
+
+    images.map(url => {
+      item += '<picture>\n';
+      item += this.getElement('picture_url', url, true);
+      item += '</picture>\n';
+    });
+
+    item += '</pictures>\n';
+
+    return item;
+  }
+}

package/src/interfaces/{autoborse.intreface.ts → atributes-wrap-item.intreface.ts}

@@ -1,4 +1,4 @@
-export interface IModixWrapItem {
+export interface IAtributeWrapItem {
   value: string | boolean | number;
   atributes?: {
     [key: string]: any;

package/src/interfaces/export-item.interface.ts

@@ -1,6 +1,6 @@
 import { DataSchemes } from '@bytebrand/car-schema';
 
-import { IModixWrapItem } from './autoborse.intreface';
+import { IAtributeWrapItem } from './atributes-wrap-item.intreface';
 import { Description } from './description.interface';
 
 export interface FbXmlItem {
@@ -97,7 +97,7 @@ export interface MeinstadtJsonItem {
   sellerType: string;
   usageState: string;
   imagesCount: number;
-  images: string[];
+  images: string;
   power: number;
   'transmissionType/transmission': string;
   'customerType/sellerType': string;
@@ -205,19 +205,19 @@ export interface RubrikkXmlItem {
 
 export interface ModixXmlItem {
   maindata: {
-    category: IModixWrapItem;
-    manufacturer: IModixWrapItem;
-    model: IModixWrapItem;
-    submodel: IModixWrapItem;
-    mileage: IModixWrapItem;
-    cylinderCapacity: IModixWrapItem;
-    enginePower: IModixWrapItem;
-    fuel: IModixWrapItem;
-    accident: IModixWrapItem;
-    transmission: IModixWrapItem;
-    usageCategory: IModixWrapItem;
-    bodyStyle: IModixWrapItem;
-    isOnline: IModixWrapItem;
+    category: IAtributeWrapItem;
+    manufacturer: IAtributeWrapItem;
+    model: IAtributeWrapItem;
+    submodel: IAtributeWrapItem;
+    mileage: IAtributeWrapItem;
+    cylinderCapacity: IAtributeWrapItem;
+    enginePower: IAtributeWrapItem;
+    fuel: IAtributeWrapItem;
+    accident: IAtributeWrapItem;
+    transmission: IAtributeWrapItem;
+    usageCategory: IAtributeWrapItem;
+    bodyStyle: IAtributeWrapItem;
+    isOnline: IAtributeWrapItem;
   };
   bodyColors: bodyColorItem;
   dates: mapSameTagsItem[];
@@ -241,48 +241,48 @@ export interface tagWrapperItem {
 export interface bodyColorItem {
   id: number;
   data: {
-    name: IModixWrapItem;
-    description: IModixWrapItem;
-    paint: IModixWrapItem;
+    name: IAtributeWrapItem;
+    description: IAtributeWrapItem;
+    paint: IAtributeWrapItem;
   };
 }
 
 export interface identificationItem {
   hsnTsn: {
-    hsn: IModixWrapItem;
-    tsn: IModixWrapItem;
+    hsn: IAtributeWrapItem;
+    tsn: IAtributeWrapItem;
   };
-  vin: IModixWrapItem;
-  datEuropacode: IModixWrapItem;
-  schwackecode: IModixWrapItem;
+  vin: IAtributeWrapItem;
+  datEuropacode: IAtributeWrapItem;
+  schwackecode: IAtributeWrapItem;
 }
 
 export interface imageItem {
   url: string;
-  imageList: IModixWrapItem[];
+  imageList: IAtributeWrapItem[];
 }
 
 export interface priceItem {
   vatReclaimable: boolean;
-  grossPrice: IModixWrapItem;
+  grossPrice: IAtributeWrapItem;
 }
 
 export interface dealerItem {
   address: {
-    company: IModixWrapItem;
-    street: IModixWrapItem;
-    city: IModixWrapItem;
-    zip: IModixWrapItem;
-    country: IModixWrapItem;
-    phone: IModixWrapItem;
-    fax: IModixWrapItem;
-    email: IModixWrapItem;
-    homepage: IModixWrapItem;
+    company: IAtributeWrapItem;
+    street: IAtributeWrapItem;
+    city: IAtributeWrapItem;
+    zip: IAtributeWrapItem;
+    country: IAtributeWrapItem;
+    phone: IAtributeWrapItem;
+    fax: IAtributeWrapItem;
+    email: IAtributeWrapItem;
+    homepage: IAtributeWrapItem;
   };
   imprint: {
-    registerId: IModixWrapItem;
-    representitive: IModixWrapItem;
-    vatid: IModixWrapItem;
+    registerId: IAtributeWrapItem;
+    representitive: IAtributeWrapItem;
+    vatid: IAtributeWrapItem;
   };
 }
 
@@ -310,3 +310,31 @@ export interface FacebookShopTag {
   isGoogle: boolean;
   value: any;
 }
+
+export interface TrovitXmlItem {
+  id: IAtributeWrapItem;
+  url: IAtributeWrapItem;
+  title: IAtributeWrapItem;
+  content: IAtributeWrapItem;
+  price: IAtributeWrapItem;
+  car_type: IAtributeWrapItem;
+  dealer: IAtributeWrapItem;
+  postcode: IAtributeWrapItem;
+  vin_database: IAtributeWrapItem;
+  make: IAtributeWrapItem;
+  model: IAtributeWrapItem;
+  color: IAtributeWrapItem;
+  year: IAtributeWrapItem;
+  mileage: IAtributeWrapItem;
+  doors: IAtributeWrapItem;
+  seats: IAtributeWrapItem;
+  engine_size: IAtributeWrapItem;
+  cylinders: IAtributeWrapItem;
+  fuel: IAtributeWrapItem;
+  transmission: IAtributeWrapItem;
+  power: IAtributeWrapItem;
+  fuel_consumption: IAtributeWrapItem;
+  co2_emissions: IAtributeWrapItem;
+  pictures: Array<string>;
+  is_new: IAtributeWrapItem;
+}

package/src/interfaces/index.ts

@@ -1,2 +1,3 @@
 export * from './export-item.interface';
 export * from './modix';
+export * from './atributes-wrap-item.intreface';

package/src/interfaces/modix/index.ts

@@ -1,2 +1 @@
-export * from './modix-wrap-item.intreface';
 export * from './modix-item-list.interface';

package/src/interfaces/modix/modix-item-list.interface.ts

@@ -1,5 +1,5 @@
-import { IModixWrapItem } from './modix-wrap-item.intreface';
+import { IAtributeWrapItem } from '../atributes-wrap-item.intreface';
 
 export interface IModixItemsList {
-  [key: string]: IModixWrapItem;
+  [key: string]: IAtributeWrapItem;
 }

package/src/services/images.service.ts

@@ -1,4 +1,4 @@
-import { get, toString } from 'lodash';
+import { get } from 'lodash';
 
 import { Injectable } from '@nestjs/common';
 
@@ -7,7 +7,7 @@ import { ImboImageResponseInterface } from '@bytebrand/chunkable';
 import { DataSchemes } from '@bytebrand/car-schema';
 
 import { FB_MAX_IMAGE_COUNT_FOR_DEAFULT } from '../constants/fb.constants';
-import { isNotEmptyArray } from '../utils/validator.utils';
+import { isNotEmptyArray } from '../utils';
 import { ConfigService } from './config.service';
 import { UserService } from './user.service';
 import { ImageType } from '../enums';
@@ -20,21 +20,26 @@ export class ImagesService {
     'https://images.auto.de/carimage/noimage/pFyfBsqBHEso/large-cached.jpeg',
   ];
 
-  constructor(private readonly configService: ConfigService, private readonly userService: UserService) { }
+  constructor(private readonly configService: ConfigService, private readonly userService: UserService) {}
 
   async getImages(
     car: DataSchemes.Car,
     images: ImboImageResponseInterface[],
     imageType: ImageType,
+    ignoreDefImages: boolean,
   ): Promise<Array<string>> {
     if (imageType === ImageType.default) {
-      return this.getDefaultImages(car, images);
+      return this.getDefaultImages(car, images, ignoreDefImages);
     } else {
-      return await this.getMarketingImages(car, images);
+      return await this.getMarketingImages(car, images, ignoreDefImages);
     }
   }
 
-  getDefaultImages(car: DataSchemes.Car, images: ImboImageResponseInterface[]): Array<string> {
+  getDefaultImages(
+    car: DataSchemes.Car,
+    images: ImboImageResponseInterface[],
+    ignoreDefImages: boolean,
+  ): Array<string> {
     if (!isNotEmptyArray(images)) {
       return this.DEFAULT_IMAGES;
     }
@@ -42,7 +47,7 @@ export class ImagesService {
     const sortedImages = this.sortImages(images, car);
     const transformedImages = this.generateImageLinks(sortedImages, get(car, '_id'));
 
-    if (transformedImages.length < 17) {
+    if (!ignoreDefImages && transformedImages.length < 17) {
       transformedImages.push(...this.DEFAULT_IMAGES);
     }
 
@@ -55,7 +60,11 @@ export class ImagesService {
     });
   }
 
-  async getMarketingImages(car: DataSchemes.Car, images: ImboImageResponseInterface[]): Promise<string[]> {
+  async getMarketingImages(
+    car: DataSchemes.Car,
+    images: ImboImageResponseInterface[],
+    ignoreDefImages: boolean,
+  ): Promise<string[]> {
     const imageUrl = this.configService.config.marketingImageUrl;
 
     const transformedImages = this.transformImagesArrayIntoObject(images);
@@ -75,7 +84,7 @@ export class ImagesService {
       }
     }
 
-    if (imageUrls.length < FB_MAX_IMAGE_COUNT_FOR_DEAFULT) {
+    if (!ignoreDefImages && imageUrls.length < FB_MAX_IMAGE_COUNT_FOR_DEAFULT) {
       imageUrls.push(...this.DEFAULT_IMAGES);
     }
 
@@ -85,7 +94,7 @@ export class ImagesService {
   private transformImagesArrayIntoObject(images: ImboImageResponseInterface[]) {
     const result: { [imageCode: string]: string } = {};
     images.forEach(image => {
-      const imageCode = image.imageCodePredicted.split('-')[0];
+      const imageCode = image?.imageCodePredicted?.split('-')[0];
       result[imageCode] = image.imageIdentifier;
     });
     return result;

package/src/services/index.ts

@@ -1,8 +1,9 @@
-export * from './user.service';
-export * from './rules.service';
-export * from './car.service';
-export * from './loader.service';
-export * from './config.service';
+export * from './transformer.service';
 export * from './request.service';
 export * from './mapping.service';
+export * from './loader.service';
+export * from './config.service';
 export * from './images.service';
+export * from './rules.service';
+export * from './user.service';
+export * from './car.service';