🔨 incorporate PR feedback

owid · Feb 27, 2024 · afa89e1 · afa89e1
1 parent 55b756f
commit afa89e1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/baker/algolia/indexExplorersToAlgolia.ts b/baker/algolia/indexExplorersToAlgolia.ts
@@ -13,6 +13,7 @@ import { getAnalyticsPageviewsByUrlObj } from "../../db/model/Pageview.js"
 import { chunkParagraphs } from "../chunk.js"
 import { SearchIndexName } from "../../site/search/searchTypes.js"
 import { Chart } from "../../db/model/Chart.js"
+import { Knex } from "knex"
 
 type ExplorerBlockColumns = {
     type: "columns"
@@ -111,16 +112,19 @@ function getNullishJSONValueAsPlaintext(value: string): string {
     return value !== "null" ? cheerio.load(value)("body").text() : ""
 }
 
-const getExplorerRecords = async (): Promise<ExplorerRecord[]> => {
-    const pageviews = await getAnalyticsPageviewsByUrlObj(db.knexInstance())
+const getExplorerRecords = async (
+    knex: Knex<any, any[]>
+): Promise<ExplorerRecord[]> => {
+    const pageviews = await getAnalyticsPageviewsByUrlObj(knex)
 
     // Fetch info about all charts used in explorers, as linked by the explorer_charts table
     const graphersUsedInExplorers = await db
-        .queryMysql(
+        .knexRaw<{ chartId: number }>(
             `
         SELECT DISTINCT chartId
         FROM explorer_charts
-        `
+        `,
+            knex
         )
         .then((results: { chartId: number }[]) =>
             results.map(({ chartId }) => chartId)
@@ -129,17 +133,18 @@ const getExplorerRecords = async (): Promise<ExplorerRecord[]> => {
         .then((charts) => keyBy(charts, "id"))
 
     const explorerRecords = await db
-        .queryMysql(
+        .knexRaw<Omit<ExplorerEntry, "views_7d">>(
             `
     SELECT slug,
         COALESCE(config->>"$.explorerSubtitle", "null")     AS subtitle,
         COALESCE(config->>"$.explorerTitle", "null")        AS title,
         COALESCE(config->>"$.blocks", "null")               AS blocks
     FROM explorers
     WHERE isPublished = true
-    `
+    `,
+            knex
         )
-        .then((results: ExplorerEntry[]) =>
+        .then((results) =>
             results.flatMap(({ slug, title, subtitle, blocks }) => {
                 const textFromExplorer = extractTextFromExplorer(
                     blocks,
@@ -190,8 +195,8 @@ const indexExplorersToAlgolia = async () => {
     try {
         const index = client.initIndex(SearchIndexName.Explorers)
 
-        await db.getConnection()
-        const records = await getExplorerRecords()
+        const knex = db.knexInstance()
+        const records = await getExplorerRecords(knex)
         await index.replaceAllObjects(records)
 
         await db.closeTypeOrmAndKnexConnections()

diff --git a/baker/algolia/indexToAlgolia.tsx b/baker/algolia/indexToAlgolia.tsx
@@ -196,12 +196,12 @@ function generateGdocRecords(
 
 // Generate records for countries, WP posts (not including posts that have been succeeded by Gdocs equivalents), and Gdocs
 const getPagesRecords = async (knex: Knex<any, any[]>) => {
-    const pageviews = await getAnalyticsPageviewsByUrlObj(db.knexInstance())
+    const pageviews = await getAnalyticsPageviewsByUrlObj(knex)
     const gdocs = await GdocPost.getPublishedGdocs()
     const publishedGdocsBySlug = keyBy(gdocs, "slug")
     // TODO: the knex instance should be handed down as a parameter
     const slugsWithPublishedGdocsSuccessors =
-        await db.getSlugsWithPublishedGdocsSuccessors(db.knexInstance())
+        await db.getSlugsWithPublishedGdocsSuccessors(knex)
     const postsApi = await getPostsFromSnapshots(knex, undefined, (post) => {
         // Two things can happen here:
         // 1. There's a published Gdoc with the same slug