feat: add topic filter

api/doc/agg-query/schema.json

@@ -19,6 +19,7 @@
     "userClass": {"$ref": "https://github.com/data-fair/metrics/daily-api-metric#/$defs/userClass"},
     "resourceType": {"type": "string"},
     "resourceId": {"type": "string"},
+    "topicId": {"type": "string"},
     "processingId": {"type": "string"},
     "split": {
       "type": "array",

api/src/daily-api-metrics/router.ts

@@ -1,5 +1,6 @@
 import { Router } from 'express'
-import { session } from '@data-fair/lib-express/index.js'
+import { session, reqOrigin } from '@data-fair/lib-express/index.js'
+import axios from '@data-fair/lib-node/axios.js'
 import * as aggQuery from '#doc/agg-query/index.ts'
 import * as exportQuery from '#doc/export-query/index.ts'
 import generate from './export.ts'
@@ -20,7 +21,27 @@ router.get('/_agg', async (req, res) => {
   const query = { ...req.query } // better not to mutate req.query
   if (typeof query.split === 'string') query.split = query.split.split(',')
   aggQuery.assertValid(query, { lang: reqSession.lang, name: 'query' })
-  const result = await agg(reqSession.account, query)
+  let filteredDatasetIds: string[] | null = null
+  if (query.topicId) {
+    const datasets: { id: string }[] = (await axios.get(
+      new URL('/data-fair/api/v1/datasets', reqOrigin(req)).toString(),
+      {
+        params: {
+          mine: true,
+          raw: true,
+          select: 'id',
+          size: 10000,
+          topics: query.topicId
+        },
+        headers: {
+          Cookie: req.headers.cookie
+        }
+      }
+    )).data.results || []
+
+    filteredDatasetIds = datasets.map(dataset => dataset.id)
+  }
+  const result = await agg(reqSession.account, query, filteredDatasetIds)
   res.json(result)
 })
 
@@ -30,7 +51,46 @@ router.get('/_export', async (req, res) => {
   exportQuery.assertValid(query, { lang: reqSession.lang, name: 'query' })
 
   res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
-  res.setHeader('Content-Disposition', `attachment; filename=${query.start}_${query.end}.xlsx`)
+  res.setHeader('Content-Disposition', `attachment; filename=Audience_${query.start}_${query.end}.xlsx`)
+
+  const datasets = (await axios.get(
+    new URL('/data-fair/api/v1/datasets', reqOrigin(req)).toString(),
+    {
+      params: {
+        mine: true,
+        raw: true,
+        select: 'id,topics,title',
+        size: 10000
+      },
+      headers: {
+        Cookie: req.headers.cookie
+      }
+    }
+  )).data.results || []
+
+  const applications = (await axios.get(
+    new URL('/data-fair/api/v1/applications', reqOrigin(req)).toString(),
+    {
+      params: {
+        mine: true,
+        raw: true,
+        select: 'id,title',
+        size: 10000
+      },
+      headers: {
+        Cookie: req.headers.cookie
+      }
+    }
+  )).data.results || []
+
+  const topics = (await axios.get(
+    new URL(`/data-fair/api/v1/settings/${reqSession.account.type}/${reqSession.account.id}/topics`, reqOrigin(req)).toString(),
+    {
+      headers: {
+        Cookie: req.headers.cookie
+      }
+    }
+  )).data || []
 
-  await generate(reqSession.account, query, res)
+  await generate(reqSession.account, query, datasets, applications, topics, reqOrigin(req), res)
 })