@bytebrand/export-cars 1.6.6 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.6.6",
+  "version": "1.7.1",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -23,7 +23,7 @@
     "@bytebrand/cronicle-helper": "^1.15.1",
     "@bytebrand/fe-financing": "^5.4.3",
     "@bytebrand/i18n-dictionaries": "^1.4.2",
-    "@bytebrand/import-helper": "^0.34.0",
+    "@bytebrand/import-helper": "^0.35.1",
     "@bytebrand/schema-tools": "^3.13.24",
     "@bytebrand/zipper": "^2.1.1",
     "@nestjs/axios": "^0.1.0",
@@ -66,5 +66,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "3277f9bb7c9a77549373ee0cfa22cb42e5f426de"
+  "gitHead": "576796025589c6f58778c40db7429e15926edfa1"
 }

package/src/app.module.ts

@@ -1,19 +1,23 @@
-import Bottleneck from 'bottleneck';
 import { CacheModule, Module } from '@nestjs/common';
-import { ExportRunner } from './export.command';
-import { ConfigService } from './services/config.service';
-import { CarService } from './services/car.service';
-import { RequestService } from './services/request.service';
-import { MappingService } from './services/mapping.service';
-import { UserService } from './services/user.service';
+import Bottleneck from 'bottleneck';
+
 import { InputQuestions } from './input.questions';
-import { HttpModule } from '@nestjs/axios';
-import { LoaderService } from './services/loader.service';
-import { RulesService } from './services/rules.service';
-import { MarketingImagesService } from './services/marketing-images.service';
+import { ExportRunner } from './export.command';
+import {
+  ConfigService,
+  RequestService,
+  MappingService,
+  CarService,
+  UserService,
+  LoaderService,
+  RulesService,
+  MarketingImagesService
+} from './services';
 
 @Module({
-  imports: [CacheModule.register(), HttpModule],
+  imports: [
+    CacheModule.register(),
+  ],
   providers: [
     InputQuestions,
     ExportRunner,
@@ -31,4 +35,5 @@ import { MarketingImagesService } from './services/marketing-images.service';
     },
   ],
 })
-export class AppModule {}
+
+export class AppModule { }

package/src/export.command.ts

@@ -26,7 +26,7 @@ export class ExportRunner extends CommandRunner {
       rl.on('line', async (data: string) => {
         const input = JSON.parse(data) as Input;
         LoggerService.log(`Running job: ${input.id} - ${JSON.stringify(input)}\n`);
-        
+
         this.configService.config = new exportSchema[input.params.exportType].config(input.params);
         const exporter = await this.moduleRef.create<Exporter>(exportSchema[input.params.exportType].exporter);
         await exporter.export().catch(reject);

package/src/exporters/modix.exporter.ts

@@ -1,7 +1,8 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 
-import { CronicleUtils } from '@bytebrand/cronicle-helper';
+import { CronicleUtils, ImportOrigins } from '@bytebrand/cronicle-helper';
+import { MappingBuilder } from '@bytebrand/import-helper';
 import { FsChunkInterface } from '@bytebrand/chunkable';
 
 import { CarService, ConfigService, LoaderService } from '../services';
@@ -9,6 +10,7 @@ import { Exporter } from '../interfaces/exporter.interface';
 import { ModixTransformer } from '../transformers';
 import { ModixXmlBuilder } from '../formats';
 
+
 @Injectable()
 export class ModixExporter implements Exporter {
   constructor(
@@ -19,9 +21,13 @@ export class ModixExporter implements Exporter {
   ) {}
   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 mappingBuilder = new MappingBuilder(this.configService.config.apikey);
+    await mappingBuilder.loadMappingRules(ImportOrigins.MODIX);
+
     const modixXmlBuilder = new ModixXmlBuilder(fileXml);
     await modixXmlBuilder.buildStart();
 
@@ -32,8 +38,8 @@ export class ModixExporter implements Exporter {
         for (let i = 0; i < chunk.data.length; i += 1) {
           const data = chunk.data[i];
 
-          const transformed_car = await modixTransformer.transform(data);
-          await modixXmlBuilder.addItem(transformed_car);
+          const transformedCar = await modixTransformer.transform(data, mappingBuilder.getMappingRules({ reversTransforming: true }));
+          await modixXmlBuilder.addItem(transformedCar);
 
           this.carService.counter.countCar(data.images);
         }

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

@@ -52,6 +52,10 @@ export class ModixXmlBuilder extends XMLBuilderBase {
           item += this.mapDealer(car.dealer.address, car.dealer.imprint);
           break;
         }
+        case 'options': {
+          item += this.mapOptions(car);
+          break;
+        }
         default: {
           item += this.getElement(tag, value, false);
         }
@@ -164,4 +168,19 @@ export class ModixXmlBuilder extends XMLBuilderBase {
     await this.write('\n</vehicles>\n</vehiclePool>\n</automotive>');
     await this.end();
   }
+  // { [id: string]: string }
+  mapOptions(car: ModixXmlItem) {
+    const result = [];
+
+    for (const id in car.options) {
+      const value = car.options[id];
+      result.push(
+        `<option id="${id}">
+          <value>${value}</value>
+        </option>`
+      );
+    }
+
+    return `<options>${result.join('')}</options>`
+  }
 }

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

@@ -1,3 +1,5 @@
+import { DataSchemes } from '@bytebrand/car-schema';
+
 import { IModixWrapItem } from './autoborse.intreface';
 
 export interface FbXmlItem {
@@ -217,6 +219,7 @@ export interface ModixXmlItem {
   prices: priceItem;
   images: imageItem;
   dealer: dealerItem;
+  options: Omit<DataSchemes.Car, 'state'>;
 }
 
 export interface mapSameTagsItem {

package/src/services/index.ts

@@ -3,3 +3,7 @@ export * from './rules.service';
 export * from './car.service';
 export * from './loader.service';
 export * from './config.service';
+export * from './request.service';
+export * from './mapping.service';
+export * from './marketing-images.service';
+

package/src/transformers/modix.transformer.ts

@@ -1,13 +1,18 @@
-import { findLast, get, toNumber, toSafeInteger, toString } from 'lodash';
+import { findLast, get, omit, toNumber, toSafeInteger, toString } from 'lodash';
 import * as moment from 'moment/moment';
 
 import { Injectable } from '@nestjs/common';
 
+import { MappingRulesInterface, TransformerFactory } from '@bytebrand/import-helper';
 import { toLowercase } from '@bytebrand/schema-tools/dist/transform/utils';
 import { ImboImageResponseInterface } from '@bytebrand/chunkable';
+import { ImportOrigins } from '@bytebrand/cronicle-helper';
 import { DataSchemes } from '@bytebrand/car-schema';
 
-
+import { imageItem, IModixWrapItem, ModixXmlItem } from '../interfaces';
+import { isNotEmptyArray, isValidVin } from '../utils/validator.utils';
+import { CategoryList } from '../constants/modix/category.constant';
+import { ConfigService } from '../services/config.service';
 import {
   BodyColorList,
   VehicleClassList,
@@ -17,23 +22,19 @@ import {
   UsageConditionList,
   UsageTypeList,
 } from '../constants';
-import { imageItem, IModixWrapItem, ModixXmlItem } from '../interfaces';
-import { isNotEmptyArray, isValidVin } from '../utils/validator.utils';
-import { CategoryList } from '../constants/modix/category.constant';
-import { ConfigService } from '../services/config.service';
+
+
 
 @Injectable()
 export class ModixTransformer {
   constructor(private readonly configService: ConfigService) { }
 
-  transform({
-    car,
-    images,
-  }: {
-    car: DataSchemes.Car;
-    images: ImboImageResponseInterface[];
-  }): ModixXmlItem {
+  async transform(chunkData: { car: DataSchemes.Car; images: ImboImageResponseInterface[]; }, mappingRules: MappingRulesInterface[]): Promise<ModixXmlItem> {
+
+    const { car, images } = chunkData;
+    // await this.buildOptions(car, mappingRules);
     return {
+
       //Main data
       maindata: {
         category: this.getCategoryData(car),
@@ -108,6 +109,7 @@ export class ModixTransformer {
           vatid: { value: 'DE311875741' },
         },
       },
+      options: await this.buildOptions(car, mappingRules),
     };
   }
 
@@ -119,7 +121,9 @@ export class ModixTransformer {
   private getManufactureData(car: DataSchemes.Car): IModixWrapItem {
     const carMake = toString(get(car, 'mainData.make', ''));
     const manufactureData = findLast(ManufactureList, item => toLowercase(item.name) === toLowercase(carMake));
-    return { value: manufactureData.name || carMake, atributes: { id: manufactureData.id || null } };
+    // temporary
+    if (!manufactureData) { console.log(`missed manufactureData ${carMake}`); }
+    return { value: manufactureData?.name || carMake, atributes: { id: manufactureData?.id || null } };
   }
 
   private getFuelData(car: DataSchemes.Car): IModixWrapItem {
@@ -206,4 +210,11 @@ export class ModixTransformer {
     }
     return { url, imageList };
   }
+
+  private async buildOptions(car: DataSchemes.Car, mappingRules: MappingRulesInterface[]): Promise<Omit<DataSchemes.Car, 'state'>> {
+    const transformer = TransformerFactory.createTransformer(ImportOrigins.MODIX, car, { importSelectorMappingLog: () => { } } as any, [{ make: 'make', model: 'model' }], ['alt_model']);
+    const { car: transformedCar } = await transformer.transform(mappingRules);
+
+    return omit(transformedCar, ['state']);
+  }
 }