🐛 fix dataset detail view bug (group by select list was wrong) (#4307)

owid · Dec 14, 2024 · 1afa5ca · 1afa5ca
1 parent c57f904
commit 1afa5ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -725,7 +725,9 @@ getRouteWithROTransaction(apiRouter, "/charts.json", async (req, res, trx) => {
     const charts = await db.knexRaw<OldChartFieldList>(
         trx,
         `-- sql
-            SELECT ${oldChartFieldList} FROM charts
+            SELECT ${oldChartFieldList},
+                round(views_365d / 365, 1) as pageviewsPerDay
+            FROM charts
             JOIN chart_configs ON chart_configs.id = charts.configId
             JOIN users lastEditedByUser ON lastEditedByUser.id = charts.lastEditedByUserId
             LEFT JOIN analytics_pageviews on (analytics_pageviews.url = CONCAT("https://ourworldindata.org/grapher/", chart_configs.slug)  AND chart_configs.full ->> '$.isPublished' = "true" )
@@ -1596,7 +1598,6 @@ getRouteWithROTransaction(
                 JOIN chart_configs ON chart_configs.id = charts.configId
                 JOIN users lastEditedByUser ON lastEditedByUser.id = charts.lastEditedByUserId
                 LEFT JOIN users publishedByUser ON publishedByUser.id = charts.publishedByUserId
-                LEFT JOIN analytics_pageviews on analytics_pageviews.url = CONCAT("https://ourworldindata.org/grapher/", chart_configs.slug)
                 JOIN chart_dimensions cd ON cd.chartId = charts.id
                 WHERE cd.variableId = ?
                 GROUP BY charts.id
@@ -2083,7 +2084,6 @@ getRouteWithROTransaction(
                 JOIN variables AS v ON cd.variableId = v.id
                 JOIN users lastEditedByUser ON lastEditedByUser.id = charts.lastEditedByUserId
                 LEFT JOIN users publishedByUser ON publishedByUser.id = charts.publishedByUserId
-                LEFT JOIN analytics_pageviews on analytics_pageviews.url = CONCAT("https://ourworldindata.org/grapher/", chart_configs.slug)
                 WHERE v.datasetId = ?
                 GROUP BY charts.id
             `,
@@ -2481,7 +2481,6 @@ getRouteWithROTransaction(
                 LEFT JOIN chart_tags ct ON ct.chartId=charts.id
                 JOIN users lastEditedByUser ON lastEditedByUser.id = charts.lastEditedByUserId
                 LEFT JOIN users publishedByUser ON publishedByUser.id = charts.publishedByUserId
-                LEFT JOIN analytics_pageviews on analytics_pageviews.url = CONCAT("https://ourworldindata.org/grapher/", chart_configs.slug)
                 WHERE ct.tagId ${tagId === UNCATEGORIZED_TAG_ID ? "IS NULL" : "= ?"}
                 GROUP BY charts.id
                 ORDER BY charts.updatedAt DESC

diff --git a/db/model/Chart.ts b/db/model/Chart.ts
@@ -538,8 +538,7 @@ export const oldChartFieldList = `
         lastEditedByUser.fullName AS lastEditedBy,
         charts.publishedAt,
         charts.publishedByUserId,
-        publishedByUser.fullName AS publishedBy,
-        round(views_365d / 365, 1) as pageviewsPerDay
+        publishedByUser.fullName AS publishedBy
     `
 // TODO: replace this with getBySlug and pick