Remove collection util file to only have utils file

src/Collection/util.spec.ts → src/Collection/utils.spec.ts

@@ -1,7 +1,7 @@
 import { Collection } from '.'
 import { Bridge } from '../ethereum/api/Bridge'
 import { collectionAPI } from '../ethereum/api/collection'
-import { getMergedCollection } from './util'
+import { getMergedCollection } from './utils'
 
 describe('getMergedCollection', () => {
   let sampleCollection: { id: string }

src/Collection/utils.ts

@@ -1,6 +1,9 @@
 import { utils } from 'decentraland-commons'
 import { getCurrentNetworkURNProtocol } from '../ethereum/utils'
-import { CollectionAttributes, FullCollection } from './Collection.types'
+import { Collection, CollectionAttributes, FullCollection } from '.'
+import { Bridge } from '../ethereum/api/Bridge'
+import { collectionAPI } from '../ethereum/api/collection'
+import { CollectionFragment } from '../ethereum/api/fragments'
 
 export function getDecentralandCollectionURN(
   collectionAddress: string
@@ -25,3 +28,67 @@ export function toDBCollection(
     urn_suffix: null,
   }
 }
+
+type GetMergedCollectionResult =
+  | { status: 'not_found'; collection: undefined }
+  | { status: 'incomplete' | 'complete'; collection: CollectionAttributes }
+
+/**
+ * Will return a collection formed by merging the collection present in
+ * the database and the one found in the graph.
+ *
+ * The result will depend according to the availability of those collections.
+ *
+ * When the collection does not exist on the database:
+ * status = not_found
+ *
+ * When the collection does not exist on the graph:
+ * status = incomplete & collection = database collection
+ *
+ * When both collections are available:
+ * status = complete & collection = merged db and graph collection
+ */
+export const getMergedCollection = async (
+  id: string
+): Promise<GetMergedCollectionResult> => {
+  const dbCollection = await getDBCollection(id)
+
+  if (!dbCollection) {
+    return {
+      status: 'not_found',
+      collection: undefined,
+    }
+  }
+
+  const remoteCollection = await getRemoteCollection(
+    dbCollection.contract_address
+  )
+
+  if (!remoteCollection) {
+    return {
+      status: 'incomplete',
+      collection: dbCollection,
+    }
+  }
+
+  const mergedCollection = mergeCollections(dbCollection, remoteCollection)
+
+  return {
+    status: 'complete',
+    collection: mergedCollection,
+  }
+}
+
+export const getDBCollection = (id: string) =>
+  Collection.findOne<CollectionAttributes>(id)
+
+export const getRemoteCollection = async (contractAddress: string) =>
+  (await collectionAPI.fetchCollection(contractAddress)) || undefined
+
+export const getRemoteCollections = async () =>
+  await collectionAPI.fetchCollections()
+
+export const mergeCollections = (
+  db: CollectionAttributes,
+  remote: CollectionFragment
+) => Bridge.mergeCollection(db, remote)

src/Curation/Curation.router.spec.ts

@@ -2,14 +2,14 @@ import { Curation, CurationRouter } from '.'
 import { ExpressApp } from '../common/ExpressApp'
 import { isCommitteeMember } from '../Committee'
 import { hasAccessToCollection } from './access'
-import { getMergedCollection } from '../Collection/util'
+import { getMergedCollection } from '../Collection/utils'
 import { collectionAPI } from '../ethereum/api/collection'
 import { Collection } from '../Collection'
 
 jest.mock('../common/Router')
 jest.mock('../common/ExpressApp')
 jest.mock('../Committee')
-jest.mock('../Collection/util')
+jest.mock('../Collection/utils')
 jest.mock('./access')
 
 const mockIsComiteeMember = isCommitteeMember as jest.Mock

src/Curation/Curation.router.ts

@@ -5,7 +5,7 @@ import { HTTPError, STATUS_CODES } from '../common/HTTPError'
 import { withAuthentication, AuthRequest } from '../middleware'
 import { Curation, patchCurationSchema } from '.'
 import { hasAccessToCollection } from './access'
-import { getMergedCollection } from '../Collection/util'
+import { getMergedCollection } from '../Collection/utils'
 import { isCommitteeMember } from '../Committee'
 import { collectionAPI } from '../ethereum/api/collection'
 import { Collection } from '../Collection'

src/Curation/access.spec.ts

@@ -1,10 +1,10 @@
-import { getMergedCollection } from '../Collection/util'
+import { getMergedCollection } from '../Collection/utils'
 import { isCommitteeMember } from '../Committee'
 import { Ownable } from '../Ownable'
 import { hasAccessToCollection } from './access'
 
 jest.mock('../Committee')
-jest.mock('../Collection/util')
+jest.mock('../Collection/utils')
 
 const mockIsCommitteeMember = isCommitteeMember as jest.Mock
 const isOwnedBySpy = jest.spyOn(Ownable.prototype, 'isOwnedBy')

src/Curation/access.ts

@@ -1,7 +1,7 @@
 import { isCommitteeMember } from '../Committee'
 import { Ownable } from '../Ownable'
 import { Collection, CollectionAttributes } from '../Collection'
-import { getMergedCollection } from '../Collection/util'
+import { getMergedCollection } from '../Collection/utils'
 
 export async function hasAccessToCollection(
   ethAddress: string,