feat: implement missing transfer process functionalities (#132)

* feat: implement missing transfer process functionalities * pass @vocab in the request @context
Think-iT-Labs · Oct 24, 2023 · 3b0fbe4 · 3b0fbe4
1 parent 686bdc4
commit 3b0fbe4
Show file tree

Hide file tree

Showing 13 changed files with 242 additions and 164 deletions.
diff --git a/src/controllers/management-controllers/asset-controller.ts b/src/controllers/management-controllers/asset-controller.ts
@@ -6,16 +6,13 @@ import {
   AssetInput,
   IdResponse,
   QuerySpec,
-  EDC_CONTEXT,
+  JSON_LD_DEFAULT_CONTEXT,
 } from "../../entities";
 import { Inner } from "../../inner";
 
 export class AssetController {
   #inner: Inner;
   #context?: EdcConnectorClientContext;
-  defaultContextValues = {
-    edc: EDC_CONTEXT,
-  };
 
   constructor(inner: Inner, context?: EdcConnectorClientContext) {
     this.#inner = inner;
@@ -35,7 +32,7 @@ export class AssetController {
         apiToken: actualContext.apiToken,
         body: {
           ...input,
-          "@context": this.defaultContextValues,
+          "@context": JSON_LD_DEFAULT_CONTEXT,
         },
       })
       .then((body) => expand(body, () => new IdResponse()));
@@ -81,7 +78,7 @@ export class AssetController {
       apiToken: actualContext.apiToken,
       body: {
         ...input,
-        "@context": this.defaultContextValues,
+        "@context": JSON_LD_DEFAULT_CONTEXT,
       },
     });
   }
@@ -102,7 +99,7 @@ export class AssetController {
             ? null
             : {
                 ...query,
-                "@context": this.defaultContextValues,
+                "@context": JSON_LD_DEFAULT_CONTEXT,
               },
       })
       .then((body) => expandArray(body, () => new Asset()));

diff --git a/src/controllers/management-controllers/catalog-controller.ts b/src/controllers/management-controllers/catalog-controller.ts
@@ -1,14 +1,13 @@
 import { EdcConnectorClientContext } from "../../context";
-import { EDC_CONTEXT, CatalogRequest, Catalog, expand, Dataset, DatasetRequest } from "../../entities";
+import {
+  JSON_LD_DEFAULT_CONTEXT, CatalogRequest, Catalog, expand, Dataset, DatasetRequest
+} from "../../entities";
 import { Inner } from "../../inner";
 
 export class CatalogController {
   #inner: Inner;
   #context: EdcConnectorClientContext | undefined;
   protocol: String = "dataspace-protocol-http";
-  defaultContextValues = {
-    edc: EDC_CONTEXT,
-  };
 
   constructor(inner: Inner, context?: EdcConnectorClientContext) {
     this.#inner = inner;
@@ -27,7 +26,7 @@ export class CatalogController {
         method: "POST",
         apiToken: actualContext.apiToken,
         body: {
-          "@context": this.defaultContextValues,
+          "@context": JSON_LD_DEFAULT_CONTEXT,
           protocol: this.protocol,
           ...input,
         },
@@ -47,7 +46,7 @@ export class CatalogController {
         method: "POST",
         apiToken: actualContext.apiToken,
         body: {
-          "@context": this.defaultContextValues,
+          "@context": JSON_LD_DEFAULT_CONTEXT,
           protocol: this.protocol,
           ...input,
         },

diff --git a/src/controllers/management-controllers/contract-agreement-controller.ts b/src/controllers/management-controllers/contract-agreement-controller.ts
@@ -5,16 +5,13 @@ import {
   ContractAgreement,
   ContractNegotiation,
   QuerySpec,
-  EDC_CONTEXT,
+  JSON_LD_DEFAULT_CONTEXT,
 } from "../../entities";
 import { Inner } from "../../inner";
 
 export class ContractAgreementController {
   #inner: Inner;
   #context?: EdcConnectorClientContext;
-  defaultContextValues = {
-    edc: EDC_CONTEXT,
-  };
 
   constructor(inner: Inner, context?: EdcConnectorClientContext) {
     this.#inner = inner;
@@ -37,7 +34,7 @@ export class ContractAgreementController {
             ? null
             : {
                 ...query,
-                "@context": this.defaultContextValues,
+                "@context": JSON_LD_DEFAULT_CONTEXT,
               },
       })
       .then((body) => expandArray(body, () => new ContractAgreement()));

diff --git a/src/controllers/management-controllers/contract-defintion-controller.ts b/src/controllers/management-controllers/contract-defintion-controller.ts
@@ -6,16 +6,13 @@ import {
   ContractDefinitionInput,
   IdResponse,
   QuerySpec,
-  EDC_CONTEXT,
+  JSON_LD_DEFAULT_CONTEXT,
 } from "../../entities";
 import { Inner } from "../../inner";
 
 export class ContractDefinitionController {
   #inner: Inner;
   #context?: EdcConnectorClientContext;
-  defaultContextValues = {
-    edc: EDC_CONTEXT,
-  };
 
   constructor(inner: Inner, context?: EdcConnectorClientContext) {
     this.#inner = inner;
@@ -35,7 +32,7 @@ export class ContractDefinitionController {
         apiToken: actualContext.apiToken,
         body: {
           ...input,
-          "@context": this.defaultContextValues,
+          "@context": JSON_LD_DEFAULT_CONTEXT,
         },
       })
       .then((body) => expand(body, () => new IdResponse()));
@@ -84,7 +81,7 @@ export class ContractDefinitionController {
             ? null
             : {
                 ...query,
-                "@context": this.defaultContextValues,
+                "@context": JSON_LD_DEFAULT_CONTEXT,
               },
       })
       .then((body) => expandArray(body, () => new ContractDefinition()));
@@ -102,7 +99,7 @@ export class ContractDefinitionController {
       apiToken: actualContext.apiToken,
       body: {
         ...input,
-        "@context": this.defaultContextValues,
+        "@context": JSON_LD_DEFAULT_CONTEXT,
       },
     });
   }

diff --git a/src/controllers/management-controllers/contract-negotiation-controller.ts b/src/controllers/management-controllers/contract-negotiation-controller.ts
@@ -8,17 +8,14 @@ import {
   ContractNegotiationState,
   IdResponse,
   QuerySpec,
-  EDC_CONTEXT,
+  JSON_LD_DEFAULT_CONTEXT,
 } from "../../entities";
 import { Inner } from "../../inner";
 
 export class ContractNegotiationController {
   #inner: Inner;
   #context?: EdcConnectorClientContext;
   protocol: String = "dataspace-protocol-http";
-  defaultContextValues = {
-    edc: EDC_CONTEXT,
-  };
 
   constructor(inner: Inner, context?: EdcConnectorClientContext) {
     this.#inner = inner;
@@ -38,7 +35,7 @@ export class ContractNegotiationController {
         apiToken: actualContext.apiToken,
         body: {
           protocol: this.protocol,
-          "@context": this.defaultContextValues,
+          "@context": JSON_LD_DEFAULT_CONTEXT,
           ...input,
         },
       })
@@ -61,7 +58,7 @@ export class ContractNegotiationController {
             ? null
             : {
                 ...query,
-                "@context": this.defaultContextValues,
+                "@context": JSON_LD_DEFAULT_CONTEXT,
               },
       })
       .then((body) => expandArray(body, () => new ContractNegotiation()));
@@ -111,7 +108,7 @@ export class ContractNegotiationController {
       body: {
         reason: reason,
         "@id": negotiationId,
-        "@context": this.defaultContextValues,
+        "@context": JSON_LD_DEFAULT_CONTEXT,
       },
     });
   }
@@ -121,7 +118,7 @@ export class ContractNegotiationController {
     context?: EdcConnectorClientContext,
   ): Promise<ContractAgreement> {
     const actualContext = context || this.#context!;
-    
+
     return this.#inner
       .request(actualContext.management, {
         path: `/v2/contractnegotiations/${negotiationId}/agreement`,

diff --git a/src/controllers/management-controllers/dataplane-controller.ts b/src/controllers/management-controllers/dataplane-controller.ts
@@ -6,16 +6,13 @@ import {
   DataplaneInput,
   DataplaceSelectInput,
   IdResponse,
-  EDC_CONTEXT,
+  JSON_LD_DEFAULT_CONTEXT,
 } from "../../entities";
 import { Inner } from "../../inner";
 
 export class DataplaneController {
   #inner: Inner;
   #context?: EdcConnectorClientContext;
-  defaultContextValues = {
-    edc: EDC_CONTEXT,
-  };
 
   constructor(inner: Inner, context?: EdcConnectorClientContext) {
     this.#inner = inner;
@@ -34,7 +31,7 @@ export class DataplaneController {
       apiToken: actualContext.apiToken,
       body: {
         ...input,
-        "@context": this.defaultContextValues,
+        "@context": JSON_LD_DEFAULT_CONTEXT,
       },
     })
     .then((body) => expand(body, () => new IdResponse()));
@@ -64,7 +61,7 @@ export class DataplaneController {
       apiToken: actualContext.apiToken,
       body: {
         ...input,
-        "@context": this.defaultContextValues,
+        "@context": JSON_LD_DEFAULT_CONTEXT,
       },
     })
     .then((body) => expand(body, () => new Dataplane()));

diff --git a/src/controllers/management-controllers/policy-defintion-controller.ts b/src/controllers/management-controllers/policy-defintion-controller.ts
@@ -6,16 +6,13 @@ import {
   PolicyDefinition,
   PolicyDefinitionInput,
   QuerySpec,
-  EDC_CONTEXT,
+  JSON_LD_DEFAULT_CONTEXT,
 } from "../../entities";
 import { Inner } from "../../inner";
 
 export class PolicyDefinitionController {
   #inner: Inner;
   #context?: EdcConnectorClientContext;
-  defaultContextValues = {
-    edc: EDC_CONTEXT,
-  };
 
   constructor(inner: Inner, context?: EdcConnectorClientContext) {
     this.#inner = inner;
@@ -35,7 +32,7 @@ export class PolicyDefinitionController {
         apiToken: actualContext.apiToken,
         body: {
           ...input,
-          "@context": this.defaultContextValues,
+          "@context": JSON_LD_DEFAULT_CONTEXT,
         },
       })
       .then((body) => expand(body, () => new IdResponse()));
@@ -55,7 +52,7 @@ export class PolicyDefinitionController {
         apiToken: actualContext.apiToken,
         body: {
           ...input,
-          "@context": this.defaultContextValues,
+          "@context": JSON_LD_DEFAULT_CONTEXT,
         },
       })
   }
@@ -104,7 +101,7 @@ export class PolicyDefinitionController {
             ? null
             : {
                 ...query,
-                "@context": this.defaultContextValues,
+                "@context": JSON_LD_DEFAULT_CONTEXT,
               },
       })
       .then((body) => expandArray(body, () => new PolicyDefinition()));