Issue 501 - C2D getJobStatus - did vs documentId vs agreementId

src/@types/commands.ts

@@ -181,8 +181,8 @@ export interface ComputeGetResultCommand extends Command {
 
 export interface ComputeGetStatusCommand extends Command {
   consumerAddress?: string
-  did?: string
   jobId?: string
+  agreementId?: string
 }
 
 export interface ValidateChainId {

src/components/core/compute/getStatus.ts

@@ -21,8 +21,8 @@ export class ComputeGetStatusHandler extends Handler {
         return buildInvalidRequestMessage(
           'Parameter : "consumerAddress" is not a valid web3 address'
         )
-      } else if (!command.consumerAddress && !command.jobId && !command.did) {
-        const error = 'Missing jobId or consumerAddress or did'
+      } else if (!command.consumerAddress && !command.jobId && !command.agreementId) {
+        const error = 'Missing one of ["jobId","consumerAddress","agreementId"]'
         CORE_LOGGER.logMessage(error, true)
         return buildInvalidRequestMessage(error)
       }
@@ -50,11 +50,12 @@ export class ComputeGetStatusHandler extends Handler {
         allC2dClusters = allC2dClusters.filter((arr) => arr.hash === hash)
         jobId = task.jobId.slice(index + 1)
       }
+
       for (const cluster of allC2dClusters) {
         const engine = await C2DEngine.getC2DByHash(cluster.hash)
         const jobs = await engine.getComputeJobStatus(
           task.consumerAddress,
-          task.did,
+          task.agreementId,
           jobId
         )
         response.push(...jobs)

src/components/httpRoutes/compute.ts

@@ -151,8 +151,8 @@ computeRoutes.get(`${SERVICES_API_BASE_PATH}/compute`, async (req, res) => {
       command: PROTOCOL_COMMANDS.COMPUTE_GET_STATUS,
       node: (req.query.node as string) || null,
       consumerAddress: (req.query.consumerAddress as string) || null,
-      did: (req.query.did as string) || null,
-      jobId: (req.query.jobId as string) || null
+      jobId: (req.query.jobId as string) || null,
+      agreementId: (req.query.agreementId as string) || null
     }
     const response = await new ComputeGetStatusHandler(req.oceanNode).handle(
       statusComputeTask

src/test/integration/compute.test.ts

@@ -613,7 +613,7 @@ describe('Compute', () => {
     const statusComputeTask: ComputeGetStatusCommand = {
       command: PROTOCOL_COMMANDS.COMPUTE_GET_STATUS,
       consumerAddress: null,
-      did: null,
+      agreementId: null,
       jobId
     }
     const response = await new ComputeGetStatusHandler(oceanNode).handle(
@@ -631,7 +631,7 @@ describe('Compute', () => {
     const statusComputeTask: ComputeGetStatusCommand = {
       command: PROTOCOL_COMMANDS.COMPUTE_GET_STATUS,
       consumerAddress: wallet.address,
-      did: null,
+      agreementId: null,
       jobId: null
     }
     const response = await new ComputeGetStatusHandler(oceanNode).handle(