From 35479bf80ec450573e002885aefd23b049331821 Mon Sep 17 00:00:00 2001 From: Emi Matchu Date: Fri, 27 Sep 2024 19:41:52 -0700 Subject: [PATCH] Remove filtering colors by prank column, now that we've deleted it --- pages/api/validPetPoses.js | 19 ++++++++----------- src/server/loaders.js | 4 ++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pages/api/validPetPoses.js b/pages/api/validPetPoses.js index 2f3838f..458efa3 100644 --- a/pages/api/validPetPoses.js +++ b/pages/api/validPetPoses.js @@ -17,15 +17,12 @@ export async function getValidPetPoses() { const largestColorIdPromise = getLargestColorId(db); const distinctPetStatesPromise = getDistinctPetStates(db); - const [ - largestSpeciesId, - largestColorId, - distinctPetStates, - ] = await Promise.all([ - largestSpeciesIdPromise, - largestColorIdPromise, - distinctPetStatesPromise, - ]); + const [largestSpeciesId, largestColorId, distinctPetStates] = + await Promise.all([ + largestSpeciesIdPromise, + largestColorIdPromise, + distinctPetStatesPromise, + ]); const poseStrs = new Set(); for (const petState of distinctPetStates) { @@ -90,7 +87,7 @@ async function getLargestSpeciesId(db) { } async function getLargestColorId(db) { - const [rows] = await db.query(`SELECT max(id) FROM colors WHERE prank = 0`); + const [rows] = await db.query(`SELECT max(id) FROM colors`); return rows[0]["max(id)"]; } @@ -124,7 +121,7 @@ async function handle(req, res) { async function handleWithBeeline(req, res) { beeline.withTrace( { name: "api/validPetPoses", operation_name: "api/validPetPoses" }, - () => handle(req, res) + () => handle(req, res), ); } diff --git a/src/server/loaders.js b/src/server/loaders.js index 95a0664..a914b66 100644 --- a/src/server/loaders.js +++ b/src/server/loaders.js @@ -60,7 +60,7 @@ const buildColorLoader = (db) => { const colorLoader = new DataLoader(async (colorIds) => { const qs = colorIds.map((_) => "?").join(","); const [rows] = await db.execute( - `SELECT * FROM colors WHERE id IN (${qs}) AND prank = 0`, + `SELECT * FROM colors WHERE id IN (${qs})`, colorIds, ); @@ -75,7 +75,7 @@ const buildColorLoader = (db) => { }); colorLoader.loadAll = async () => { - const [rows] = await db.execute(`SELECT * FROM colors WHERE prank = 0`); + const [rows] = await db.execute(`SELECT * FROM colors`); const entities = rows.map(normalizeRow); for (const color of entities) {