feat: tp is published and is approved

migrations/1639023421988_rename-curations.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from 'node-pg-migrate'
+import { CollectionCuration } from '../src/Curation/CollectionCuration'
+
+export const up = (pgm: MigrationBuilder) => {
+  pgm.renameTable('curations', CollectionCuration.tableName)
+}
+
+export const down = (pgm: MigrationBuilder) => {
+  pgm.renameTable(CollectionCuration.tableName, 'curations')
+}

migrations/1639023686468_create-item-curations.ts

@@ -0,0 +1,34 @@
+import { MigrationBuilder } from 'node-pg-migrate'
+import { Collection } from '../src/Collection'
+import { ItemCuration } from '../src/Curation/ItemCuration'
+
+const tableName = ItemCuration.tableName
+
+export const up = (pgm: MigrationBuilder) => {
+  pgm.createTable(
+    tableName,
+    {
+      id: { type: 'UUID', primaryKey: true, unique: true, notNull: true },
+      item_id: { type: 'UUID', notNull: true },
+      status: { type: 'CURATION_STATUS', notNull: true },
+      created_at: { type: 'TIMESTAMP', notNull: true },
+      updated_at: { type: 'TIMESTAMP', notNull: true },
+    },
+    {
+      ifNotExists: true,
+      constraints: {
+        foreignKeys: {
+          references: Collection.tableName,
+          columns: 'item_id',
+          onDelete: 'CASCADE',
+        },
+      },
+    }
+  )
+
+  pgm.createIndex(tableName, 'item_id')
+}
+
+export const down = (pgm: MigrationBuilder) => {
+  pgm.dropTable(tableName, {})
+}

spec/mocks/collections.ts

@@ -3,14 +3,19 @@ import { omit } from 'decentraland-commons/dist/utils'
 import {
   CollectionAttributes,
   FullCollection,
+  ThirdPartyCollectionAttributes,
 } from '../../src/Collection/Collection.types'
+import {
+  CollectionFragment,
+  ThirdPartyFragment,
+  ThirdPartyMetadataType,
+} from '../../src/ethereum/api/fragments'
+import { toUnixTimestamp } from '../../src/utils/parse'
 import { wallet } from './wallet'
-import { CollectionFragment } from '../../src/ethereum/api/fragments'
 
-export const collectionAttributesMock: CollectionAttributes = {
+export const dbCollectionMock: CollectionAttributes = {
   id: uuidv4(),
   name: 'Test',
-  urn_suffix: null,
   eth_address: wallet.address,
   salt: '',
   contract_address: '0x02b6bD2420cCADC38726BD34BB7f5c52B3F4F3ff',
@@ -20,28 +25,49 @@ export const collectionAttributesMock: CollectionAttributes = {
   managers: [],
   forum_link: null,
   lock: null,
+  urn_suffix: null,
   third_party_id: null,
   reviewed_at: new Date(),
   created_at: new Date(),
   updated_at: new Date(),
 }
 
-export const collectionFragment: Omit<
+export const dbTPCollectionMock: ThirdPartyCollectionAttributes = {
+  ...dbCollectionMock,
+  eth_address: '',
+  contract_address: '',
+  urn_suffix: 'collection-id',
+  third_party_id:
+    'urn:decentraland:mumbai:collections-thirdparty:third-party-id',
+}
+
+export const collectionFragmentMock: Omit<
   CollectionFragment,
   'reviewedAt' | 'updatedAt' | 'createdAt'
 > & { reviewedAt: string | null; updatedAt: string; createdAt: string } = {
   id: 'string',
-  creator: collectionAttributesMock.eth_address,
-  owner: collectionAttributesMock.eth_address,
-  name: collectionAttributesMock.name,
-  isApproved: collectionAttributesMock.is_approved,
-  minters: collectionAttributesMock.minters,
-  managers: collectionAttributesMock.managers,
-  reviewedAt: collectionAttributesMock.reviewed_at
-    ? collectionAttributesMock.reviewed_at.toISOString()
+  creator: dbCollectionMock.eth_address,
+  owner: dbCollectionMock.eth_address,
+  name: dbCollectionMock.name,
+  isApproved: dbCollectionMock.is_approved,
+  minters: dbCollectionMock.minters,
+  managers: dbCollectionMock.managers,
+  reviewedAt: dbCollectionMock.reviewed_at
+    ? toUnixTimestamp(dbCollectionMock.reviewed_at)
     : null,
-  updatedAt: collectionAttributesMock.updated_at.toISOString(),
-  createdAt: collectionAttributesMock.created_at.toISOString(),
+  updatedAt: toUnixTimestamp(dbCollectionMock.updated_at),
+  createdAt: toUnixTimestamp(dbCollectionMock.created_at),
+}
+
+export const thirdPartyFragmentMock: ThirdPartyFragment = {
+  id: dbTPCollectionMock.third_party_id,
+  managers: [wallet.address],
+  maxItems: '10',
+  totalItems: '1',
+  metadata: {
+    type: ThirdPartyMetadataType.THIRD_PARTY_V1,
+    thirdParty: null,
+  },
 }
 
 export type ResultCollection = Omit<

spec/mocks/items.ts

@@ -1,15 +1,21 @@
 import { v4 as uuidv4 } from 'uuid'
 import { Wearable } from '../../src/ethereum/api/peer'
-import { ItemFragment } from '../../src/ethereum/api/fragments'
+import {
+  ItemFragment,
+  ThirdPartyItemFragment,
+  ThirdPartyItemMetadataType,
+} from '../../src/ethereum/api/fragments'
 import {
   FullItem,
   ItemAttributes,
   ItemRarity,
   ItemType,
+  ThirdPartyItemAttributes,
 } from '../../src/Item/Item.types'
+import { dbCollectionMock, dbTPCollectionMock } from './collections'
+import { toUnixTimestamp } from '../../src/utils/parse'
 import { buildTPItemURN } from '../../src/Item/utils'
 import { CollectionAttributes } from '../../src/Collection'
-import { collectionAttributesMock } from './collections'
 import { isTPCollection } from '../../src/Collection/utils'
 
 export type ResultItem = Omit<FullItem, 'created_at' | 'updated_at'> & {
@@ -61,7 +67,7 @@ export const dbItemMock: ItemAttributes = {
   description: '',
   thumbnail: '',
   eth_address: '',
-  collection_id: collectionAttributesMock.id,
+  collection_id: dbCollectionMock.id,
   blockchain_item_id: '0',
   price: '',
   beneficiary: '',
@@ -86,36 +92,62 @@ export const dbItemMock: ItemAttributes = {
   updated_at: new Date(),
 }
 
-export const itemURNMock = `urn:decentraland:ropsten:collections-v2:${collectionAttributesMock.contract_address}:${dbItemMock.blockchain_item_id}`
+export const dbTPItemMock: ThirdPartyItemAttributes = {
+  ...dbItemMock,
+  urn_suffix: '1',
+}
 
 export const itemFragmentMock = {
-  id:
-    collectionAttributesMock.contract_address +
-    '-' +
-    dbItemMock.blockchain_item_id,
+  id: dbCollectionMock.contract_address + '-' + dbItemMock.blockchain_item_id,
   blockchainId: '0',
-  urn: itemURNMock,
+  urn: `urn:decentraland:ropsten:collections-v2:${dbCollectionMock.contract_address}:${dbItemMock.blockchain_item_id}`,
   totalSupply: '1',
   price: dbItemMock.price!.toString(),
   beneficiary: 'aBeneficiary',
   minters: [],
   managers: [],
   collection: {
-    id: collectionAttributesMock.id,
+    id: dbCollectionMock.id,
     creator: 'aCreator',
     owner: 'anOwner',
-    name: collectionAttributesMock.name,
-    isApproved: collectionAttributesMock.is_approved,
+    name: dbCollectionMock.name,
+    isApproved: dbCollectionMock.is_approved,
     minters: [],
     managers: [],
-    reviewedAt: collectionAttributesMock.reviewed_at!.toISOString(),
-    updatedAt: collectionAttributesMock.updated_at.toISOString(),
-    createdAt: collectionAttributesMock.created_at.toISOString(),
+    reviewedAt: toUnixTimestamp(dbCollectionMock.reviewed_at!),
+    updatedAt: toUnixTimestamp(dbCollectionMock.updated_at),
+    createdAt: toUnixTimestamp(dbCollectionMock.created_at),
   },
   metadata: {},
   contentHash: '',
 }
 
+export const thirdPartyItemFragmentMock: ThirdPartyItemFragment = {
+  urn: buildTPItemURN(
+    dbTPCollectionMock.third_party_id,
+    dbTPCollectionMock.urn_suffix,
+    dbTPItemMock.urn_suffix
+  ),
+  blockchainItemId: '1',
+  contentHash: '',
+  isApproved: true,
+  metadata: {
+    type: ThirdPartyItemMetadataType.third_party_v1,
+    itemWearable: {
+      name: 'Fragment Name',
+      description: null,
+      category: null,
+      bodyShapes: null,
+    },
+  },
+  thirdParty: {
+    id: dbTPCollectionMock.third_party_id,
+  },
+  reviewedAt: toUnixTimestamp(dbTPCollectionMock.reviewed_at!),
+  updatedAt: toUnixTimestamp(dbTPCollectionMock.updated_at),
+  createdAt: toUnixTimestamp(dbTPCollectionMock.created_at),
+}
+
 export function convertItemDatesToISO<T extends ItemAttributes | FullItem>(
   item: T
 ): Omit<T, 'reviewed_at' | 'created_at' | 'updated_at'> & {

spec/utils.ts

@@ -9,9 +9,8 @@ import { Ownable } from '../src/Ownable/Ownable'
 import { Item } from '../src/Item/Item.model'
 import { thirdPartyAPI } from '../src/ethereum/api/thirdParty'
 import { wallet } from './mocks/wallet'
-import { collectionAttributesMock } from './mocks/collections'
+import { dbCollectionMock } from './mocks/collections'
 import { dbItemMock } from './mocks/items'
-import { ThirdPartyItemsFragment } from '../src/ethereum/api/fragments'
 
 export function buildURL(
   uri: string,
@@ -118,7 +117,7 @@ export function mockCollectionAuthorizationMiddleware(
   isAuthorized = true
 ) {
   const collectionToReturn = {
-    ...collectionAttributesMock,
+    ...dbCollectionMock,
     urn_suffix: isThirdParty ? 'third-party-collection-id' : null,
     third_party_id: isThirdParty ? 'third-party-id' : null,
     eth_address: ethAddress,
@@ -297,8 +296,8 @@ export function mockIsCollectionPublished(
 }
 
 /**
- * Mocks the "fetchThirdPartyCollectionItems" method of the thirdPartyAPI module.
- * This mock requires the thirdPartyAPI.fetchThirdPartyCollectionItems method to be mocked first.
+ * Mocks the "isPublished" method of the thirdPartyAPI module.
+ * This mock requires the thirdPartyAPI.isPublished method to be mocked first.
  *
  * @param thirdPartyId - The third party id to mock the response for.
  * @param collectionUrnSuffix - The collection urn suffix to mock the response for.
@@ -309,13 +308,13 @@ export function mockThirdPartyCollectionWithItems(
   collectionUrnSuffix: string,
   hasItems: boolean
 ): void {
-  if (!(thirdPartyAPI.fetchThirdPartyCollectionItems as jest.Mock).mock) {
+  if (!(thirdPartyAPI.isPublished as jest.Mock).mock) {
     throw new Error(
-      "thirdPartyAPI.fetchThirdPartyCollectionItems should be mocked to mock the fetchThirdPartyCollectionItems method but it isn't"
+      "thirdPartyAPI.isPublished should be mocked to mock the isPublished method but it isn't"
     )
   }
-  ;(thirdPartyAPI.fetchThirdPartyCollectionItems as jest.MockedFunction<
-    typeof thirdPartyAPI.fetchThirdPartyCollectionItems
+  ;(thirdPartyAPI.isPublished as jest.MockedFunction<
+    typeof thirdPartyAPI.isPublished
   >).mockImplementationOnce((tpId, collectionURN) => {
     if (tpId !== thirdPartyId || collectionURN !== collectionUrnSuffix) {
       return Promise.reject(
@@ -324,6 +323,6 @@ export function mockThirdPartyCollectionWithItems(
         )
       )
     }
-    return Promise.resolve(hasItems ? [{} as ThirdPartyItemsFragment] : [])
+    return Promise.resolve(hasItems)
   })
 }

src/Collection/Collection.model.ts

@@ -38,6 +38,7 @@ export class Collection extends Model<CollectionAttributes> {
     SELECT count(*) as count
       FROM ${raw(this.tableName)}
       WHERE id != ${id}
+        AND third_party_id IS NULL
         AND urn_suffix IS NULL
         AND LOWER(name) = ${name.toLowerCase()}`)