Update catalog metrics

Exclude service from dataset metrics.
Compute organization and metadataType metrics from datasets.

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')
       }