From c4ea547e05062ff997a9515cfc2176b765492f47 Mon Sep 17 00:00:00 2001
From: Bertrand Marron <bertrand.marron@gmail.com>
Date: Tue, 12 Feb 2019 19:52:12 +0100
Subject: [PATCH] Update catalog metrics

Exclude service from dataset metrics.
Compute organization and metadataType metrics from datasets.
---
 lib/jobs/compute-catalog-metrics/index.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/jobs/compute-catalog-metrics/index.js b/lib/jobs/compute-catalog-metrics/index.js
index 1fc0502..a70f1ff 100644
--- a/lib/jobs/compute-catalog-metrics/index.js
+++ b/lib/jobs/compute-catalog-metrics/index.js
@@ -53,9 +53,10 @@ async function computeCatalogMetrics({data: {catalogId, force = false}}) {
 
   const [datasets, records, mostRecentRecord] = await Promise.all([
     search({
-      type: 'dataset',
       catalog: catalog.name,
       limit: 1
+    }, {
+      excludeServices: true
     }),
 
     search({
@@ -81,19 +82,19 @@ async function computeCatalogMetrics({data: {catalogId, force = false}}) {
   const metrics = {
     records: {
       totalCount: records.hits.total,
-      counts: {
-        organizations: countBy(records, 'organizations')
-      },
+      counts: {},
       partitions: {
-        recordType: countBy(records, 'type'),
-        metadataType: countBy(datasets, 'metadataType')
+        recordType: countBy(records, 'type')
       }
     },
     datasets: {
       totalCount: datasets.hits.total,
-      counts: {},
+      counts: {
+        organizations: countBy(datasets, 'organizations')
+      },
       partitions: {
         dataType: countBy(datasets, 'representationType'),
+        metadataType: countBy(datasets, 'metadataType'),
         openness: countBy(datasets, 'opendata'),
         download: countBy(datasets, 'downloadable')
       }