feat: add third party ID to WearablesRequest (#258)

* feat: add third party ID to WearablesRequest * fix: add thirdPartyId to filters deserialization
decentraland · Apr 26, 2022 · c4944ec · c4944ec
1 parent 1ab8e83
commit c4944ec
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 31 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "@types/redux-logger": "^3.0.9",
     "bignumber.js": "^9.0.1",
     "blob-to-buffer": "^1.2.8",
-    "dcl-catalyst-client": "^11.1.0",
+    "dcl-catalyst-client": "^11.2.0",
     "dcl-crypto": "^2.3.0",
     "dcl-quests-client": "^2.10.0",
     "dcl-scene-writer": "^1.1.2",

diff --git a/packages/shared/catalogs/sagas.ts b/packages/shared/catalogs/sagas.ts
@@ -118,11 +118,13 @@ function* fetchWearablesFromCatalyst(filters: WearablesRequestFilters) {
         result.push(...v2Wearables)
       }
     } else {
-      const ownedWearables: OwnedWearablesWithDefinition[] = yield call(
-        fetchOwnedWearables,
-        filters.ownedByUser,
-        client
-      )
+      let ownedWearables: OwnedWearablesWithDefinition[]
+      if (filters.thirdPartyId) {
+        ownedWearables = yield call(fetchOwnedThirdPartyWearables, filters.ownedByUser, filters.thirdPartyId, client)
+      } else {
+        ownedWearables = yield call(fetchOwnedWearables, filters.ownedByUser, client)
+      }
+
       for (const { amount, definition } of ownedWearables) {
         if (definition) {
           for (let i = 0; i < amount; i++) {
@@ -170,6 +172,10 @@ function* fetchWearablesFromCatalyst(filters: WearablesRequestFilters) {
     .filter((wearable) => !!wearable)
 }
 
+function fetchOwnedThirdPartyWearables(ethAddress: string, thirdPartyId: string, client: CatalystClient) {
+  return client.fetchOwnedThirdPartyWearables(ethAddress, thirdPartyId, true)
+}
+
 function fetchOwnedWearables(ethAddress: string, client: CatalystClient) {
   return client.fetchOwnedWearables(ethAddress, true)
 }
@@ -315,6 +321,10 @@ function areFiltersValid(filters: WearablesRequestFilters) {
     filtersSet += 1
   }
 
+  if (filters.thirdPartyId && !filters.ownedByUser) {
+    ok = false
+  }
+
   return filtersSet === 1 && ok
 }
 

diff --git a/packages/shared/catalogs/types.ts b/packages/shared/catalogs/types.ts
@@ -114,4 +114,5 @@ export type WearablesRequestFilters = {
   ownedByUser?: string
   wearableIds?: WearableId[]
   collectionIds?: string[]
+  thirdPartyId?: string
 }
diff --git a/packages/unity-interface/BrowserInterface.ts b/packages/unity-interface/BrowserInterface.ts
@@ -708,12 +708,14 @@ export class BrowserInterface {
       ownedByUser: string | null
       wearableIds?: string[] | null
       collectionIds?: string[] | null
+      thirdPartyId?: string | null
     }
     context?: string
   }) {
     const { filters, context } = data
     const newFilters: WearablesRequestFilters = {
       ownedByUser: filters.ownedByUser ?? undefined,
+      thirdPartyId: filters.thirdPartyId ?? undefined,
       wearableIds: arrayCleanup(filters.wearableIds),
       collectionIds: arrayCleanup(filters.collectionIds)
     }