From 35cf682f5dc343db62721c038555fa17238652e5 Mon Sep 17 00:00:00 2001 From: Melisa Anabella Rossi Date: Wed, 6 Sep 2023 11:42:52 -0300 Subject: [PATCH] Revert "feat: add emoteHasSound and emoteHasGeometry filters (#343)" (#345) This reverts commit a4b68de19faa121257f9ac26e08a61e0217f4801. --- package-lock.json | 14 +++++------ package.json | 2 +- src/adapters/handlers/utils.ts | 4 +-- src/logic/nfts/collections.spec.ts | 4 --- src/logic/nfts/collections.ts | 8 +----- src/ports/catalog/queries.ts | 17 +++---------- src/ports/catalog/types.ts | 2 -- src/ports/catalog/utils.ts | 4 --- src/ports/items/types.ts | 2 -- src/ports/items/utils.spec.ts | 2 -- src/ports/items/utils.ts | 4 --- src/tests/adapters/handlers/utils.spec.ts | 2 -- src/tests/ports/catalog-queries.spec.ts | 30 ----------------------- src/tests/ports/catalog.spec.ts | 4 --- src/tests/ports/nfts.spec.ts | 4 --- 15 files changed, 13 insertions(+), 90 deletions(-) diff --git a/package-lock.json b/package-lock.json index 88f5fc32..1eeda7a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@dcl/schemas": "^9.5.0", + "@dcl/schemas": "^9.1.0", "@well-known-components/env-config-provider": "^1.2.0", "@well-known-components/http-requests-logger-component": "^2.1.0", "@well-known-components/http-server": "^1.1.6", @@ -617,9 +617,9 @@ } }, "node_modules/@dcl/schemas": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.5.0.tgz", - "integrity": "sha512-OIPRbItAF+qMAmUlVxoa/esO83LZ96oDTim/Fxfwj6LAmPfwtZsAPH22iAiYIP6i5XuLMS7PS13NLioHT8lQJg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.1.0.tgz", + "integrity": "sha512-zOz/49XN3QM74S48LqDUEboDPfW40LNlQs5+1k+Y/zS3aeQ07/opKSc7OVL9zRNa9LSjG3IlFkJvBHa3j2A5AQ==", "dependencies": { "ajv": "^8.11.0", "ajv-errors": "^3.0.0", @@ -12821,9 +12821,9 @@ } }, "@dcl/schemas": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.5.0.tgz", - "integrity": "sha512-OIPRbItAF+qMAmUlVxoa/esO83LZ96oDTim/Fxfwj6LAmPfwtZsAPH22iAiYIP6i5XuLMS7PS13NLioHT8lQJg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.1.0.tgz", + "integrity": "sha512-zOz/49XN3QM74S48LqDUEboDPfW40LNlQs5+1k+Y/zS3aeQ07/opKSc7OVL9zRNa9LSjG3IlFkJvBHa3j2A5AQ==", "requires": { "ajv": "^8.11.0", "ajv-errors": "^3.0.0", diff --git a/package.json b/package.json index 6d26a179..54c92f89 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "printWidth": 80 }, "dependencies": { - "@dcl/schemas": "^9.5.0", + "@dcl/schemas": "^9.1.0", "@well-known-components/env-config-provider": "^1.2.0", "@well-known-components/http-requests-logger-component": "^2.1.0", "@well-known-components/http-server": "^1.1.6", diff --git a/src/adapters/handlers/utils.ts b/src/adapters/handlers/utils.ts index b447f7fd..4a226f7d 100644 --- a/src/adapters/handlers/utils.ts +++ b/src/adapters/handlers/utils.ts @@ -55,8 +55,6 @@ export const getItemsParams = (params: Params) => { ? ethers.utils.parseEther(minPrice).toString() : undefined, urns: params.getList('urn'), - ids: params.getList('id'), - emoteHasSound: params.getBoolean('emoteHasSound'), - emoteHasGeometry: params.getBoolean('emoteHasGeometry'), + ids: params.getList('id') } } diff --git a/src/logic/nfts/collections.spec.ts b/src/logic/nfts/collections.spec.ts index 857692ac..4723a4c0 100644 --- a/src/logic/nfts/collections.spec.ts +++ b/src/logic/nfts/collections.spec.ts @@ -69,8 +69,6 @@ describe('when building a result from the collections subgraph fragment', () => rarity: Rarity.LEGENDARY, bodyShapes: [BodyShape.MALE, BodyShape.FEMALE], loop: false, - hasSound: false, - hasGeometry: false, }, } }) @@ -84,8 +82,6 @@ describe('when building a result from the collections subgraph fragment', () => bodyShapes: [BodyShape.MALE, BodyShape.FEMALE], rarity: Rarity.LEGENDARY, loop: false, - hasGeometry: false, - hasSound: false }) }) }) diff --git a/src/logic/nfts/collections.ts b/src/logic/nfts/collections.ts index 8e48b50b..312a56c3 100644 --- a/src/logic/nfts/collections.ts +++ b/src/logic/nfts/collections.ts @@ -46,8 +46,6 @@ export const getCollectionsFields = () => ` rarity bodyShapes loop - hasSound - hasGeometry } } createdAt @@ -107,9 +105,7 @@ export type CollectionsFields = Omit< category: EmoteCategory rarity: Rarity bodyShapes: BodyShape[] - loop: boolean, - hasSound: boolean, - hasGeometry: boolean + loop: boolean } | null } createdAt: string @@ -181,8 +177,6 @@ export function fromCollectionsFragment( description: fragment.metadata.emote!.description, rarity: fragment.metadata.emote!.rarity, loop: fragment.metadata.emote!.loop, - hasSound: fragment.metadata.emote!.hasSound, - hasGeometry: fragment.metadata.emote!.hasGeometry }, } break diff --git a/src/ports/catalog/queries.ts b/src/ports/catalog/queries.ts index c50c8b4f..3be898b8 100644 --- a/src/ports/catalog/queries.ts +++ b/src/ports/catalog/queries.ts @@ -201,14 +201,6 @@ export const getIdsWhere = (filters: CatalogFilters) => { return SQL`items.id = ANY(${filters.ids})` } -export const getHasSoundWhere = () => { - return SQL`items.search_emote_has_sound = true` -} - -export const getHasGeometryWhere = () => { - return SQL`items.search_emote_has_geometry = true` -} - export const getUrnsWhere = (filters: CatalogFilters) => { return SQL`items.urn = ANY(${filters.urns})` } @@ -236,8 +228,6 @@ export const getCollectionsQueryWhere = (filters: CatalogFilters) => { filters.onlyListing ? getOnlyListingsWhere() : undefined, filters.onlyMinting ? getOnlyMintingWhere() : undefined, filters.ids?.length ? getIdsWhere(filters) : undefined, - filters.emoteHasSound ? getHasSoundWhere() : undefined, - filters.emoteHasGeometry ? getHasGeometryWhere() : undefined, filters.urns?.length ? getUrnsWhere(filters) : undefined, ].filter(Boolean) @@ -404,10 +394,9 @@ export const getCollectionsItemsCatalogQuery = ( emote.body_shapes, emote.rarity, emote.name, - emote.loop, - emote.has_sound, - emote.has_geometry - FROM ` + emote.loop + FROM + ` ) .append(schemaVersion) .append( diff --git a/src/ports/catalog/types.ts b/src/ports/catalog/types.ts index b00320f4..072eda49 100644 --- a/src/ports/catalog/types.ts +++ b/src/ports/catalog/types.ts @@ -40,8 +40,6 @@ export type CollectionsItemDBResult = { rarity: string name: string loop?: boolean - has_sound: boolean, - has_geometry: boolean } urn: string } diff --git a/src/ports/catalog/utils.ts b/src/ports/catalog/utils.ts index 2b756c14..751260bb 100644 --- a/src/ports/catalog/utils.ts +++ b/src/ports/catalog/utils.ts @@ -100,8 +100,6 @@ export function fromCollectionsItemDbResultToCatalogItem( rarity, loop, category: emoteCategory, - has_sound, - has_geometry } = dbItem.metadata ;(name = emoteName), (category = NFTCategory.EMOTE) data = { @@ -111,8 +109,6 @@ export function fromCollectionsItemDbResultToCatalogItem( bodyShapes: body_shapes as BodyShape[], rarity: rarity as Rarity, loop: !!loop, - hasSound: !!has_sound, - hasGeometry: !!has_geometry }, } break diff --git a/src/ports/items/types.ts b/src/ports/items/types.ts index 11f7ba4f..cd7d0e83 100644 --- a/src/ports/items/types.ts +++ b/src/ports/items/types.ts @@ -37,8 +37,6 @@ export type ItemFragment = { description: string category: EmoteCategory loop: boolean - hasSound: boolean - hasGeometry: boolean } | null } searchWearableBodyShapes: BodyShape[] | null diff --git a/src/ports/items/utils.spec.ts b/src/ports/items/utils.spec.ts index 0a99b1e9..adab58ea 100644 --- a/src/ports/items/utils.spec.ts +++ b/src/ports/items/utils.spec.ts @@ -228,8 +228,6 @@ describe('#fromItemFragment', () => { description: 'description', loop: false, name: 'name', - hasGeometry: false, - hasSound: false }, }, searchWearableBodyShapes: null, diff --git a/src/ports/items/utils.ts b/src/ports/items/utils.ts index 33396064..2efdd1c8 100644 --- a/src/ports/items/utils.ts +++ b/src/ports/items/utils.ts @@ -58,8 +58,6 @@ export function fromItemFragment( bodyShapes: fragment.searchEmoteBodyShapes!, rarity: fragment.rarity, loop: fragment.metadata.emote!.loop, - hasGeometry: fragment.metadata.emote!.hasGeometry, - hasSound: fragment.metadata.emote!.hasSound }, } break @@ -125,8 +123,6 @@ export const getItemFragment = () => ` description category loop - hasSound - hasGeometry } } searchWearableBodyShapes diff --git a/src/tests/adapters/handlers/utils.spec.ts b/src/tests/adapters/handlers/utils.spec.ts index 8f7f8240..fe42965f 100644 --- a/src/tests/adapters/handlers/utils.spec.ts +++ b/src/tests/adapters/handlers/utils.spec.ts @@ -43,8 +43,6 @@ describe('getItemsParams', () => { urns: [], wearableCategory: undefined, wearableGenders: [], - emoteHasSound: false, - emoteHasGeometry: false, }) }) }) diff --git a/src/tests/ports/catalog-queries.spec.ts b/src/tests/ports/catalog-queries.spec.ts index cdcad91e..60735fac 100644 --- a/src/tests/ports/catalog-queries.spec.ts +++ b/src/tests/ports/catalog-queries.spec.ts @@ -322,36 +322,6 @@ test('catalog utils', () => { ]) }) }) - - describe('and passing emoteHasSound as true', () => { - beforeEach(() => { - filters = { - emoteCategory, - emoteHasSound: true, - } - }) - - it('should add the sound related definition to the WHERE', () => { - expect(getCollectionsQueryWhere(filters).text).toContain( - 'items.search_emote_has_sound = true' - ) - }) - }) - - describe('and passing emoteHasGeometry as true', () => { - beforeEach(() => { - filters = { - emoteCategory, - emoteHasGeometry: true, - } - }) - - it('should add the geometry related definition to the WHERE', () => { - expect(getCollectionsQueryWhere(filters).text).toContain( - 'items.search_emote_has_geometry = true' - ) - }) - }) }) }) diff --git a/src/tests/ports/catalog.spec.ts b/src/tests/ports/catalog.spec.ts index 81f6c4ea..3e9236a2 100644 --- a/src/tests/ports/catalog.spec.ts +++ b/src/tests/ports/catalog.spec.ts @@ -27,8 +27,6 @@ const mockedDBItemResponse: CollectionsItemDBResult = { rarity: 'legendary', name: 'Descension', loop: false, - has_geometry: false, - has_sound: false }, image: 'https://peer-lb.decentraland.org/lambdas/collections/contents/urn:decentraland:matic:collections-v2:0xe42257bb4aada439179d736a64a736be0693a4ec:2/thumbnail', @@ -132,8 +130,6 @@ test('catalog component', function () { rarity: 'legendary', name: 'Descension', loop: false, - has_geometry: false, - has_sound: false }, image: 'https://peer-lb.decentraland.org/lambdas/collections/contents/urn:decentraland:matic:collections-v2:0xe42257bb4aada439179d736a64a736be0693a4ec:2/thumbnail', diff --git a/src/tests/ports/nfts.spec.ts b/src/tests/ports/nfts.spec.ts index df8a64a5..eed992c9 100644 --- a/src/tests/ports/nfts.spec.ts +++ b/src/tests/ports/nfts.spec.ts @@ -155,8 +155,6 @@ describe('when fetching emotes', () => { rarity: Rarity.COMMON, bodyShapes: [BodyShape.MALE, BodyShape.FEMALE], loop: false, - hasGeometry: false, - hasSound: false }, }, createdAt: Date.now().toString(), @@ -259,8 +257,6 @@ describe('when fetching nfts', () => { rarity: Rarity.COMMON, bodyShapes: [BodyShape.MALE, BodyShape.FEMALE], loop: false, - hasGeometry: false, - hasSound: false }, }, createdAt: Date.now().toString(),