diff --git a/src/DataLoaders/GenTokens.ts b/src/DataLoaders/GenTokens.ts index 5310b1c..821b356 100644 --- a/src/DataLoaders/GenTokens.ts +++ b/src/DataLoaders/GenTokens.ts @@ -64,9 +64,14 @@ const batchGenTokObjkt = async (genIds) => { } } + // 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 @@ -290,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)