From 2f13010480b87a4a06634084033b3b0822eb78ee Mon Sep 17 00:00:00 2001 From: Sebastian Lange Date: Wed, 20 Mar 2019 14:32:06 +0100 Subject: [PATCH] feat: adjust to changes of SCFacet in core v0.12.0 Closes #30 --- package-lock.json | 14 ++++++++++---- package.json | 2 +- src/storage/elasticsearch/aggregations.ts | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 106b08e3..1b64b983 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,14 +27,15 @@ } }, "@openstapps/core": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.11.0.tgz", - "integrity": "sha512-vCT09LVDRcSELK/F5RBe6IqXWow7kolkWMADXRIW5YqvAy/BpfUhta/v+YxFk/dp+umzMmCv9tRgZRxrznStGw==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.12.0.tgz", + "integrity": "sha512-msSsSQmZOzvcUbJZDZDefFuT2MOpnHo/1Q7f1kMtjsyJaLo0oZHxQq98RUjpecXy+fW+0Vjonkrpg33hr5Xgaw==", "requires": { "@types/geojson": "1.0.6", "@types/json-patch": "0.0.30", "json-patch": "0.7.0", - "jsonschema": "1.2.4" + "jsonschema": "1.2.4", + "ts-optchain": "0.1.2" } }, "@openstapps/core-tools": { @@ -3268,6 +3269,11 @@ } } }, + "ts-optchain": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ts-optchain/-/ts-optchain-0.1.2.tgz", + "integrity": "sha512-Xs1/xpXgTQhvgjP1qLIm5LWsgwAdpRnlfrHvMTyMPCNb4MP0WgYGCnK4xJBx0l4ZM+//IDubrmHkvp6BWfZfCg==" + }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", diff --git a/package.json b/package.json index 04b6cabd..afd8ab48 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "tslint": "tslint 'src/**/*.ts'" }, "dependencies": { - "@openstapps/core": "0.11.0", + "@openstapps/core": "0.12.0", "@openstapps/core-tools": "0.3.0", "@openstapps/logger": "0.0.5", "config": "3.0.1", diff --git a/src/storage/elasticsearch/aggregations.ts b/src/storage/elasticsearch/aggregations.ts index e50fd02e..f2357920 100644 --- a/src/storage/elasticsearch/aggregations.ts +++ b/src/storage/elasticsearch/aggregations.ts @@ -72,12 +72,12 @@ export function parseAggregations( aggregationNames.forEach((aggregationName) => { const buckets = aggregations[aggregationName].buckets; - const facet: SCFacet = { buckets: buckets.map((bucket) => { - const facetBucket: { [value: string]: number } = {}; - facetBucket[bucket.key] = bucket.doc_count; - return facetBucket; + return { + count: bucket.doc_count, + key: bucket.key, + }; }), field: aggregationSchema[aggregationName].terms.field + '.raw', };