From decd4dc0f7c2e75583258cfeae7e16fc46aa0191 Mon Sep 17 00:00:00 2001 From: Juanma Hidalgo Date: Mon, 25 Nov 2024 18:16:07 +0100 Subject: [PATCH] feat: adapt ownership queries to use the address instead of ID (#373) --- src/logic/fetch-elements/fetch-items.ts | 2 +- src/logic/fetch-elements/fetch-lands.ts | 2 +- src/logic/fetch-elements/fetch-names.ts | 2 +- test/unit/logic/fetch-elements/fetch-items.spec.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/logic/fetch-elements/fetch-items.ts b/src/logic/fetch-elements/fetch-items.ts index f3f4054f..c16f617c 100644 --- a/src/logic/fetch-elements/fetch-items.ts +++ b/src/logic/fetch-elements/fetch-items.ts @@ -47,7 +47,7 @@ function createQueryForCategory(category: ItemCategory) { category === 'wearable' ? `itemType_in: [wearable_v1, wearable_v2, smart_wearable_v1]` : `itemType: emote_v1` return `query fetchItemsByOwner($owner: String, $idFrom: ID) { nfts( - where: { id_gt: $idFrom, owner: $owner, ${itemTypeFilter}}, + where: { id_gt: $idFrom, owner_: {address: $owner}, ${itemTypeFilter}}, orderBy: id, orderDirection: asc, first: ${THE_GRAPH_PAGE_SIZE} diff --git a/src/logic/fetch-elements/fetch-lands.ts b/src/logic/fetch-elements/fetch-lands.ts index 1f891848..1e16ef15 100644 --- a/src/logic/fetch-elements/fetch-lands.ts +++ b/src/logic/fetch-elements/fetch-lands.ts @@ -4,7 +4,7 @@ import { fetchAllNFTs, THE_GRAPH_PAGE_SIZE } from './fetch-elements' const QUERY_LANDS: string = ` query fetchLANDsByOwner($owner: String, $idFrom: ID) { nfts( - where: { owner: $owner, category_in: [parcel, estate], id_gt: $idFrom }, + where: { owner_: {address: $owner}, category_in: [parcel, estate], id_gt: $idFrom }, orderBy: transferredAt, orderDirection: desc, first: ${THE_GRAPH_PAGE_SIZE} diff --git a/src/logic/fetch-elements/fetch-names.ts b/src/logic/fetch-elements/fetch-names.ts index 2336d87e..f6cdda4a 100644 --- a/src/logic/fetch-elements/fetch-names.ts +++ b/src/logic/fetch-elements/fetch-names.ts @@ -4,7 +4,7 @@ import { fetchAllNFTs, THE_GRAPH_PAGE_SIZE } from './fetch-elements' const QUERY_NAMES_PAGINATED: string = ` query fetchNamesByOwner($owner: String, $idFrom: ID) { nfts( - where: {owner: $owner, category: ens, id_gt: $idFrom } + where: {owner_: {address: $owner}, category: ens, id_gt: $idFrom } orderBy: id, orderDirection: asc, first: ${THE_GRAPH_PAGE_SIZE} diff --git a/test/unit/logic/fetch-elements/fetch-items.spec.ts b/test/unit/logic/fetch-elements/fetch-items.spec.ts index 0ebd1a9a..5c110eab 100644 --- a/test/unit/logic/fetch-elements/fetch-items.spec.ts +++ b/test/unit/logic/fetch-elements/fetch-items.spec.ts @@ -17,7 +17,7 @@ describe('fetchEmotes', () => { expect(theGraph.maticCollectionsSubgraph.query).toBeCalled() const expectedQuery = `query fetchItemsByOwner($owner: String, $idFrom: ID) { nfts( - where: { id_gt: $idFrom, owner: $owner, itemType: emote_v1}, + where: { id_gt: $idFrom, owner_: {address: $owner}, itemType: emote_v1}, orderBy: id, orderDirection: asc, first: 1000 @@ -251,7 +251,7 @@ describe('fetchWearables', () => { expect(theGraph.maticCollectionsSubgraph.query).toBeCalled() const expectedQuery = `query fetchItemsByOwner($owner: String, $idFrom: ID) { nfts( - where: { id_gt: $idFrom, owner: $owner, itemType_in: [wearable_v1, wearable_v2, smart_wearable_v1]}, + where: { id_gt: $idFrom, owner_: {address: $owner}, itemType_in: [wearable_v1, wearable_v2, smart_wearable_v1]}, orderBy: id, orderDirection: asc, first: 1000