feat: Update collection when migration is incomplete (#3167)

LautaroPetaccio · web-flow · commit 2a7e16bca045 · 2024-08-30T19:53:20.000Z
* feat: Update collection when migration is incomplete

* fix: Remove comments
diff --git a/src/modules/thirdParty/sagas.spec.ts b/src/modules/thirdParty/sagas.spec.ts
@@ -1,12 +1,14 @@
 import uuidv4 from 'uuid/v4'
+import { ContractData, ContractName, getContract } from 'decentraland-transactions'
+import { ChainId, Network } from '@dcl/schemas'
 import { MerkleDistributorInfo } from '@dcl/content-hash-tree/dist/types'
 import { CatalystClient } from 'dcl-catalyst-client'
 import { DeploymentPreparationData } from 'dcl-catalyst-client/dist/client/utils/DeploymentBuilder'
 import { call } from '@redux-saga/core/effects'
 import * as matchers from 'redux-saga-test-plan/matchers'
 import { expectSaga } from 'redux-saga-test-plan'
 import { throwError } from 'redux-saga-test-plan/providers'
-import { select } from 'redux-saga-test-plan/matchers'
+import { select, take } from 'redux-saga-test-plan/matchers'
 import { AuthIdentity, Authenticator, AuthLinkType } from '@dcl/crypto'
 import { ToastType } from 'decentraland-ui'
 import { SHOW_TOAST } from 'decentraland-dapps/dist/modules/toast/actions'
@@ -55,14 +57,13 @@ import {
   ThirdPartyError
 } from 'modules/collection/utils'
 import { updateThirdPartyActionProgress } from 'modules/ui/thirdparty/action'
+import { FETCH_COLLECTION_SUCCESS, fetchCollectionRequest } from 'modules/collection/actions'
 import { PublishThirdPartyCollectionModalStep, ThirdPartyAction } from 'modules/ui/thirdparty/types'
 import { Item } from 'modules/item/types'
+import { PublishButtonAction } from 'components/ThirdPartyCollectionDetailPage/CollectionPublishButton/CollectionPublishButton.types'
 import { thirdPartySaga } from './sagas'
 import { getPublishItemsSignature } from './utils'
 import { getThirdParty } from './selectors'
-import { ContractData, ContractName, getContract } from 'decentraland-transactions'
-import { ChainId, Network } from '@dcl/schemas'
-import { PublishButtonAction } from 'components/ThirdPartyCollectionDetailPage/CollectionPublishButton/CollectionPublishButton.types'
 
 jest.mock('modules/item/export')
 jest.mock('@dcl/crypto')
@@ -313,7 +314,7 @@ describe('when pushing changes to third party items', () => {
   let item: Item
   let itemCurations: ItemCuration[]
   beforeEach(() => {
-    collection = { name: 'valid collection name', id: uuidv4() } as Collection
+    collection = { name: 'valid collection name', id: uuidv4(), isMappingComplete: true } as Collection
     item = {
       ...mockedItem,
       collectionId: collection.id
@@ -338,6 +339,7 @@ describe('when pushing changes to third party items', () => {
       return expectSaga(thirdPartySaga, mockBuilder, mockCatalystClient)
         .provide([
           [select(getItemCurations, item.collectionId), itemCurations],
+          [select(getCollection, item.collectionId), collection],
           [call([mockBuilder, mockBuilder.updateItemCurationStatus], item.id, itemCurations[0].status), throwError(new Error('Error'))]
         ])
         .put(pushChangesThirdPartyItemsFailure('Some item curations were not pushed'))
@@ -352,7 +354,7 @@ describe('when pushing changes to third party items', () => {
   describe('when both api requests succeed', () => {
     let updatedItemCurations: ItemCuration[]
     beforeEach(() => {
-      collection = { name: 'valid collection name', id: uuidv4() } as Collection
+      collection = { name: 'valid collection name', id: uuidv4(), isMappingComplete: true } as Collection
       itemCurations = [
         {
           id: 'id',
@@ -393,10 +395,32 @@ describe('when pushing changes to third party items', () => {
       ;(mockBuilder.pushItemCuration as jest.Mock).mockResolvedValue(updatedItemCurations[1])
     })
 
+    describe('and the collection does not have its mapping complete', () => {
+      beforeEach(() => {
+        collection = { name: 'valid collection name', id: uuidv4(), isMappingComplete: false } as Collection
+      })
+
+      it('should put an action to re fetch the collection', () => {
+        const anotherItem = { ...mockedItem, id: 'anotherItemId' }
+        return expectSaga(thirdPartySaga, mockBuilder, mockCatalystClient)
+          .provide([
+            [select(getItemCurations, item.collectionId), itemCurations],
+            [select(getCollection, item.collectionId), collection],
+            [take(FETCH_COLLECTION_SUCCESS), undefined]
+          ])
+          .put(fetchCollectionRequest(item.collectionId ?? ''))
+          .dispatch(pushChangesThirdPartyItemsRequest([item, anotherItem]))
+          .run({ silenceTimeout: true })
+      })
+    })
+
     it('should put the push changes success action with the updated item curations, open the PublishThirdPartyCollectionModal modal with the success step and reset the progress', () => {
       const anotherItem = { ...mockedItem, id: 'anotherItemId' }
       return expectSaga(thirdPartySaga, mockBuilder, mockCatalystClient)
-        .provide([[select(getItemCurations, item.collectionId), itemCurations]])
+        .provide([
+          [select(getItemCurations, item.collectionId), itemCurations],
+          [select(getCollection, item.collectionId), collection]
+        ])
         .put(updateThirdPartyActionProgress(100, ThirdPartyAction.PUSH_CHANGES))
         .put(updateThirdPartyActionProgress(0, ThirdPartyAction.PUSH_CHANGES)) // resets the progress
         .put(pushChangesThirdPartyItemsSuccess(item.collectionId!, updatedItemCurations))
@@ -426,7 +450,7 @@ describe('when publishing & pushing changes to third party items', () => {
   let salt: string
   let qty: number
   beforeEach(() => {
-    collection = { name: 'valid collection name', id: uuidv4() } as Collection
+    collection = { name: 'valid collection name', id: uuidv4(), isMappingComplete: true } as Collection
     item = {
       ...mockedItem,
       collectionId: collection.id
@@ -462,7 +486,8 @@ describe('when publishing & pushing changes to third party items', () => {
           [
             call([mockBuilder, mockBuilder.publishTPCollection], item.collectionId!, [item.id], { signature, qty, salt }),
             throwError(new Error(errorMessage))
-          ]
+          ],
+          [select(getCollection, item.collectionId), collection]
         ])
         .put(closeModal('PublishThirdPartyCollectionModal'))
         .put.like({ action: { type: SHOW_TOAST, payload: { toast: { type: ToastType.ERROR } } } })
@@ -482,7 +507,8 @@ describe('when publishing & pushing changes to third party items', () => {
       return expectSaga(thirdPartySaga, mockBuilder, mockCatalystClient)
         .provide([
           [call(getPublishItemsSignature, thirdParty.id, 1), { signature, salt }],
-          [select(getItemCurations, item.collectionId), itemCurations]
+          [select(getItemCurations, item.collectionId), itemCurations],
+          [select(getCollection, item.collectionId), collection]
         ])
         .put(publishAndPushChangesThirdPartyItemsFailure(errorMessage))
         .dispatch(publishAndPushChangesThirdPartyItemsRequest(thirdParty, itemsToPublish, [itemWithChanges]))
@@ -507,11 +533,31 @@ describe('when publishing & pushing changes to third party items', () => {
       ;(mockBuilder.pushItemCuration as jest.Mock).mockResolvedValue(updatedItemCurations[0])
     })
 
+    describe('and the collection does not have its mapping complete', () => {
+      beforeEach(() => {
+        collection = { name: 'valid collection name', id: uuidv4(), isMappingComplete: false } as Collection
+      })
+
+      it('should put an action to re fetch the collection', () => {
+        return expectSaga(thirdPartySaga, mockBuilder, mockCatalystClient)
+          .provide([
+            [call(getPublishItemsSignature, thirdParty.id, 1), { signature, salt }],
+            [select(getItemCurations, item.collectionId), itemCurations],
+            [select(getCollection, item.collectionId), collection],
+            [take(FETCH_COLLECTION_SUCCESS), undefined]
+          ])
+          .put(fetchCollectionRequest(item.collectionId ?? ''))
+          .dispatch(publishAndPushChangesThirdPartyItemsRequest(thirdParty, itemsToPublish, [itemWithChanges]))
+          .run({ silenceTimeout: true })
+      })
+    })
+
     it('should put the publish & push changes success action, the fetch available slots request and reset the progress', () => {
       return expectSaga(thirdPartySaga, mockBuilder, mockCatalystClient)
         .provide([
           [call(getPublishItemsSignature, thirdParty.id, 1), { signature, salt }],
-          [select(getItemCurations, item.collectionId), itemCurations]
+          [select(getItemCurations, item.collectionId), itemCurations],
+          [select(getCollection, item.collectionId), collection]
         ])
         .put(updateThirdPartyActionProgress(100, ThirdPartyAction.PUSH_CHANGES)) // resets the progress
         .put(publishAndPushChangesThirdPartyItemsSuccess(item.collectionId!, publishResponse, [...itemCurations, updatedItemCurations[0]]))
diff --git a/src/modules/thirdParty/sagas.ts b/src/modules/thirdParty/sagas.ts
@@ -1,6 +1,6 @@
 import PQueue from 'p-queue'
 import { channel } from 'redux-saga'
-import { takeLatest, takeEvery, call, put, select } from 'redux-saga/effects'
+import { takeLatest, takeEvery, call, put, select, race, take } from 'redux-saga/effects'
 import { Contract, providers } from 'ethers'
 import { Authenticator, AuthIdentity } from '@dcl/crypto'
 import { ChainId, Network } from '@dcl/schemas'
@@ -31,7 +31,9 @@ import { CurationStatus } from 'modules/curations/types'
 import { getIdentity } from 'modules/identity/utils'
 import { buildTPItemEntity } from 'modules/item/export'
 import { waitForTx } from 'modules/transaction/utils'
-import { PublishThirdPartyCollectionModalStep, ThirdPartyAction } from 'modules/ui/thirdparty/types'
+import { ThirdPartyAction, PublishThirdPartyCollectionModalStep } from 'modules/ui/thirdparty/types'
+import { getCollection } from 'modules/collection/selectors'
+import { FETCH_COLLECTION_FAILURE, FETCH_COLLECTION_SUCCESS, fetchCollectionRequest } from 'modules/collection/actions'
 import {
   FETCH_THIRD_PARTIES_REQUEST,
   fetchThirdPartiesRequest,
@@ -241,7 +243,13 @@ export function* thirdPartySaga(builder: BuilderAPI, catalystClient: CatalystCli
     const { items } = action.payload
     try {
       const collectionId = getCollectionId(items)
+      const collection: ReturnType<typeof getCollection> = yield select(getCollection, collectionId)
       const newItemsCurations: ItemCuration[] = yield call(pushChangesToThirdPartyItems, items)
+      // Update collections that are not complete
+      if (!collection?.isMappingComplete) {
+        yield put(fetchCollectionRequest(collectionId))
+        yield race({ success: take(FETCH_COLLECTION_SUCCESS), failure: take(FETCH_COLLECTION_FAILURE) })
+      }
       yield put(pushChangesThirdPartyItemsSuccess(collectionId, newItemsCurations))
       yield put(
         openModal('PublishThirdPartyCollectionModal', {
@@ -261,6 +269,7 @@ export function* thirdPartySaga(builder: BuilderAPI, catalystClient: CatalystCli
   function* handlePublishAndPushChangesThirdPartyItemRequest(action: PublishAndPushChangesThirdPartyItemsRequestAction) {
     const { thirdParty, itemsToPublish, itemsWithChanges } = action.payload
     const collectionId = getCollectionId(itemsToPublish)
+    const collection: ReturnType<typeof getCollection> = yield select(getCollection, collectionId)
     // We need to execute these two methods in sequence, because the push changes will create a new curation if there was one already approved.
     // It will create them with status PENDING, so the publish will fail if it's executed after that event.
     // Publish items
@@ -274,6 +283,11 @@ export function* thirdPartySaga(builder: BuilderAPI, catalystClient: CatalystCli
       const resultFromPushChanges: ItemCuration[] = yield call(pushChangesToThirdPartyItems, itemsWithChanges)
       const newItemCurations = [...resultFromPublish.newItemCurations, ...resultFromPushChanges]
 
+      // Update collections that are not complete
+      if (!collection?.isMappingComplete) {
+        yield put(fetchCollectionRequest(collectionId))
+        yield race({ success: take(FETCH_COLLECTION_SUCCESS), failure: take(FETCH_COLLECTION_FAILURE) })
+      }
       yield put(publishAndPushChangesThirdPartyItemsSuccess(collectionId, resultFromPublish.newItems, newItemCurations))
       yield put(fetchThirdPartyAvailableSlotsRequest(thirdParty.id)) // re-fetch available slots after publishing
       yield put(
