🐝 remove explorer redirect resolution in gdoc validation

owid · Oct 8, 2024 · 6d314b4 · 6d314b4
1 parent ac5579c
commit 6d314b4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/db/model/Gdoc/GdocBase.ts b/db/model/Gdoc/GdocBase.ts
@@ -58,7 +58,6 @@ import {
     OwidGdocContent,
     OwidGdocType,
 } from "@ourworldindata/types"
-import { getRedirectsFromDb, resolveRedirects } from "../Redirect.js"
 
 export class GdocBase implements OwidGdocBaseInterface {
     id!: string
@@ -751,8 +750,6 @@ export class GdocBase implements OwidGdocBaseInterface {
         const chartIdsBySlug = await mapSlugsToIds(knex)
         const publishedExplorersBySlug =
             await db.getPublishedExplorersBySlug(knex)
-        const redirects = await getRedirectsFromDb(knex)
-        const resolvedRedirects = resolveRedirects(redirects)
 
         const linkErrors: OwidGdocErrorMessage[] = this.links.reduce(
             (errors: OwidGdocErrorMessage[], link): OwidGdocErrorMessage[] => {
@@ -783,9 +780,7 @@ export class GdocBase implements OwidGdocBaseInterface {
                 }
 
                 if (link.linkType === "explorer") {
-                    const resolvedTarget =
-                        resolvedRedirects.get(link.target) ?? link.target
-                    if (!publishedExplorersBySlug[resolvedTarget]) {
+                    if (!publishedExplorersBySlug[link.target]) {
                         errors.push({
                             property: "content",
                             message: `Explorer chart with slug ${link.target} does not exist or is not published`,

diff --git a/db/model/Redirect.ts b/db/model/Redirect.ts
@@ -16,29 +16,6 @@ export async function getRedirects(
     )
 }
 
-/**
- * Takes a list of redirects and returns a map of source -> target
- * such that if you have [A -> B, B -> C], the map will be { A -> C, B -> C }
- */
-export function resolveRedirects(
-    redirects: Pick<DbPlainRedirect, "source" | "target">[]
-): Map<string, string> {
-    const asMap = new Map<string, string>(
-        redirects.map(({ source, target }) => [source, target])
-    )
-    const resolved = new Map<string, string>()
-
-    for (const [source, target] of asMap) {
-        let current = target
-        while (asMap.has(current)) {
-            current = asMap.get(current)!
-        }
-        resolved.set(source, current)
-    }
-
-    return resolved
-}
-
 export async function getRedirectById(
     knex: db.KnexReadonlyTransaction,
     id: number