From 93aed36413823c3a766de9f98cd7f501b357c19a Mon Sep 17 00:00:00 2001 From: Steven Baughman Date: Thu, 3 Mar 2022 22:04:33 -0500 Subject: [PATCH 1/3] Require inner join on offer if sorting by offer --- src/DataLoaders/GenTokens.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/DataLoaders/GenTokens.ts b/src/DataLoaders/GenTokens.ts index 16d74c1..03c24a3 100644 --- a/src/DataLoaders/GenTokens.ts +++ b/src/DataLoaders/GenTokens.ts @@ -40,9 +40,13 @@ const batchGenTokObjkt = async (genIds) => { .select() .where("objkt.issuerId IN (:...issuers)", { issuers: ids }) + // offerPrice and offerCreatedAt sort requires a join to offer table + const sortRequiresOffer = sorts.includes( + (sort) => sort == "offerPrice" || sort == "offerCreatedAt" + ); // if the filters says "OFFER NOT NULL", we can use inner join to filter query - if (filters && filters.offer_ne === null) { - query = query.innerJoinAndSelect("objkt.offer", "offer") + if (sortRequiresOffer || (filters && filters.offer_ne === null)) { + query = query.innerJoinAndSelect("objkt.offer", "offer"); } // add sorting From db16fcfc98e2a268cddc767fa795cb1904c75710 Mon Sep 17 00:00:00 2001 From: Steven Baughman Date: Thu, 3 Mar 2022 22:09:34 -0500 Subject: [PATCH 2/3] Fix comment spacing --- src/DataLoaders/GenTokens.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DataLoaders/GenTokens.ts b/src/DataLoaders/GenTokens.ts index 177f2c8..821b356 100644 --- a/src/DataLoaders/GenTokens.ts +++ b/src/DataLoaders/GenTokens.ts @@ -64,7 +64,7 @@ const batchGenTokObjkt = async (genIds) => { } } - // offerPrice and offerCreatedAt sort requires a join to offer table + // offerPrice and offerCreatedAt sort requires a join to offer table const sortRequiresOffer = sorts.includes( (sort) => sort == "offerPrice" || sort == "offerCreatedAt" ); @@ -295,4 +295,4 @@ const batchGenTokObjktFeatures = async (ids) => { return featuresByIds } -export const createGenTokObjktFeaturesLoader = () => new DataLoader(batchGenTokObjktFeatures) \ No newline at end of file +export const createGenTokObjktFeaturesLoader = () => new DataLoader(batchGenTokObjktFeatures) From 37dfff79e774e750b3971593559cea358e72bf44 Mon Sep 17 00:00:00 2001 From: Steven Baughman Date: Thu, 3 Mar 2022 22:10:15 -0500 Subject: [PATCH 3/3] Remove weird line break GitHub added