@bytebrand/export-cars 1.26.19-hotfix.1 → 1.26.19-hotfix.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +58 -0
- package/dist/configs/config.d.ts +4 -1
- package/dist/configs/config.js +3 -0
- package/dist/configs/config.js.map +1 -1
- package/dist/configs/google.config.js +25 -0
- package/dist/configs/google.config.js.map +1 -1
- package/dist/export.command.js +1 -0
- package/dist/export.command.js.map +1 -1
- package/dist/exporters/google.exporter.js +20 -2
- package/dist/exporters/google.exporter.js.map +1 -1
- package/dist/interfaces/export-item.interface.d.ts +2 -2
- package/dist/interfaces/params.interface.d.ts +18 -0
- package/dist/services/feed-items-bigquery.writer.d.ts +17 -0
- package/dist/services/feed-items-bigquery.writer.js +96 -0
- package/dist/services/feed-items-bigquery.writer.js.map +1 -0
- package/dist/services/publication-gate.d.ts +15 -0
- package/dist/services/publication-gate.js +107 -0
- package/dist/services/publication-gate.js.map +1 -0
- package/dist/transformers/auto24.transfomer.js +1 -1
- package/dist/transformers/auto24.transfomer.js.map +1 -1
- package/dist/transformers/autouncle.transformer.js +1 -1
- package/dist/transformers/autouncle.transformer.js.map +1 -1
- package/dist/transformers/awin.transformer.js +1 -1
- package/dist/transformers/awin.transformer.js.map +1 -1
- package/dist/transformers/criteo.transformer.js +1 -1
- package/dist/transformers/criteo.transformer.js.map +1 -1
- package/dist/transformers/fb.transformer.js +2 -2
- package/dist/transformers/fb.transformer.js.map +1 -1
- package/dist/transformers/google-feed-envkv.d.ts +10 -0
- package/dist/transformers/google-feed-envkv.js +126 -0
- package/dist/transformers/google-feed-envkv.js.map +1 -0
- package/dist/transformers/google-feed-item-row.d.ts +30 -0
- package/dist/transformers/google-feed-item-row.js +39 -0
- package/dist/transformers/google-feed-item-row.js.map +1 -0
- package/dist/transformers/google.transformer.d.ts +0 -4
- package/dist/transformers/google.transformer.js +10 -48
- package/dist/transformers/google.transformer.js.map +1 -1
- package/dist/transformers/mobile.transformer.js +3 -2
- package/dist/transformers/mobile.transformer.js.map +1 -1
- package/dist/transformers/rubrikk.transformer.js +1 -1
- package/dist/transformers/rubrikk.transformer.js.map +1 -1
- package/dist/transformers/santander.transformer.js +3 -2
- package/dist/transformers/santander.transformer.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +4 -2
- package/schema/feed-items.json +134 -0
- package/src/configs/config.ts +7 -1
- package/src/configs/google.config.ts +26 -1
- package/src/export.command.ts +1 -0
- package/src/exporters/google.exporter.ts +23 -2
- package/src/interfaces/export-item.interface.ts +2 -2
- package/src/interfaces/params.interface.ts +26 -0
- package/src/services/feed-items-bigquery.writer.ts +101 -0
- package/src/services/publication-gate.ts +120 -0
- package/src/transformers/auto24.transfomer.ts +2 -1
- package/src/transformers/autouncle.transformer.ts +2 -1
- package/src/transformers/awin.transformer.ts +2 -1
- package/src/transformers/criteo.transformer.ts +2 -1
- package/src/transformers/fb.transformer.ts +5 -2
- package/src/transformers/google-feed-envkv.ts +168 -0
- package/src/transformers/google-feed-item-row.ts +78 -0
- package/src/transformers/google.transformer.ts +24 -50
- package/src/transformers/mobile.transformer.ts +6 -2
- package/src/transformers/rubrikk.transformer.ts +2 -1
- package/src/transformers/santander.transformer.ts +6 -2
- package/test/google-feed-envkv.test.ts +132 -0
- package/test/google-feed-item-row.test.ts +135 -0
- package/test/publication-gate.test.ts +86 -0
package/README.md
CHANGED
|
@@ -15,6 +15,64 @@
|
|
|
15
15
|
<!--[](https://opencollective.com/nest#backer)
|
|
16
16
|
[](https://opencollective.com/nest#sponsor)-->
|
|
17
17
|
|
|
18
|
+
## Google feed items in BigQuery (opt-in)
|
|
19
|
+
|
|
20
|
+
The Google export can record every item it writes to the XML in a BigQuery table, one row per item
|
|
21
|
+
per run, so a Merchant Center issue can be traced back to what was sent (EnVKV values, the field the
|
|
22
|
+
electric range came from, price, ...). Schema: `schema/feed-items.json`.
|
|
23
|
+
|
|
24
|
+
Job params (all three must be set, otherwise no BigQuery call is made):
|
|
25
|
+
|
|
26
|
+
| Param | Example |
|
|
27
|
+
|----------------------|------------------|
|
|
28
|
+
| `feedItemsBqProject` | `my-gcp-project` |
|
|
29
|
+
| `feedItemsBqDataset` | `feeds` |
|
|
30
|
+
| `feedItemsBqTable` | `feed_items` |
|
|
31
|
+
|
|
32
|
+
Credentials come from `credentials/google-cloud-project-id.json` in the plugin's working directory
|
|
33
|
+
(as in the import plugins). Rows are streamed in batches of 500 in the background; a BigQuery error
|
|
34
|
+
is logged and never fails the export (after 3 failed batches the run stops trying). `exportedAt` is
|
|
35
|
+
the start of the run, `partitionDay` its UTC day.
|
|
36
|
+
|
|
37
|
+
Create the table once, partitioned by day on `partitionDay`:
|
|
38
|
+
|
|
39
|
+
```bash
|
|
40
|
+
bq mk --table \
|
|
41
|
+
--time_partitioning_field=partitionDay \
|
|
42
|
+
--time_partitioning_type=DAY \
|
|
43
|
+
--description="Items sent in the Google feed, one row per item per export run" \
|
|
44
|
+
my-gcp-project:feeds.feed_items \
|
|
45
|
+
schema/feed-items.json
|
|
46
|
+
```
|
|
47
|
+
|
|
48
|
+
Tables created before 1.26.28 need the two gate columns: `bq update <table> schema/feed-items.json`.
|
|
49
|
+
|
|
50
|
+
## Publication gate for estimated EnVKV values (EnVKV C8)
|
|
51
|
+
|
|
52
|
+
car-basic-data fills missing or implausible consumption / CO2 values from the CO2 estimator, the
|
|
53
|
+
make-model template sheet or global defaults, and logs each such change to its enrichment log in
|
|
54
|
+
BigQuery. The car itself does not say which of its values are estimates, so the Google export reads
|
|
55
|
+
the log: a field counts as estimated when its latest log row has `finalValueSource` `co2-estimate`,
|
|
56
|
+
`mmm` or `globalDefault` and that row's final value is still the value stored on the car.
|
|
57
|
+
|
|
58
|
+
| Param | Example |
|
|
59
|
+
|----------------------------|----------------------------|
|
|
60
|
+
| `publicationGate` | `off` (default) / `audit` / `enforce` |
|
|
61
|
+
| `publicationGateBqProject` | `auto-de-not-production` |
|
|
62
|
+
| `publicationGateBqDataset` | `develop_auto_de` |
|
|
63
|
+
| `publicationGateBqTable` | `develop_cbd_enrichment_log` |
|
|
64
|
+
|
|
65
|
+
- `audit`: the feed is unchanged; the estimated attributes of each item go to the feed items table
|
|
66
|
+
(`estimatedAttributes`, with `publicationGate`). If the log cannot be read the gate is off for the run.
|
|
67
|
+
- `enforce`: estimated `fuel_consumption`, `fuel_consumption_discharged_battery`,
|
|
68
|
+
`energy_consumption`, `co2_emissions` (and `electric_range`, which CBD never estimates) are left out
|
|
69
|
+
of the item. If the log cannot be read the export fails before the output is touched, so the last
|
|
70
|
+
published feed stays.
|
|
71
|
+
|
|
72
|
+
Only the field an attribute was actually taken from counts (e.g. `wltpCombined` for an ICE car, the
|
|
73
|
+
legacy `consumptionCombined` only when it was the fallback). Values set before the enrichment log
|
|
74
|
+
existed are not covered.
|
|
75
|
+
|
|
18
76
|
## Description
|
|
19
77
|
|
|
20
78
|
[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
|
package/dist/configs/config.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ExportType, ImageType } from '../enums';
|
|
2
|
-
import { Params } from '../interfaces/params.interface';
|
|
2
|
+
import { FeedItemsBigQueryTarget, Params, PublicationGateConfig } from '../interfaces/params.interface';
|
|
3
3
|
export declare class Config {
|
|
4
4
|
apikey: string;
|
|
5
5
|
campaign: string;
|
|
@@ -35,6 +35,9 @@ export declare class Config {
|
|
|
35
35
|
dealersSpreadsheetId: string;
|
|
36
36
|
dealersSpreadsheetTitle: string;
|
|
37
37
|
metaPushPriorityCsvUrl: string;
|
|
38
|
+
runId?: string;
|
|
39
|
+
feedItemsBigQuery?: FeedItemsBigQueryTarget;
|
|
40
|
+
publicationGate?: PublicationGateConfig;
|
|
38
41
|
protected environmentConfig: {
|
|
39
42
|
develop: {
|
|
40
43
|
domain: string;
|
package/dist/configs/config.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/configs/config.ts"],"names":[],"mappings":";;;AAAA,oCAA8D;AAG9D,MAAa,MAAM;IACjB,MAAM,CAAS;IACf,QAAQ,CAAS;IACjB,cAAc,CAAS;IACvB,sBAAsB,CAAS;IAC/B,MAAM,CAAS;IACf,OAAO,CAAS;IAChB,QAAQ,CAAS;IACjB,YAAY,CAAS;IACrB,iBAAiB,CAAS;IAC1B,eAAe,CAAS;IACxB,SAAS,CAAY;IACrB,aAAa,CAAU;IACvB,QAAQ,CAAU;IAClB,QAAQ,CAAU;IAClB,UAAU,CAAa;IACvB,MAAM,CAAS;IACf,KAAK,CAIH;IAIF,oBAAoB,CAAU;IAC9B,YAAY,CAIV;IACF,WAAW,CAAW;IACtB,GAAG,CAAS;IACZ,oBAAoB,CAAS;IAC7B,uBAAuB,CAAS;IAChC,oBAAoB,CAAS;IAC7B,uBAAuB,CAAS;IAChC,sBAAsB,CAAS;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/configs/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,37 @@ exports.GoogleConfig = void 0;
|
|
|
4
4
|
const enums_1 = require("../enums");
|
|
5
5
|
const feed_price_constants_1 = require("../constants/feed-price.constants");
|
|
6
6
|
const config_1 = require("./config");
|
|
7
|
+
const trimmed = (value) => (typeof value === 'string' ? value.trim() : '');
|
|
7
8
|
class GoogleConfig extends config_1.Config {
|
|
8
9
|
constructor(params) {
|
|
9
10
|
super(params);
|
|
10
11
|
this.pathesConfig.localConvertedDirectory = `resources/${enums_1.ExportType.GOOGLE}-export`;
|
|
11
12
|
this.imageType = enums_1.ImageType.default;
|
|
12
13
|
this.maxCurrentSalesPrice = (0, feed_price_constants_1.resolveMaxFeedSalesPrice)(params.maxCurrentSalesPrice);
|
|
14
|
+
const feedItemsBigQuery = {
|
|
15
|
+
project: trimmed(params.feedItemsBqProject),
|
|
16
|
+
dataset: trimmed(params.feedItemsBqDataset),
|
|
17
|
+
table: trimmed(params.feedItemsBqTable),
|
|
18
|
+
};
|
|
19
|
+
if (feedItemsBigQuery.project && feedItemsBigQuery.dataset && feedItemsBigQuery.table) {
|
|
20
|
+
this.feedItemsBigQuery = feedItemsBigQuery;
|
|
21
|
+
}
|
|
22
|
+
const gateMode = trimmed(params.publicationGate).toLowerCase();
|
|
23
|
+
if (gateMode === 'audit' || gateMode === 'enforce') {
|
|
24
|
+
const gate = {
|
|
25
|
+
mode: gateMode,
|
|
26
|
+
project: trimmed(params.publicationGateBqProject),
|
|
27
|
+
dataset: trimmed(params.publicationGateBqDataset),
|
|
28
|
+
table: trimmed(params.publicationGateBqTable),
|
|
29
|
+
};
|
|
30
|
+
if (!gate.project || !gate.dataset || !gate.table) {
|
|
31
|
+
throw new Error(`publicationGate=${gateMode} needs publicationGateBqProject, publicationGateBqDataset and publicationGateBqTable`);
|
|
32
|
+
}
|
|
33
|
+
this.publicationGate = gate;
|
|
34
|
+
}
|
|
35
|
+
else if (gateMode && gateMode !== 'off') {
|
|
36
|
+
throw new Error(`publicationGate must be off, audit or enforce, got "${gateMode}"`);
|
|
37
|
+
}
|
|
13
38
|
this.outputFiles = [
|
|
14
39
|
`${this.pathesConfig.localConvertedDirectory}/api_export_cars_${enums_1.ExportType.GOOGLE}.${enums_1.FileType.XML}`,
|
|
15
40
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.config.js","sourceRoot":"","sources":["../../src/configs/google.config.ts"],"names":[],"mappings":";;;AAAA,oCAA4D;AAC5D,4EAA6E;AAE7E,qCAAkC;AAElC,MAAa,YAAa,SAAQ,eAAM;IACtC,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,YAAY,CAAC,uBAAuB,GAAG,aAAa,kBAAU,CAAC,MAAM,SAAS,CAAC;QACpF,IAAI,CAAC,SAAS,GAAG,iBAAS,CAAC,OAAO,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,IAAA,+CAAwB,EAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAClF,IAAI,CAAC,WAAW,GAAG;YACjB,GAAG,IAAI,CAAC,YAAY,CAAC,uBAAuB,oBAAoB,kBAAU,CAAC,MAAM,IAAI,gBAAQ,CAAC,GAAG,EAAE;SACpG,CAAC;IACJ,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"google.config.js","sourceRoot":"","sources":["../../src/configs/google.config.ts"],"names":[],"mappings":";;;AAAA,oCAA4D;AAC5D,4EAA6E;AAE7E,qCAAkC;AAElC,MAAM,OAAO,GAAG,CAAC,KAAc,EAAU,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE5F,MAAa,YAAa,SAAQ,eAAM;IACtC,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,YAAY,CAAC,uBAAuB,GAAG,aAAa,kBAAU,CAAC,MAAM,SAAS,CAAC;QACpF,IAAI,CAAC,SAAS,GAAG,iBAAS,CAAC,OAAO,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,IAAA,+CAAwB,EAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAClF,MAAM,iBAAiB,GAAG;YACxB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC;YAC3C,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC;YAC3C,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC;SACxC,CAAC;QACF,IAAI,iBAAiB,CAAC,OAAO,IAAI,iBAAiB,CAAC,OAAO,IAAI,iBAAiB,CAAC,KAAK,EAAE;YACrF,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;SAC5C;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/D,IAAI,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,SAAS,EAAE;YAClD,MAAM,IAAI,GAAG;gBACX,IAAI,EAAE,QAAyC;gBAC/C,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC;gBACjD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC;gBACjD,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC;aAC9C,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACjD,MAAM,IAAI,KAAK,CAAC,mBAAmB,QAAQ,sFAAsF,CAAC,CAAC;aACpI;YACD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;SAC7B;aAAM,IAAI,QAAQ,IAAI,QAAQ,KAAK,KAAK,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,uDAAuD,QAAQ,GAAG,CAAC,CAAC;SACrF;QACD,IAAI,CAAC,WAAW,GAAG;YACjB,GAAG,IAAI,CAAC,YAAY,CAAC,uBAAuB,oBAAoB,kBAAU,CAAC,MAAM,IAAI,gBAAQ,CAAC,GAAG,EAAE;SACpG,CAAC;IACJ,CAAC;CACF;AAjCD,oCAiCC"}
|
package/dist/export.command.js
CHANGED
|
@@ -31,6 +31,7 @@ let ExportRunner = class ExportRunner extends nest_commander_1.CommandRunner {
|
|
|
31
31
|
const input = JSON.parse(data);
|
|
32
32
|
cronicle_helper_1.LoggerService.log(`Running job: ${input.id} - ${JSON.stringify(input)} \n`);
|
|
33
33
|
this.configService.config = new export_schema_1.exportSchema[input.params.exportType].config(input.params);
|
|
34
|
+
this.configService.config.runId = input.id;
|
|
34
35
|
const exporter = await this.moduleRef.create(export_schema_1.exportSchema[input.params.exportType].exporter);
|
|
35
36
|
await exporter.export().catch(reject);
|
|
36
37
|
resolve(rl.close());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.command.js","sourceRoot":"","sources":["../src/export.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA2C;AAC3C,mDAAwD;AACxD,yCAA2C;AAE3C,mDAA+C;AAC/C,uCAAyC;AAEzC,gEAA2D;AAMpD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,8BAAa;IAEnC;IACA;IAFV,YACU,aAA4B,EAC5B,SAAoB;QAE5B,KAAK,EAAE,CAAC;QAHA,kBAAa,GAAb,aAAa,CAAe;QAC5B,cAAS,GAAT,SAAS,CAAW;IAG9B,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,IAAA,0BAAe,EAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACrD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAY,EAAE,EAAE;gBACnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAU,CAAC;gBACxC,+BAAa,CAAC,GAAG,CAAC,gBAAgB,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAE5E,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,IAAI,4BAAY,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC3F,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAW,4BAAY,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACvG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAEtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"export.command.js","sourceRoot":"","sources":["../src/export.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA2C;AAC3C,mDAAwD;AACxD,yCAA2C;AAE3C,mDAA+C;AAC/C,uCAAyC;AAEzC,gEAA2D;AAMpD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,8BAAa;IAEnC;IACA;IAFV,YACU,aAA4B,EAC5B,SAAoB;QAE5B,KAAK,EAAE,CAAC;QAHA,kBAAa,GAAb,aAAa,CAAe;QAC5B,cAAS,GAAT,SAAS,CAAW;IAG9B,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,IAAA,0BAAe,EAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACrD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAY,EAAE,EAAE;gBACnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAU,CAAC;gBACxC,+BAAa,CAAC,GAAG,CAAC,gBAAgB,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAE5E,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,IAAI,4BAAY,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC3F,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAW,4BAAY,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACvG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAEtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAxBY,oCAAY;uBAAZ,YAAY;IAJxB,IAAA,wBAAO,EAAC;QACP,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;KAC7B,CAAC;qCAGyB,wBAAa;QACjB,gBAAS;GAHnB,YAAY,CAwBxB"}
|
|
@@ -15,6 +15,9 @@ const core_1 = require("@nestjs/core");
|
|
|
15
15
|
const cronicle_helper_1 = require("@bytebrand/cronicle-helper");
|
|
16
16
|
const services_1 = require("../services");
|
|
17
17
|
const google_transformer_1 = require("../transformers/google.transformer");
|
|
18
|
+
const google_feed_item_row_1 = require("../transformers/google-feed-item-row");
|
|
19
|
+
const feed_items_bigquery_writer_1 = require("../services/feed-items-bigquery.writer");
|
|
20
|
+
const publication_gate_1 = require("../services/publication-gate");
|
|
18
21
|
const google_xml_builder_1 = require("../formats/google-xml.builder");
|
|
19
22
|
let GoogleExporter = class GoogleExporter {
|
|
20
23
|
carService;
|
|
@@ -30,22 +33,37 @@ let GoogleExporter = class GoogleExporter {
|
|
|
30
33
|
this.moduleRef = moduleRef;
|
|
31
34
|
}
|
|
32
35
|
async export() {
|
|
36
|
+
const gate = await (0, publication_gate_1.loadPublicationGate)(this.configService.config.publicationGate);
|
|
33
37
|
const [fileName] = this.configService.config.outputFiles;
|
|
34
38
|
await cronicle_helper_1.CronicleUtils.ensureDir(this.configService.config.pathesConfig.localConvertedDirectory);
|
|
35
39
|
await cronicle_helper_1.CronicleUtils.emptyDir(this.configService.config.pathesConfig.localConvertedDirectory);
|
|
36
40
|
const googleXmlBuilder = new google_xml_builder_1.GoogleXmlBuilder(fileName);
|
|
37
41
|
await googleXmlBuilder.buildStart(this.configService.config.domain);
|
|
38
42
|
const googleTransformer = await this.moduleRef.create(google_transformer_1.GoogleTransformer);
|
|
43
|
+
const { feedItemsBigQuery, runId } = this.configService.config;
|
|
44
|
+
const feedItemsWriter = feedItemsBigQuery ? new feed_items_bigquery_writer_1.FeedItemsBigQueryWriter(feedItemsBigQuery) : null;
|
|
45
|
+
const exportedAt = new Date();
|
|
46
|
+
let gatedItems = 0;
|
|
39
47
|
await this.loaderService.process(async (chunk) => {
|
|
40
48
|
chunk.data = chunk.data.filter(car => this.carService.filterCar(car, this.rulesService.rules));
|
|
41
49
|
for (const data of chunk.data) {
|
|
42
50
|
const car = await googleTransformer.transform(data);
|
|
43
|
-
if (car)
|
|
44
|
-
|
|
51
|
+
if (car) {
|
|
52
|
+
const estimatedAttributes = gate.estimatedAttributes(data.car);
|
|
53
|
+
if (estimatedAttributes.length)
|
|
54
|
+
gatedItems += 1;
|
|
55
|
+
await googleXmlBuilder.addItem(gate.apply(car, estimatedAttributes));
|
|
56
|
+
const gateInfo = gate.mode === 'off' ? null : { mode: gate.mode, estimatedAttributes };
|
|
57
|
+
feedItemsWriter?.add((0, google_feed_item_row_1.buildGoogleFeedItemRow)(data.car, car, runId, exportedAt, gateInfo));
|
|
58
|
+
}
|
|
45
59
|
this.carService.counter.countCar(data.images);
|
|
46
60
|
}
|
|
47
61
|
});
|
|
48
62
|
await googleXmlBuilder.buildEnd();
|
|
63
|
+
if (gate.mode !== 'off') {
|
|
64
|
+
console.log(`Publication gate ${gate.mode}: ${gatedItems} items with estimated EnVKV values${gate.mode === 'enforce' ? ' (attributes left out)' : ''}`);
|
|
65
|
+
}
|
|
66
|
+
await feedItemsWriter?.close();
|
|
49
67
|
console.log(this.carService.counter.getCountedCars());
|
|
50
68
|
}
|
|
51
69
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.exporter.js","sourceRoot":"","sources":["../../src/exporters/google.exporter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAyC;AAEzC,gEAA2D;AAG3D,0CAAqF;AACrF,2EAAuE;AACvE,sEAAiE;AAI1D,IAAM,cAAc,GAApB,MAAM,cAAc;IAEf;IACA;IACA;IACA;IACA;IALV,YACU,UAAsB,EACtB,aAA4B,EAC5B,YAA0B,EAC1B,aAA4B,EAC5B,SAAoB;QAJpB,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,cAAS,GAAT,SAAS,CAAW;IAC1B,CAAC;IAEL,KAAK,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"google.exporter.js","sourceRoot":"","sources":["../../src/exporters/google.exporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -198,11 +198,11 @@ export interface GoogleXmlItem {
|
|
|
198
198
|
doors?: number;
|
|
199
199
|
capacity?: number;
|
|
200
200
|
date_first_registered: string;
|
|
201
|
-
fuel_consumption
|
|
201
|
+
fuel_consumption?: string;
|
|
202
202
|
energy_consumption?: string;
|
|
203
203
|
electric_range?: string;
|
|
204
204
|
fuel_consumption_discharged_battery?: string;
|
|
205
|
-
co2_emissions
|
|
205
|
+
co2_emissions?: string;
|
|
206
206
|
identifier_exists: string;
|
|
207
207
|
ads_redirect?: string;
|
|
208
208
|
"certified_pre-owned"?: boolean;
|
|
@@ -11,4 +11,22 @@ export interface Params {
|
|
|
11
11
|
ownerId?: string;
|
|
12
12
|
metaPushPriorityCsvUrl?: string;
|
|
13
13
|
maxCurrentSalesPrice?: string;
|
|
14
|
+
feedItemsBqProject?: string;
|
|
15
|
+
feedItemsBqDataset?: string;
|
|
16
|
+
feedItemsBqTable?: string;
|
|
17
|
+
publicationGate?: string;
|
|
18
|
+
publicationGateBqProject?: string;
|
|
19
|
+
publicationGateBqDataset?: string;
|
|
20
|
+
publicationGateBqTable?: string;
|
|
21
|
+
}
|
|
22
|
+
export interface FeedItemsBigQueryTarget {
|
|
23
|
+
project: string;
|
|
24
|
+
dataset: string;
|
|
25
|
+
table: string;
|
|
26
|
+
}
|
|
27
|
+
export interface PublicationGateConfig {
|
|
28
|
+
mode: 'off' | 'audit' | 'enforce';
|
|
29
|
+
project: string;
|
|
30
|
+
dataset: string;
|
|
31
|
+
table: string;
|
|
14
32
|
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { FeedItemsBigQueryTarget } from '../interfaces/params.interface';
|
|
2
|
+
import { FeedItemRow } from '../transformers/google-feed-item-row';
|
|
3
|
+
export declare class FeedItemsBigQueryWriter {
|
|
4
|
+
private target;
|
|
5
|
+
private logger;
|
|
6
|
+
private buffer;
|
|
7
|
+
private queue;
|
|
8
|
+
private failedBatches;
|
|
9
|
+
private insertedRows;
|
|
10
|
+
constructor(target: FeedItemsBigQueryTarget);
|
|
11
|
+
add(row: FeedItemRow): void;
|
|
12
|
+
close(): Promise<void>;
|
|
13
|
+
private get enabled();
|
|
14
|
+
private get tableName();
|
|
15
|
+
private flush;
|
|
16
|
+
private insert;
|
|
17
|
+
}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FeedItemsBigQueryWriter = void 0;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
const bigquery_logger_1 = require("@bytebrand/bigquery-logger");
|
|
6
|
+
const BATCH_SIZE = 500;
|
|
7
|
+
const MAX_FAILED_BATCHES = 3;
|
|
8
|
+
const CLOSE_TIMEOUT_MS = 60000;
|
|
9
|
+
class FeedItemsBigQueryLogger extends bigquery_logger_1.BigQueryLogger {
|
|
10
|
+
async insertRows(rows) {
|
|
11
|
+
await this.client
|
|
12
|
+
.dataset(this.options.BigQueryDataset)
|
|
13
|
+
.table(this.options.BigQueryLogTable)
|
|
14
|
+
.insert(rows, { skipInvalidRows: true, ignoreUnknownValues: true });
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
class FeedItemsBigQueryWriter {
|
|
18
|
+
target;
|
|
19
|
+
logger;
|
|
20
|
+
buffer = [];
|
|
21
|
+
queue = Promise.resolve();
|
|
22
|
+
failedBatches = 0;
|
|
23
|
+
insertedRows = 0;
|
|
24
|
+
constructor(target) {
|
|
25
|
+
this.target = target;
|
|
26
|
+
try {
|
|
27
|
+
const credentials = require((0, path_1.join)(process.cwd(), 'credentials/google-cloud-project-id.json'));
|
|
28
|
+
this.logger = new FeedItemsBigQueryLogger(credentials, {
|
|
29
|
+
BigQueryProject: target.project,
|
|
30
|
+
BigQueryDataset: target.dataset,
|
|
31
|
+
BigQueryLogTable: target.table,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
catch (e) {
|
|
35
|
+
console.log(`Feed items BigQuery disabled: ${String(e?.message || e).split('\n')[0]}`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
add(row) {
|
|
39
|
+
if (!this.enabled)
|
|
40
|
+
return;
|
|
41
|
+
this.buffer.push(row);
|
|
42
|
+
if (this.buffer.length >= BATCH_SIZE)
|
|
43
|
+
this.flush();
|
|
44
|
+
}
|
|
45
|
+
async close() {
|
|
46
|
+
this.flush();
|
|
47
|
+
let timer;
|
|
48
|
+
const timeout = new Promise((resolve) => {
|
|
49
|
+
timer = setTimeout(() => resolve('timeout'), CLOSE_TIMEOUT_MS);
|
|
50
|
+
});
|
|
51
|
+
const outcome = await Promise.race([this.queue.then(() => 'done'), timeout]);
|
|
52
|
+
if (timer)
|
|
53
|
+
clearTimeout(timer);
|
|
54
|
+
if (outcome === 'timeout')
|
|
55
|
+
console.error(`Feed items BigQuery: gave up waiting after ${CLOSE_TIMEOUT_MS} ms`);
|
|
56
|
+
if (this.logger) {
|
|
57
|
+
console.log(`Feed items BigQuery: ${this.insertedRows} rows to ${this.tableName}, ${this.failedBatches} failed batches`);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
get enabled() {
|
|
61
|
+
return !!this.logger && this.failedBatches < MAX_FAILED_BATCHES;
|
|
62
|
+
}
|
|
63
|
+
get tableName() {
|
|
64
|
+
return `${this.target.project}.${this.target.dataset}.${this.target.table}`;
|
|
65
|
+
}
|
|
66
|
+
flush() {
|
|
67
|
+
if (!this.buffer.length)
|
|
68
|
+
return;
|
|
69
|
+
const rows = this.buffer;
|
|
70
|
+
this.buffer = [];
|
|
71
|
+
this.queue = this.queue.then(() => this.insert(rows));
|
|
72
|
+
}
|
|
73
|
+
async insert(rows) {
|
|
74
|
+
if (!this.enabled)
|
|
75
|
+
return;
|
|
76
|
+
try {
|
|
77
|
+
await this.logger.insertRows(rows);
|
|
78
|
+
this.insertedRows += rows.length;
|
|
79
|
+
}
|
|
80
|
+
catch (e) {
|
|
81
|
+
const rejected = e?.name === 'PartialFailureError' && Array.isArray(e.errors) ? e.errors : null;
|
|
82
|
+
const firstRowError = rejected?.[0]?.errors?.[0];
|
|
83
|
+
const detail = firstRowError ? ` (${firstRowError.reason}: ${firstRowError.message})` : '';
|
|
84
|
+
if (rejected) {
|
|
85
|
+
this.insertedRows += rows.length - rejected.length;
|
|
86
|
+
console.log(`Feed items BigQuery rejected ${rejected.length} of ${rows.length} rows${detail}`);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
this.failedBatches++;
|
|
90
|
+
console.log(`Feed items BigQuery insert of ${rows.length} rows failed: ${e?.message || e}`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
exports.FeedItemsBigQueryWriter = FeedItemsBigQueryWriter;
|
|
96
|
+
//# sourceMappingURL=feed-items-bigquery.writer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"feed-items-bigquery.writer.js","sourceRoot":"","sources":["../../src/services/feed-items-bigquery.writer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { DataSchemes } from '@bytebrand/car-schema';
|
|
2
|
+
import { PublicationGateConfig } from '../interfaces/params.interface';
|
|
3
|
+
import { GoogleEnvkvAttribute } from '../transformers/google-feed-envkv';
|
|
4
|
+
export declare const ESTIMATE_SOURCES: string[];
|
|
5
|
+
export declare const GATED_FIELDS: string[];
|
|
6
|
+
export declare class PublicationGate {
|
|
7
|
+
readonly mode: 'off' | 'audit' | 'enforce';
|
|
8
|
+
private estimates;
|
|
9
|
+
constructor(mode: 'off' | 'audit' | 'enforce', estimates: Map<string, string>);
|
|
10
|
+
static off(): PublicationGate;
|
|
11
|
+
get size(): number;
|
|
12
|
+
estimatedAttributes(car: DataSchemes.Car): GoogleEnvkvAttribute[];
|
|
13
|
+
apply<T extends Partial<Record<GoogleEnvkvAttribute, string>>>(item: T, attributes: GoogleEnvkvAttribute[]): T;
|
|
14
|
+
}
|
|
15
|
+
export declare function loadPublicationGate(config: PublicationGateConfig | undefined): Promise<PublicationGate>;
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.loadPublicationGate = exports.PublicationGate = exports.GATED_FIELDS = exports.ESTIMATE_SOURCES = void 0;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
const lodash_1 = require("lodash");
|
|
6
|
+
const bigquery_logger_1 = require("@bytebrand/bigquery-logger");
|
|
7
|
+
const google_feed_envkv_1 = require("../transformers/google-feed-envkv");
|
|
8
|
+
exports.ESTIMATE_SOURCES = ['co2-estimate', 'mmm', 'globalDefault', 'derived'];
|
|
9
|
+
exports.GATED_FIELDS = [
|
|
10
|
+
'consumption.wltpWeightedCombined',
|
|
11
|
+
'consumption.wltpCombined',
|
|
12
|
+
'consumption.consumptionCombined',
|
|
13
|
+
'consumption.wltpWeightedPowerCombined',
|
|
14
|
+
'consumption.wltpPowerCombined',
|
|
15
|
+
'consumption.consumptionPowerCombined',
|
|
16
|
+
'environmentEmissions.wltpCo2',
|
|
17
|
+
'environmentEmissions.co2',
|
|
18
|
+
'battery.wltpTotalRange',
|
|
19
|
+
'battery.wltpRange',
|
|
20
|
+
'battery.batteryRangeElectric',
|
|
21
|
+
];
|
|
22
|
+
const sameValue = (logged, stored) => {
|
|
23
|
+
if (stored === undefined || stored === null)
|
|
24
|
+
return false;
|
|
25
|
+
const a = Number(logged);
|
|
26
|
+
const b = Number(stored);
|
|
27
|
+
if (Number.isFinite(a) && Number.isFinite(b))
|
|
28
|
+
return Math.abs(a - b) < 1e-9;
|
|
29
|
+
return logged === String(stored);
|
|
30
|
+
};
|
|
31
|
+
class PublicationGate {
|
|
32
|
+
mode;
|
|
33
|
+
estimates;
|
|
34
|
+
constructor(mode, estimates) {
|
|
35
|
+
this.mode = mode;
|
|
36
|
+
this.estimates = estimates;
|
|
37
|
+
}
|
|
38
|
+
static off() {
|
|
39
|
+
return new PublicationGate('off', new Map());
|
|
40
|
+
}
|
|
41
|
+
get size() {
|
|
42
|
+
return this.estimates.size;
|
|
43
|
+
}
|
|
44
|
+
estimatedAttributes(car) {
|
|
45
|
+
if (this.mode === 'off')
|
|
46
|
+
return [];
|
|
47
|
+
const carId = String((0, lodash_1.get)(car, '_id', ''));
|
|
48
|
+
const attributes = [];
|
|
49
|
+
for (const [attribute, field] of Object.entries((0, google_feed_envkv_1.googleEnvkvSourceFields)(car))) {
|
|
50
|
+
const logged = this.estimates.get(`${carId}|${field}`);
|
|
51
|
+
if (logged !== undefined && sameValue(logged, (0, lodash_1.get)(car, field)))
|
|
52
|
+
attributes.push(attribute);
|
|
53
|
+
}
|
|
54
|
+
return attributes;
|
|
55
|
+
}
|
|
56
|
+
apply(item, attributes) {
|
|
57
|
+
if (this.mode !== 'enforce')
|
|
58
|
+
return item;
|
|
59
|
+
for (const attribute of attributes)
|
|
60
|
+
delete item[attribute];
|
|
61
|
+
return item;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
exports.PublicationGate = PublicationGate;
|
|
65
|
+
class EnrichmentLogReader extends bigquery_logger_1.BigQueryLogger {
|
|
66
|
+
async latestEstimates(table) {
|
|
67
|
+
const query = `
|
|
68
|
+
SELECT carId, fieldName, finalValue
|
|
69
|
+
FROM (
|
|
70
|
+
SELECT carId, fieldName, finalValue, finalValueSource,
|
|
71
|
+
ROW_NUMBER() OVER (PARTITION BY carId, fieldName ORDER BY timestamp DESC) AS rn
|
|
72
|
+
FROM \`${table}\`
|
|
73
|
+
WHERE fieldName IN UNNEST(@fields)
|
|
74
|
+
)
|
|
75
|
+
WHERE rn = 1 AND finalValueSource IN UNNEST(@sources) AND finalValue IS NOT NULL`;
|
|
76
|
+
const [rows] = await this.client.query({ query, params: { fields: exports.GATED_FIELDS, sources: exports.ESTIMATE_SOURCES } });
|
|
77
|
+
const estimates = new Map();
|
|
78
|
+
for (const row of rows)
|
|
79
|
+
estimates.set(`${row.carId}|${row.fieldName}`, String(row.finalValue));
|
|
80
|
+
return estimates;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
async function loadPublicationGate(config) {
|
|
84
|
+
if (!config || config.mode === 'off')
|
|
85
|
+
return PublicationGate.off();
|
|
86
|
+
const table = `${config.project}.${config.dataset}.${config.table}`;
|
|
87
|
+
try {
|
|
88
|
+
const credentials = require((0, path_1.join)(process.cwd(), 'credentials/google-cloud-project-id.json'));
|
|
89
|
+
const reader = new EnrichmentLogReader(credentials, {
|
|
90
|
+
BigQueryProject: config.project,
|
|
91
|
+
BigQueryDataset: config.dataset,
|
|
92
|
+
BigQueryLogTable: config.table,
|
|
93
|
+
});
|
|
94
|
+
const estimates = await reader.latestEstimates(table);
|
|
95
|
+
console.log(`Publication gate ${config.mode}: ${estimates.size} estimated car fields from ${table}`);
|
|
96
|
+
return new PublicationGate(config.mode, estimates);
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
const message = String(e?.message || e).split('\n')[0];
|
|
100
|
+
if (config.mode === 'enforce')
|
|
101
|
+
throw new Error(`Publication gate: cannot read ${table}: ${message}`);
|
|
102
|
+
console.error(`Publication gate disabled for this run: cannot read ${table}: ${message}`);
|
|
103
|
+
return PublicationGate.off();
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
exports.loadPublicationGate = loadPublicationGate;
|
|
107
|
+
//# sourceMappingURL=publication-gate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publication-gate.js","sourceRoot":"","sources":["../../src/services/publication-gate.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ let Auto24Transformer = class Auto24Transformer {
|
|
|
44
44
|
fueltype: this.translateSelector((0, lodash_1.get)(car, 'consumption.fuel', '')),
|
|
45
45
|
consumptionK: (0, lodash_1.toString)((0, lodash_1.get)(car, 'consumption.consumptionCombined', '')),
|
|
46
46
|
co2: (0, lodash_1.toString)((0, lodash_1.get)(car, 'environmentEmissions.co2', '')),
|
|
47
|
-
efficiencyclass: this.translateSelector((0, lodash_1.get)(car, 'environmentEmissions.
|
|
47
|
+
efficiencyclass: this.translateSelector((0, lodash_1.get)(car, 'environmentEmissions.wltpEnergyEfficiencyClass', '')),
|
|
48
48
|
image: transformedImages[0],
|
|
49
49
|
registration: this.getRegistrationField((0, lodash_1.get)(car, 'mainData.firstRegistration')),
|
|
50
50
|
images: transformedImages,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto24.transfomer.js","sourceRoot":"","sources":["../../src/transformers/auto24.transfomer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAqD;AACrD,oEAAkD;AAClD,mCAAuD;AACvD,iCAAiC;AAIjC,2CAA4C;AAC5C,0CAA2D;AAC3D,oCAA2C;AAGpC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAGR;IAA+C;IAF3D,UAAU,CAAa;IAE/B,YAAoB,aAA4B,EAAmB,YAA2B;QAA1E,kBAAa,GAAb,aAAa,CAAe;QAAmB,iBAAY,GAAZ,YAAY,CAAe;QAC5F,IAAI,CAAC,UAAU,GAAG,IAAI,yBAAU,CAAC,sBAAE,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAoB,EAAE,UAAwC;QAC5E,MAAM,KAAK,GAAG,IAAA,iBAAQ,EAAC,IAAA,YAAG,EAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;QAC5C,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CACzD,GAAG,EACH,UAAU,EACV,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,EACnC,KAAK,CACN,CAAC;QACF,IAAI,QAAQ,GAAG,eAAe,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,mBAAmB,KAAK,EAAE,CAAC;QACzF,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE;YACtC,QAAQ,IAAI,+CAA+C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;SACjG;QAED,OAAO;YACL,QAAQ,EAAE,IAAA,YAAG,EAAC,GAAG,EAAE,oBAAoB,CAAC;YACxC,QAAQ;YACR,KAAK,EAAE,IAAA,iBAAQ,EAAC,IAAA,YAAG,EAAC,GAAG,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;YAC9C,MAAM,EAAE,IAAA,iBAAQ,EAAC,IAAA,YAAG,EAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;YAChD,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,IAAA,iBAAQ,EAAC,IAAA,YAAG,EAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAC;YACpD,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAA,YAAG,EAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAC;YACnE,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAA,YAAG,EAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC;YAClE,YAAY,EAAE,IAAA,iBAAQ,EAAC,IAAA,YAAG,EAAC,GAAG,EAAE,iCAAiC,EAAE,EAAE,CAAC,CAAC;YACvE,GAAG,EAAE,IAAA,iBAAQ,EAAC,IAAA,YAAG,EAAC,GAAG,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"auto24.transfomer.js","sourceRoot":"","sources":["../../src/transformers/auto24.transfomer.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,7 @@ let AutouncleTransformer = class AutouncleTransformer {
|
|
|
66
66
|
images: transformed_images,
|
|
67
67
|
fuel_economy: (0, lodash_1.toString)((0, lodash_1.get)(car, 'consumption.consumptionCombined', '')),
|
|
68
68
|
co2_emission: (0, lodash_1.toString)((0, lodash_1.get)(car, 'environmentEmissions.co2', '')),
|
|
69
|
-
co2_effiency_class: (0, lodash_1.toString)((0, lodash_1.get)(car, 'environmentEmissions.
|
|
69
|
+
co2_effiency_class: (0, lodash_1.toString)((0, lodash_1.get)(car, 'environmentEmissions.wltpEnergyEfficiencyClass', '')),
|
|
70
70
|
euro_emission_class: (0, lodash_1.toString)((0, lodash_1.get)(car, 'environmentEmissions.emissionClass', '')),
|
|
71
71
|
enviromental_sticker: (0, lodash_1.toString)((0, lodash_1.get)(car, 'environmentEmissions.emissionSticker', '')),
|
|
72
72
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autouncle.transformer.js","sourceRoot":"","sources":["../../src/transformers/autouncle.transformer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"autouncle.transformer.js","sourceRoot":"","sources":["../../src/transformers/autouncle.transformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -171,7 +171,7 @@ let AwinTransformer = class AwinTransformer {
|
|
|
171
171
|
selector_energyEfficiencyClass_g: 'G',
|
|
172
172
|
selector_unknown: '',
|
|
173
173
|
};
|
|
174
|
-
const energyClass = (0, lodash_1.get)(car, 'environmentEmissions.
|
|
174
|
+
const energyClass = (0, lodash_1.get)(car, 'environmentEmissions.wltpEnergyEfficiencyClass', 'selector_unknown');
|
|
175
175
|
return (0, lodash_1.get)(available, energyClass);
|
|
176
176
|
}
|
|
177
177
|
getWarranty(car) {
|