refactor: resolve internal redirects from db

owid · Feb 9, 2024 · 8a375ce · 8a375ce
1 parent 329e2f9
commit 8a375ce
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/baker/redirects.ts b/baker/redirects.ts
@@ -1,5 +1,4 @@
 import * as db from "../db/db.js"
-import * as wpdb from "../db/wpdb.js"
 import { memoize, JsonError, Url } from "@ourworldindata/utils"
 import { isCanonicalInternalUrl } from "./formatting.js"
 import { resolveExplorerRedirect } from "./replaceExplorerRedirects.js"
@@ -101,14 +100,12 @@ const stripTrailingSlash = (url: string) => {
 }
 
 export const getWordpressRedirectsMap = async () => {
-    const wordpressRedirectRows = (await wpdb.singleton.query(
-        `SELECT url, action_data FROM wp_redirection_items WHERE status = 'enabled'`
-    )) as Array<{ url: string; action_data: string }>
+    const redirectsFromDb = await getRedirectsFromDb()
 
     return new Map(
-        wordpressRedirectRows.map((row) => [
-            stripTrailingSlash(row.url),
-            stripTrailingSlash(row.action_data),
+        redirectsFromDb.map((row) => [
+            stripTrailingSlash(row.source),
+            stripTrailingSlash(row.target),
         ])
     )
 }