feat: merge with master

src/Collection/Collection.router.spec.ts

@@ -1325,7 +1325,7 @@ describe('Collection router', () => {
       describe('when the collection already has a pending ItemCuration', () => {
         beforeEach(() => {
           ;(Item.findByIds as jest.Mock).mockResolvedValueOnce([dbItemMock])
-          ;(ItemCuration.findLastByCollectionId as jest.Mock).mockResolvedValueOnce(
+          ;(ItemCuration.findLastCreatedByCollectionIdAndStatus as jest.Mock).mockResolvedValueOnce(
             itemCurationMock
           )
           jest.spyOn(ethers.utils, 'verifyMessage').mockReturnValue('0x')

src/Collection/Collection.service.ts

@@ -130,8 +130,8 @@ export class CollectionService {
   }
 
   /**
-   * It should receive the list of items to be operated on so it can decide where it should create or update the curations for them accordingly
-   * It will also receive a signed message and its signature, so it can check and store it in the SlotUsageCheque
+   * Publishes a TP collection by storing the slots cheque and creating the curations for the items to be published.
+   * It creates or updates the virtual CollectionCuration for the items
    * @param dbCollection - Database TP collection
    * @param dbItems - Database TP items that belong to the collection
    * @param signedMessage - The message we signed
@@ -151,10 +151,10 @@ export class CollectionService {
     // That will fire a /collections/${collectionId}/curation which will create a new CollectionCuration
     // Subsequent changes will not show the push changes button, as it's already under_review
 
-    // For TP items, creations always exist. PUSH CHANGES should appear if the item has an approved ItemCuration and has changes in the Catalyst
+    // For TP items, curations always exist. PUSH CHANGES should appear if the item has an approved ItemCuration and has changes in the Catalyst
     // That should fire /items/:id/curation for each item that changed
 
-    // What we should migrate over here is the creation of the virtual CollectionCuration, as there'll always be a publish before a PUSH CHANGES
+    // There'll always be a publish before a PUSH CHANGES, so this method also creates or updates the virtual CollectionCuration for the items
 
     if (dbItems.length === 0) {
       throw new InvalidRequestError('Tried to publish no TP items')
@@ -178,7 +178,10 @@ export class CollectionService {
       )
     }
 
-    const isPublished = await ItemCuration.findLastByCollectionId(collectionId)
+    const isPublished = await ItemCuration.findLastCreatedByCollectionIdAndStatus(
+      collectionId,
+      CurationStatus.PENDING
+    )
     if (isPublished) {
       throw new AlreadyPublishedCollectionError(
         collectionId,

src/Curation/CollectionCuration/CollectionCuration.model.ts

@@ -10,7 +10,7 @@ export class CollectionCuration extends Model<CollectionCurationAttributes> {
   static async updateByItemId(itemId: string): Promise<{ rowCount: number }> {
     const columns = await this.query(SQL`
       UPDATE ${raw(CollectionCuration.tableName)} as collection_curations
-      SET updated_at = now()
+      SET updated_at = ${new Date()}
       FROM ${raw(Item.tableName)} as items
       WHERE collection_curations.collection_id = items.collection_id
         AND items.id = ${itemId}`)

src/Curation/ItemCuration/ItemCuration.model.ts

@@ -1,7 +1,7 @@
 import { Model, raw, SQL } from 'decentraland-server'
 import { Collection } from '../../Collection'
 import { Item } from '../../Item'
-import { CurationType } from '../Curation.types'
+import { CurationStatus, CurationType } from '../Curation.types'
 import { ItemCurationAttributes } from './ItemCuration.types'
 
 export class ItemCuration extends Model<ItemCurationAttributes> {
@@ -44,7 +44,23 @@ export class ItemCuration extends Model<ItemCurationAttributes> {
     return itemCurations[0]
   }
 
-  static async getItemCurationCountByThirdPartyId(thirdPartyId: string) {
+  static async findLastCreatedByCollectionIdAndStatus(
+    collectionId: string,
+    curationStatus: CurationStatus
+  ): Promise<ItemCurationAttributes | undefined> {
+    const itemCurations = await this.query<ItemCurationAttributes>(SQL`
+    SELECT item_curations.*
+      FROM ${raw(this.tableName)} item_curations
+      JOIN ${raw(Item.tableName)} items ON items.id = item_curations.item_id
+      WHERE items.collection_id = ${collectionId}
+        AND items.status = ${curationStatus}
+      ORDER BY item_curations.created_at DESC
+      LIMIT 1`)
+
+    return itemCurations[0]
+  }
+
+  static async getCountByThirdPartyId(thirdPartyId: string) {
     const counts = await this.query<{ count: number }>(
       SQL`SELECT COUNT(DISTINCT item_curations.id) AS Count
         FROM ${raw(ItemCuration.tableName)} AS item_curations

src/ThirdParty/ThirdParty.router.spec.ts

@@ -108,7 +108,7 @@ describe('ThirdParty router', () => {
         maxSlots
       )
       ;(thirdPartyAPI.isManager as jest.Mock).mockResolvedValueOnce(true)
-      ;(ItemCuration.getItemCurationCountByThirdPartyId as jest.Mock).mockResolvedValueOnce(
+      ;(ItemCuration.getCountByThirdPartyId as jest.Mock).mockResolvedValueOnce(
         itemsInCuration
       )
       url = '/thirdParties/aThirdPartyId/slots'

src/ThirdParty/ThirdParty.service.ts

@@ -8,7 +8,7 @@ export class ThirdPartyService {
   ): Promise<number> {
     const [maxItems, itemCurationsCount] = await Promise.all([
       thirdPartyAPI.fetchMaxItemsByThirdParty(thirdPartyId),
-      ItemCuration.getItemCurationCountByThirdPartyId(thirdPartyId),
+      ItemCuration.getCountByThirdPartyId(thirdPartyId),
     ])
     return maxItems - itemCurationsCount
   }