@bytebrand/export-cars 1.3.1 → 1.4.0

package/src/exporters/mobile.exporter.ts

@@ -1,11 +1,9 @@
-import { CarService } from '../services/car.service';
-import { ConfigService } from '../services/config.service';
+import { CarService, RulesService, LoaderService, ConfigService } from '../services';
 import { FsChunkInterface } from '@bytebrand/chunkable';
 import { writeFile } from 'fs/promises';
 import { MobileTransformer } from '../transformers/mobile.transformer';
 import { convertToCSV } from '../utils/converter.utils';
 import { Exporter } from '../interfaces/exporter.interface';
-import { LoaderService } from '../services/loader.service';
 import { CronicleUtils } from '@bytebrand/cronicle-helper';
 import { Zipper } from '@bytebrand/zipper';
 import { normalize, join, extname } from 'path';
@@ -14,7 +12,7 @@ import { ModuleRef } from '@nestjs/core';
 import { HttpService } from '@nestjs/axios';
 import { lastValueFrom } from 'rxjs';
 import { get } from 'lodash';
-import { RulesService } from '../services/rules.service';
+import { FileTypes } from '../enums';
 
 @Injectable()
 export class MobileExporter implements Exporter {
@@ -28,6 +26,8 @@ export class MobileExporter implements Exporter {
   ) {}
 
   async export(): Promise<void> {
+    const fileName = '416';
+
     await CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
     await CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
     if (this.configService.config.downloadImages) {
@@ -56,7 +56,7 @@ export class MobileExporter implements Exporter {
           const transformedDataCSV = `${convertToCSV(transformedData)}\n`;
 
           await writeFile(
-            `${this.configService.config.pathesConfig.localConvertedDirectory}/${this.configService.config.fileName}.csv`,
+            `${this.configService.config.pathesConfig.localConvertedDirectory}/${fileName}.${FileTypes.csv}`,
             Buffer.from(transformedDataCSV),
             { flag: 'a' },
           );
@@ -67,10 +67,10 @@ export class MobileExporter implements Exporter {
     });
 
     const fileZIP = normalize(
-      `${this.configService.config.pathesConfig.localConvertedDirectory}/${this.configService.config.fileName}.zip`,
+      `${this.configService.config.pathesConfig.localConvertedDirectory}/${fileName}.${FileTypes.zip}`,
     );
     const fileCSV = normalize(
-      `${this.configService.config.pathesConfig.localConvertedDirectory}/${this.configService.config.fileName}.csv`,
+      `${this.configService.config.pathesConfig.localConvertedDirectory}/${fileName}.${FileTypes.csv}`,
     );
     const fileList = [fileCSV];
     if (this.configService.config.downloadImages) {
@@ -94,7 +94,7 @@ export class MobileExporter implements Exporter {
         const imageFile = join(
           this.configService.config.pathesConfig.localConvertedDirectory,
           'images',
-          `${vehicleId}_${index + 1}${extname(imageUrl) || '.jpg'}`,
+          `${vehicleId}_${index + 1}${extname(imageUrl) || FileTypes.jpg}`,
         );
 
         return writeFile(imageFile, response.data, { flag: 'w' });

package/src/exporters/ooyyo.exporter.ts

@@ -1,9 +1,7 @@
 import { Injectable } from '@nestjs/common';
-import { CarService } from '../services/car.service';
-import { ConfigService } from '../services/config.service';
+import { CarService, LoaderService, ConfigService, RulesService } from '../services';
 import { FsChunkInterface } from '@bytebrand/chunkable';
 import { Exporter } from '../interfaces/exporter.interface';
-import { LoaderService } from '../services/loader.service';
 import { CronicleUtils } from '@bytebrand/cronicle-helper';
 import { ModuleRef } from '@nestjs/core';
 import { Zipper } from '@bytebrand/zipper';
@@ -17,6 +15,7 @@ export class OoyyoExporter implements Exporter {
     private configService: ConfigService,
     private loaderService: LoaderService,
     private moduleRef: ModuleRef,
+    private rulesService: RulesService,
   ) {}
 
   async export(): Promise<void> {
@@ -32,7 +31,9 @@ export class OoyyoExporter implements Exporter {
     await ooyyoXmlBuilder.buildStart();
 
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
-      if (chunk && chunk.data) {
+      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 { car, images } = data;

package/src/exporters/rubrikk.exporter.ts

@@ -1,14 +1,14 @@
 import { Injectable } from '@nestjs/common';
-import { Exporter } from '../interfaces/exporter.interface';
-import { CarService } from '../services/car.service';
-import { ConfigService } from '../services/config.service';
-import { LoaderService } from '../services/loader.service';
 import { ModuleRef } from '@nestjs/core';
-import { CronicleUtils } from '@bytebrand/cronicle-helper';
+
+import { FsChunkInterface } from '@bytebrand/chunkable';
 import { Zipper } from '@bytebrand/zipper';
-import { RubrikkXmlBuilder } from '../formats';
+
+import { CarService, ConfigService, LoaderService, RulesService } from '../services';
+import { Exporter } from '../interfaces/exporter.interface';
+import { CronicleUtils } from '@bytebrand/cronicle-helper';
 import { RubrikkTransformer } from '../transformers';
-import { FsChunkInterface } from '@bytebrand/chunkable';
+import { RubrikkXmlBuilder } from '../formats';
 
 @Injectable()
 export class RubrikkExporter implements Exporter {
@@ -17,7 +17,9 @@ export class RubrikkExporter implements Exporter {
     private configService: ConfigService,
     private loaderService: LoaderService,
     private moduleRef: ModuleRef,
+    private rulesService: RulesService,
   ) {}
+
   async export(): Promise<void> {
     for (const file of this.configService.config.outputFiles) {
       const exists = await CronicleUtils.exists(file);
@@ -31,7 +33,9 @@ export class RubrikkExporter implements Exporter {
 
     await rubrikkXmlBuilder.buildStart();
     await this.loaderService.process(async (chunk: FsChunkInterface) => {
-      if (chunk && chunk.data) {
+      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 { car, images } = data;

package/src/services/index.ts

@@ -0,0 +1,5 @@
+export * from './user.service';
+export * from './rules.service';
+export * from './car.service';
+export * from './loader.service';
+export * from './config.service';

package/src/services/mapping.service.ts

@@ -13,7 +13,7 @@ export class MappingService {
   async getRules(): Promise<MappingRules[]> {
     if (!this.rules) {
       const spreadsheet = new GoogleSpreadsheet(this.configService.config.mappingSpreadsheetId);
-      spreadsheet.useApiKey(this.configService.config.googleSheetsApiKey);
+      spreadsheet.useApiKey(this.configService.config.apikey);
       await spreadsheet.loadInfo();
       const rows = await spreadsheet.sheetsByTitle[this.configService.config.mappingSpreadsheetTitle].getRows();
       const mappingRules = this.rowsToRules(rows) as MappingRules[];
@@ -33,7 +33,7 @@ export class MappingService {
   async getDealersMapping(): Promise<DealersMapping[]> {
     if (!this.dealers) {
       const spreadsheet = new GoogleSpreadsheet(this.configService.config.dealersSpreadsheetId);
-      spreadsheet.useApiKey(this.configService.config.googleSheetsApiKey);
+      spreadsheet.useApiKey(this.configService.config.apikey);
       await spreadsheet.loadInfo();
       const rows = await spreadsheet.sheetsByTitle[this.configService.config.dealersSpreadsheetTitle].getRows();
       this.dealers = this.rowsToRules(rows) as DealersMapping[];

package/src/services/user.service.ts

@@ -3,6 +3,7 @@ import { RequestService } from './request.service';
 import { Cache } from 'cache-manager';
 import { get } from 'lodash';
 import { MarketingImageConfigInterface, MarketingImageConfigsInterface } from '@bytebrand/autode-request';
+import { ExportType, FileTypes } from '../enums';
 
 @Injectable()
 export class UserService {
@@ -49,4 +50,8 @@ export class UserService {
 
     return result;
   }
+
+  getFileName(exportType: ExportType, fileType: FileTypes): string {
+    return `api_export_cars_${exportType}.${fileType}`;
+  }
 }

package/src/transformers/as24.transformer.ts

@@ -5,13 +5,14 @@ import { MappingService } from '../services/mapping.service';
 import { MappingRules } from '../interfaces/mapping-rules.interface';
 import { Injectable } from '@nestjs/common';
 import { LoggerService } from '@bytebrand/cronicle-helper';
+import { UserService } from '../services';
 
 @Injectable()
 export class As24Transformer {
   private currentCar: DataSchemes.Car;
   private descriptionSchemas: unknown;
 
-  constructor(private mappingService: MappingService) {}
+  constructor(private mappingService: MappingService, private readonly userService: UserService) {}
 
   async transform(carData: DataSchemes.Car, descriptionSchemas: unknown): Promise<unknown> {
     this.currentCar = carData;
@@ -141,7 +142,8 @@ export class As24Transformer {
 
   private async offerStringToString(): Promise<string> {
     const dealerID = get(this.currentCar, 'metaData.ownerId');
-    const descriptionSchema = get(this.descriptionSchemas, dealerID);
+
+    const descriptionSchema = await this.userService.getDefaultSummaryByDealerId(dealerID);
     const descriptionBuilder = CarDescriptionFactory.create(DescriptionTypeEnum.Mobile, this.currentCar);
     return descriptionBuilder.transform(descriptionSchema);
   }

package/src/transformers/mobile.transformer.ts

@@ -344,7 +344,7 @@ export class MobileTransformer {
   }
 
   private getAutodeUrl(car: DataSchemes.Car): string {
-    return `${this.configService.config.carDetailsUrl}${car._id}?source=classifieds&medium=listing&campaign=${this.configService.config.campaign}`;
+    return `${this.configService.config.url}${car._id}?source=classifieds&medium=listing&campaign=${this.configService.config.campaign}`;
   }
 
   private getImages(car: DataSchemes.Car, images: unknown[]): string | null {
@@ -483,10 +483,9 @@ export class MobileTransformer {
       { url: 'https://images.auto.de/carimage/noimage/pFyfBsqBHEso/large-cached.jpeg' },
     ];
     if (isNotEmptyArray(images)) {
-      const imageList = images.sort(this.setMainImageFirst(mainImageId)).map((image: any) => {
+      return images.sort(this.setMainImageFirst(mainImageId)).map((image: any) => {
         return { url: this.buildLargeImageUrl(carId, image.imageIdentifier) };
       });
-      return imageList;
     }
     return defImages;
   }

package/src/transformers/ooyyo.transformer.ts

@@ -30,7 +30,7 @@ export class OoyyoTransformer {
     }
 
     return {
-      url: `https://www.${this.configService.config.url}/search/vehicle/${autodeid}`,
+      url: `https://www.${this.configService.config.url}/search/vehicle/${autodeid}?source=classifieds&medium=listing&campaign=ooyyo`,
       title: this.getTitle(car),
       content: trim(toString(get(car, 'offer.offerDescription', ''))),
       price: toString(get(car, 'price.currentSalesPrice', '')),

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

@@ -1,3 +0,0 @@
-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,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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 +0,0 @@
-{"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/src/utils/parser.utils.ts

@@ -1,17 +0,0 @@
-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 [];
-}