fix: data CID is root CID of aggregate, not content CID (#720)

A regression from the DB migration. See definition here: https://github.com/web3-storage/web3.storage/blob/b865bfbf919f084792b49df4e580ec3339e55778/packages/client/src/lib/interface.ts#L202-L205 ...and old definition here: https://github.com/web3-storage/web3.storage/blob/2f9c86a5c33f8f701360c531e2915fe82b9753b1/packages/db/fauna/schema.graphql#L306-L313
web3-storage · Nov 30, 2021 · 8c67725 · 8c67725
1 parent b865bfb
commit 8c67725
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/packages/api/test/mocks/pgrest/post_rpc#find_deals_by_content_cids.js b/packages/api/test/mocks/pgrest/post_rpc#find_deals_by_content_cids.js
@@ -12,6 +12,7 @@ module.exports = ({ body }) => {
         status: 'active',
         pieceCid: 'baga',
         dataCid: 'bafybeifnfkzjeohjf2dch2iqqpef3bfjylwxlcjws2msvdfyze5bvdprfm',
+        batchRootCid: 'bafybeidymjmzqihaz7oeiod3zyolzgcxwbum4b4nvo4aublm6quh6zb3ae',
         dataModelSelector: 'Links/0/Links',
         dealActivation: '<iso timestamp>',
         created: '2021-07-14T19:27:14.934572Z',
@@ -23,6 +24,7 @@ module.exports = ({ body }) => {
         status: 'terminated',
         pieceCid: 'baga',
         dataCid: 'bafybeifnfkzjeohjf2dch2iqqpef3bfjylwxlcjws2msvdfyze5bvdprfm',
+        batchRootCid: 'bafybeidymjmzqihaz7oeiod3zyolzgcxwbum4b4nvo4aublm6quh6zb4ae',
         dataModelSelector: 'Links/0/Links',
         dealActivation: '<iso timestamp>',
         created: '2021-07-14T19:27:14.934572Z',
@@ -34,6 +36,7 @@ module.exports = ({ body }) => {
       status: 'queued',
       pieceCid: 'baga',
       dataCid: 'bafybeica6klnrhlrbx6z24icefykpbwyypouglnypvnwb5esdm6yzcie3q',
+      batchRootCid: 'bafybeidymjmzqihaz7oeiod3zyolzgcxwbum4b4nvo4aublm6quh6zb5ae',
       dataModelSelector: 'Links/0/Links'
     }]
   }

diff --git a/packages/api/test/status.spec.js b/packages/api/test/status.spec.js
@@ -24,7 +24,7 @@ describe('GET /status/:cid', () => {
         storageProvider: 'f99',
         status: 'Active',
         pieceCid: 'baga',
-        dataCid: 'bafybeifnfkzjeohjf2dch2iqqpef3bfjylwxlcjws2msvdfyze5bvdprfm',
+        dataCid: 'bafybeidymjmzqihaz7oeiod3zyolzgcxwbum4b4nvo4aublm6quh6zb3ae',
         dataModelSelector: 'Links/0/Links',
         activation: '<iso timestamp>',
         created: '2021-07-14T19:27:14.934572Z',
@@ -52,7 +52,7 @@ describe('GET /status/:cid', () => {
       deals: [{
         status: 'Queued',
         pieceCid: 'baga',
-        dataCid: 'bafybeica6klnrhlrbx6z24icefykpbwyypouglnypvnwb5esdm6yzcie3q',
+        dataCid: 'bafybeidymjmzqihaz7oeiod3zyolzgcxwbum4b4nvo4aublm6quh6zb5ae',
         dataModelSelector: 'Links/0/Links'
       }]
     })

diff --git a/packages/db/index.js b/packages/db/index.js
@@ -568,7 +568,8 @@ export class DBClient {
 
     const result = {}
     for (const d of normalizeDeals(data)) {
-      const cid = d.dataCid
+      const cid = d.contentCid
+      delete d.contentCid
       if (!Array.isArray(result[cid])) {
         result[cid] = [d]
       } else {

diff --git a/packages/db/utils.js b/packages/db/utils.js
@@ -56,8 +56,11 @@ export function normalizeDeals (deals) {
       dealId: deal.dealId,
       storageProvider: deal.storageProvider,
       status: deal.status[0].toUpperCase() + deal.status.slice(1),
+      // FIXME: should be returned from SQL as contentCid (aggregate.cid_v1)
+      contentCid: deal.dataCid,
       pieceCid: deal.pieceCid,
-      dataCid: deal.dataCid,
+      // FIXME: should be returned from SQL as dataCid (aggregate.aggregate_cid)
+      dataCid: deal.batchRootCid,
       dataModelSelector: deal.dataModelSelector,
       activation: deal.dealActivation,
       expiration: deal.dealExpiration,