@bytebrand/export-cars 1.0.6 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",
@@ -34,10 +34,12 @@
     "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"
+    "vin-generator": "^1.0.1",
+    "winston": "^3.8.2"
   },
   "devDependencies": {
     "@nestjs/cli": "^9.0.0",
@@ -62,5 +64,5 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "6f0fe5e437dde6038b7f44c7b132905400f26b29"
+  "gitHead": "8f6de1762a4b742afd2e9020cf9a27d4fe0d57e3"
 }

package/src/export.command.ts

@@ -1,18 +1,16 @@
 import { Command, CommandRunner, InquirerService } from 'nest-commander';
 import { ConfigService } from './services/config.service';
 import { Input } from './interfaces/input.interface';
-import { Logger } from '@nestjs/common';
 import { exportSchema } from './export.schema';
 import { ModuleRef } from '@nestjs/core';
 import { Exporter } from './interfaces/exporter.interface';
+import { LoggerService } from '@bytebrand/cronicle-helper';
 
 @Command({
   name: 'export',
   options: { isDefault: true },
 })
 export class ExportRunner extends CommandRunner {
-  private readonly logger = new Logger(ExportRunner.name);
-
   constructor(
     private readonly inquirer: InquirerService,
     private configService: ConfigService,
@@ -24,12 +22,10 @@ export class ExportRunner extends CommandRunner {
   async run(): Promise<void> {
     const input = (await this.inquirer.ask<{ input: Input }>('input-questions', undefined)).input;
 
-    this.logger.log(`Running job: ${input.id} - ${JSON.stringify(input)}\n`);
+    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();
-
-    this.logger.log({ complete: 1, code: 0 });
   }
 }

package/src/main.ts

@@ -1,9 +1,14 @@
-import { Logger } from '@nestjs/common';
+import { LoggerService } from '@bytebrand/cronicle-helper';
 import { CommandFactory } from 'nest-commander';
 import { AppModule } from './app.module';
 
 async function bootstrap() {
-  await CommandFactory.run(AppModule, new Logger());
+  try {
+    await CommandFactory.run(AppModule, console);
+    LoggerService.complete();
+  } catch (e) {
+    LoggerService.exitError(e.message || e);
+  }
 }
 
 bootstrap();

package/src/services/loader.service.ts

@@ -1,12 +1,11 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { AbstractChunkable, FsChunkInterface, Loaders } from '@bytebrand/chunkable';
 import { ConfigService } from './config.service';
 import { toNumber } from 'lodash';
+import { LoggerService } from '@bytebrand/cronicle-helper';
 
 @Injectable()
 export class LoaderService {
-  private readonly logger = new Logger(LoaderService.name);
-
   constructor(private configService: ConfigService) {}
 
   private loader: AbstractChunkable;
@@ -20,7 +19,7 @@ export class LoaderService {
         await fn(chunk);
 
         const progress = (toNumber(chunk.id) + 1) / chunk.total;
-        this.logger.log(progress < 1 ? progress : 1);
+        LoggerService.progress(progress < 1 ? progress : 1);
       });
 
       this.loader.onError(reject);

package/src/services/rules.service.ts

@@ -1,4 +1,5 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { LoggerService } from '@bytebrand/cronicle-helper';
+import { Injectable } from '@nestjs/common';
 import { concat, toSafeInteger, toString } from 'lodash';
 import { DateRule } from '../rules/date.rule';
 import { NumberRule } from '../rules/number.rule';
@@ -7,7 +8,6 @@ import { ConfigService } from './config.service';
 
 @Injectable()
 export class RulesService {
-  private readonly logger = new Logger(RulesService.name);
   constructor(private configService: ConfigService) {}
 
   private _rules: Array<StringRule | NumberRule | DateRule>;
@@ -42,7 +42,7 @@ export class RulesService {
       });
       return rulesArr;
     } catch (error) {
-      this.logger.error(error);
+      LoggerService.error(error);
       return rulesArr;
     }
   }

package/src/transformers/as24.transformer.ts

@@ -3,11 +3,11 @@ import { DataSchemes } from '@bytebrand/car-schema';
 import { CarDescriptionFactory, DescriptionTypeEnum } from '@bytebrand/car-description';
 import { MappingService } from '../services/mapping.service';
 import { MappingRules } from '../interfaces/mapping-rules.interface';
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
+import { LoggerService } from '@bytebrand/cronicle-helper';
 
 @Injectable()
 export class As24Transformer {
-  private readonly logger = new Logger(As24Transformer.name);
   private currentCar: DataSchemes.Car;
   private descriptionSchemas: unknown;
 
@@ -97,7 +97,7 @@ export class As24Transformer {
         return this.selectorToCategoryOrClass_selector(fieldValue, rule);
       }
       default:
-        this.logger.log(`missing transform: ${transformProcedureName}`);
+        LoggerService.log(`missing transform: ${transformProcedureName}`);
         break;
     }
   }

package/src/transformers/mobile.transformer.ts

@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { DataSchemes } from '@bytebrand/car-schema';
 import { get, isEmpty, isNil, set, toString, upperFirst } from 'lodash';
 import { MappingService } from '../services/mapping.service';
@@ -7,12 +7,12 @@ import { UserService } from '../services/user.service';
 import { CarDescriptionFactory, DescriptionTypeEnum } from '@bytebrand/car-description';
 import { ConfigService } from '../services/config.service';
 import { isNotEmptyArray } from '../utils/validator.utils';
+import { LoggerService } from '@bytebrand/cronicle-helper';
 
 const vinGenerator = require('vin-generator');
 
 @Injectable()
 export class MobileTransformer {
-  private readonly logger = new Logger(MobileTransformer.name);
   private currentCar: DataSchemes.Car;
 
   constructor(
@@ -107,7 +107,7 @@ export class MobileTransformer {
         return this.selectorToCategoryOrClass_selector(fieldValue);
       }
       default:
-        this.logger.log(`missing transform: ${transformProcedureName}`);
+        LoggerService.log(`missing transform: ${transformProcedureName}`);
         break;
     }
   }
@@ -341,7 +341,7 @@ export class MobileTransformer {
     try {
       res = this.getImagesField(car._id, get(car, 'metaData.mainImageId', null), images);
     } catch (e) {
-      this.logger.error(e);
+      LoggerService.error(e);
       throw e;
     }
     let imagesAsALine;
@@ -438,7 +438,7 @@ export class MobileTransformer {
     if (found) {
       return `Car.${found}`;
     } else {
-      this.logger.log(`Missing mapping for: ${fieldValue}`);
+      LoggerService.log(`Missing mapping for: ${fieldValue}`);
       return 'Car.OtherCar';
     }
   }