✨ improve getSlugsWithPublishedGdocsSuccessors

baker/SiteBaker.tsx

@@ -106,6 +106,7 @@ import {
 import { getBakePath } from "@ourworldindata/components"
 import { GdocAuthor, getMinimalAuthors } from "../db/model/Gdoc/GdocAuthor.js"
 import { DATA_INSIGHTS_ATOM_FEED_NAME } from "../site/gdocs/utils.js"
+import { getRedirectsFromDb } from "../db/model/Redirect.js"
 
 type PrefetchedAttachments = {
     linkedAuthors: DbEnrichedAuthor[]
@@ -510,28 +511,18 @@ export class SiteBaker {
 
     private async bakePosts(knex: db.KnexReadonlyTransaction) {
         if (!this.bakeSteps.has("wordpressPosts")) return
-        // TODO: the knex instance should be handed down as a parameter
         const alreadyPublishedViaGdocsSlugsSet =
             await db.getSlugsWithPublishedGdocsSuccessors(knex)
-        const redirectTargets = await db.knexRaw<{
-            source: string
-            target: string
-        }>(
-            knex,
-            `-- sql
-            SELECT source, target FROM redirects WHERE code = 301`
-        )
+        const redirects = await getRedirectsFromDb(knex)
 
         const postsApi = await getPostsFromSnapshots(
             knex,
             undefined,
             (postrow) =>
                 // Exclude posts that are already published via GDocs
                 !alreadyPublishedViaGdocsSlugsSet.has(postrow.slug) &&
-                // Exclude posts that are redirect targets
-                !redirectTargets.some(
-                    (row) => row.source.slice(1) === postrow.slug
-                )
+                // Exclude posts that are redirect sources
+                !redirects.some((row) => row.source.slice(1) === postrow.slug)
         )
 
         await pMap(

db/db.ts

@@ -169,8 +169,7 @@ export const getSlugsWithPublishedGdocsSuccessors = async (
         knex,
         `-- sql
         SELECT
-            p.slug,
-            p.type
+            p.slug
         FROM
             posts p
         LEFT JOIN posts_gdocs g on