Merge pull request #33 from Mavennet/vc-referencing

replace product obj with hash link in creation, transformation, trans…

lib/events/dto/createProduct/create.dto.d.ts

@@ -25,6 +25,7 @@ export declare class AGENT_CreateProductDTO extends CreateProductDTOBase {
 export declare class CORE_CreateProductDTO extends CreateProductDTOBase {
     productId: string;
     productVC: ProductVCDTO;
+    productVCHash: string;
     eventId: string;
     eventVC: CreationEventDetailsDTO;
 }

lib/events/dto/createProduct/create.dto.js

@@ -126,6 +126,12 @@ __decorate([
     (0, class_transformer_1.Type)(() => products_1.ProductVCDTO),
     __metadata("design:type", products_1.ProductVCDTO)
 ], CORE_CreateProductDTO.prototype, "productVC", void 0);
+__decorate([
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, swagger_1.ApiProperty)(),
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], CORE_CreateProductDTO.prototype, "productVCHash", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
     (0, swagger_1.ApiProperty)(),

lib/events/dto/createProduct/event.credentialSubject.d.ts

@@ -1,11 +1,10 @@
 import { PlaceDTO, OrganizationDTO } from '../../../general';
-import { ProductDTO } from '../../../products';
 import { EVENT_TYPE } from '../../../events';
 export declare class AGENT_CreationEventCredentialSubjectDTO {
     eventType: EVENT_TYPE;
     place: PlaceDTO;
     actor: OrganizationDTO[];
-    products: ProductDTO[];
+    products: string[];
 }
 export declare class CORE_CreationEventCredentialSubjectDTO extends AGENT_CreationEventCredentialSubjectDTO {
     eventId: string;

lib/events/dto/createProduct/event.credentialSubject.js

@@ -13,7 +13,6 @@ exports.CORE_CreationEventCredentialSubjectDTO = exports.AGENT_CreationEventCred
 const class_validator_1 = require("class-validator");
 const class_transformer_1 = require("class-transformer");
 const general_1 = require("../../../general");
-const products_1 = require("../../../products");
 const swagger_1 = require("@nestjs/swagger");
 const events_1 = require("../../../events");
 class AGENT_CreationEventCredentialSubjectDTO {
@@ -43,8 +42,7 @@ __decorate([
     (0, swagger_1.ApiProperty)(),
     (0, class_validator_1.IsArray)(),
     (0, class_validator_1.ArrayMinSize)(1),
-    (0, class_validator_1.ValidateNested)({ each: true }),
-    (0, class_transformer_1.Type)(() => products_1.ProductDTO),
+    (0, class_validator_1.IsUrl)({ each: true }),
     __metadata("design:type", Array)
 ], AGENT_CreationEventCredentialSubjectDTO.prototype, "products", void 0);
 exports.AGENT_CreationEventCredentialSubjectDTO = AGENT_CreationEventCredentialSubjectDTO;

lib/events/dto/transfer/event.credentialSubject.dto.d.ts

@@ -1,9 +1,8 @@
 import { TRANSFER_EVENT_TYPE } from '../../constants';
 import { PlaceDTO, OrganizationDTO } from '../../../general';
-import { ProductDTO } from '../../../products';
 export declare class AGENT_TransferEventCredentialSubjectDTO {
     place: PlaceDTO;
-    products: ProductDTO[];
+    products: string[];
     actor: OrganizationDTO[];
     initiator: string;
     receiver: string;

lib/events/dto/transfer/event.credentialSubject.dto.js

@@ -14,7 +14,6 @@ const class_validator_1 = require("class-validator");
 const class_transformer_1 = require("class-transformer");
 const constants_1 = require("../../constants");
 const general_1 = require("../../../general");
-const products_1 = require("../../../products");
 class AGENT_TransferEventCredentialSubjectDTO {
 }
 __decorate([
@@ -26,8 +25,7 @@ __decorate([
 __decorate([
     (0, class_validator_1.IsArray)(),
     (0, class_validator_1.ArrayMinSize)(1),
-    (0, class_validator_1.ValidateNested)({ each: true }),
-    (0, class_transformer_1.Type)(() => products_1.ProductDTO),
+    (0, class_validator_1.IsUrl)({ each: true }),
     __metadata("design:type", Array)
 ], AGENT_TransferEventCredentialSubjectDTO.prototype, "products", void 0);
 __decorate([

lib/events/dto/transfer/transfer.dto.d.ts

@@ -1,6 +1,5 @@
 import { PlaceDTO, OrganizationDTO } from '../../../general';
 import { CORE_TransferEventDetailsDTO } from './event.vc.dto';
-import { ProductDTO } from '../../../products';
 export declare class CORE_TransferProductDTO {
     requestId: number;
     productId: string;
@@ -10,6 +9,7 @@ export declare class CORE_TransferProductDTO {
 export declare class AGENT_TransferProductDTO {
     requestId: number;
     productId: string;
+    productVCHash: string;
     place: PlaceDTO;
     portOfEntry?: PlaceDTO;
     portOfArrival?: PlaceDTO;
@@ -18,6 +18,5 @@ export declare class AGENT_TransferProductDTO {
     receiptLocation?: PlaceDTO;
     receiver: string;
     price: string;
-    products: ProductDTO[];
     actor: OrganizationDTO[];
 }

lib/events/dto/transfer/transfer.dto.js

@@ -15,7 +15,6 @@ const swagger_1 = require("@nestjs/swagger");
 const general_1 = require("../../../general");
 const class_transformer_1 = require("class-transformer");
 const event_vc_dto_1 = require("./event.vc.dto");
-const products_1 = require("../../../products");
 class CORE_TransferProductDTO {
 }
 __decorate([
@@ -58,6 +57,12 @@ __decorate([
     (0, class_validator_1.IsUUID)(),
     __metadata("design:type", String)
 ], AGENT_TransferProductDTO.prototype, "productId", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)(),
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], AGENT_TransferProductDTO.prototype, "productVCHash", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)(),
     (0, class_validator_1.IsNotEmptyObject)(),
@@ -111,13 +116,6 @@ __decorate([
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], AGENT_TransferProductDTO.prototype, "price", void 0);
-__decorate([
-    (0, class_validator_1.IsArray)(),
-    (0, class_validator_1.ArrayMinSize)(1),
-    (0, class_validator_1.ValidateNested)({ each: true }),
-    (0, class_transformer_1.Type)(() => products_1.ProductDTO),
-    __metadata("design:type", Array)
-], AGENT_TransferProductDTO.prototype, "products", void 0);
 __decorate([
     (0, class_validator_1.IsArray)(),
     (0, class_validator_1.ArrayMinSize)(1),

lib/events/dto/transform/event.credentialSubject.dto.d.ts

@@ -1,6 +1,5 @@
 import { PlaceDTO, OrganizationDTO } from '../../../general';
 import { TRANSFORMATION_EVENT_TYPE } from '../../constants/transformationEventType';
-import { ProductDTO } from '../../../products';
 export declare class AGENT_TransformationEventCredentialSubjectDTO {
     eventType: TRANSFORMATION_EVENT_TYPE;
     place: PlaceDTO;
@@ -9,7 +8,6 @@ export declare class AGENT_TransformationEventCredentialSubjectDTO {
 export declare class CORE_TransformationEventCredentialSubjectDTO extends AGENT_TransformationEventCredentialSubjectDTO {
     eventId: string;
     eventTime: string;
-    products: ProductDTO[];
+    products: string[];
     consumedProducts: string[];
-    newProducts: string[];
 }

lib/events/dto/transform/event.credentialSubject.dto.js

@@ -15,7 +15,6 @@ const class_transformer_1 = require("class-transformer");
 const general_1 = require("../../../general");
 const transformationEventType_1 = require("../../constants/transformationEventType");
 const swagger_1 = require("@nestjs/swagger");
-const products_1 = require("../../../products");
 class AGENT_TransformationEventCredentialSubjectDTO {
 }
 __decorate([
@@ -57,18 +56,12 @@ __decorate([
     (0, swagger_1.ApiProperty)(),
     (0, class_validator_1.IsArray)(),
     (0, class_validator_1.ArrayMinSize)(1),
-    (0, class_validator_1.ValidateNested)({ each: true }),
-    (0, class_transformer_1.Type)(() => products_1.ProductDTO),
+    (0, class_validator_1.IsUrl)({ each: true }),
     __metadata("design:type", Array)
 ], CORE_TransformationEventCredentialSubjectDTO.prototype, "products", void 0);
 __decorate([
     (0, class_validator_1.IsArray)(),
     (0, class_validator_1.ArrayMinSize)(1),
     __metadata("design:type", Array)
 ], CORE_TransformationEventCredentialSubjectDTO.prototype, "consumedProducts", void 0);
-__decorate([
-    (0, class_validator_1.IsArray)(),
-    (0, class_validator_1.ArrayMinSize)(1),
-    __metadata("design:type", Array)
-], CORE_TransformationEventCredentialSubjectDTO.prototype, "newProducts", void 0);
 exports.CORE_TransformationEventCredentialSubjectDTO = CORE_TransformationEventCredentialSubjectDTO;

lib/events/dto/transform/transform.dto.d.ts

@@ -2,7 +2,8 @@ import { TransformProductSuccessorDTO } from './transformProductSuccessor.dto';
 import { AGENT_TransformationEventCredentialSubjectDTO } from './event.credentialSubject.dto';
 import { AGENT_COMPACT_CreateProductDTO } from '../createProduct';
 import { CORE_TransformationEventDetailsDTO } from './event.vc.dto';
-import { ProductCredentialSubjectDTO, ProductDTO } from '../../../products';
+import { ProductCredentialSubjectDTO } from '../../../products';
+import { ProductHashDTO } from '../../../general';
 export declare class AGENT_COMPACT_TransformProductDTO {
     newProducts: AGENT_COMPACT_CreateProductDTO[];
     sku?: string;
@@ -13,7 +14,7 @@ export declare class CORE_TransformProductsDTO {
     successors: TransformProductSuccessorDTO[];
 }
 export declare class AGENT_TransformProductsDTO {
-    consumedProducts: ProductDTO[];
+    consumedProducts: ProductHashDTO[];
     newProducts: ProductCredentialSubjectDTO[];
     eventCredentialSubject: AGENT_TransformationEventCredentialSubjectDTO;
 }

lib/events/dto/transform/transform.dto.js

@@ -18,6 +18,7 @@ const event_credentialSubject_dto_1 = require("./event.credentialSubject.dto");
 const createProduct_1 = require("../createProduct");
 const event_vc_dto_1 = require("./event.vc.dto");
 const products_1 = require("../../../products");
+const general_1 = require("../../../general");
 class AGENT_COMPACT_TransformProductDTO {
 }
 __decorate([
@@ -65,7 +66,7 @@ __decorate([
     (0, class_validator_1.IsArray)(),
     (0, class_validator_1.ArrayMinSize)(1),
     (0, class_validator_1.ValidateNested)({ each: true }),
-    (0, class_transformer_1.Type)(() => products_1.ProductDTO),
+    (0, class_transformer_1.Type)(() => general_1.ProductHashDTO),
     __metadata("design:type", Array)
 ], AGENT_TransformProductsDTO.prototype, "consumedProducts", void 0);
 __decorate([

lib/events/dto/transform/transformProductSuccessor.dto.d.ts

@@ -2,4 +2,5 @@ import { ProductVCDTO } from '../../../products/dto/product.vc.dto';
 export declare class TransformProductSuccessorDTO {
     productId: string;
     productVC: ProductVCDTO;
+    productVCHash: string;
 }

lib/events/dto/transform/transformProductSuccessor.dto.js

@@ -26,4 +26,9 @@ __decorate([
     (0, class_transformer_1.Type)(() => product_vc_dto_1.ProductVCDTO),
     __metadata("design:type", product_vc_dto_1.ProductVCDTO)
 ], TransformProductSuccessorDTO.prototype, "productVC", void 0);
+__decorate([
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], TransformProductSuccessorDTO.prototype, "productVCHash", void 0);
 exports.TransformProductSuccessorDTO = TransformProductSuccessorDTO;

lib/events/dto/transport/event.credentialSubject.dto.d.ts

@@ -1,6 +1,10 @@
-import { EventDTO } from '../../../general';
+import { EventDTO, ProductHashDTO, PlaceDTO, OrganizationDTO } from '../../../general';
 import { TRANSPORTATION_TYPE, TRANSPORT_EVENT_TYPE } from '../../constants';
 export declare class AGENT_TransportationEventCredentialSubjectDTO {
+    eventType: TRANSPORT_EVENT_TYPE;
+    place: PlaceDTO;
+    actor: OrganizationDTO[];
+    products: ProductHashDTO[];
     deliveryMethod: TRANSPORTATION_TYPE;
     trackingNumber: string;
     scn: string;

lib/events/dto/transport/event.credentialSubject.dto.js

@@ -11,11 +11,37 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CORE_TransportationEventCredentialSubjectDTO = exports.AGENT_TransportationEventCredentialSubjectDTO = void 0;
 const class_validator_1 = require("class-validator");
+const class_transformer_1 = require("class-transformer");
 const general_1 = require("../../../general");
 const constants_1 = require("../../constants");
 const constants_2 = require("../../../products/constants");
 class AGENT_TransportationEventCredentialSubjectDTO {
 }
+__decorate([
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsEnum)(constants_1.TRANSPORT_EVENT_TYPE),
+    __metadata("design:type", String)
+], AGENT_TransportationEventCredentialSubjectDTO.prototype, "eventType", void 0);
+__decorate([
+    (0, class_validator_1.IsNotEmptyObject)(),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => general_1.PlaceDTO),
+    __metadata("design:type", general_1.PlaceDTO)
+], AGENT_TransportationEventCredentialSubjectDTO.prototype, "place", void 0);
+__decorate([
+    (0, class_validator_1.IsArray)(),
+    (0, class_validator_1.ArrayMinSize)(1),
+    (0, class_validator_1.ValidateNested)({ each: true }),
+    (0, class_transformer_1.Type)(() => general_1.OrganizationDTO),
+    __metadata("design:type", Array)
+], AGENT_TransportationEventCredentialSubjectDTO.prototype, "actor", void 0);
+__decorate([
+    (0, class_validator_1.IsArray)(),
+    (0, class_validator_1.ArrayMinSize)(1),
+    (0, class_validator_1.ValidateNested)({ each: true }),
+    (0, class_transformer_1.Type)(() => general_1.ProductHashDTO),
+    __metadata("design:type", Array)
+], AGENT_TransportationEventCredentialSubjectDTO.prototype, "products", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
     (0, class_validator_1.IsEnum)(constants_1.TRANSPORTATION_TYPE),

lib/general/dto/index.d.ts

@@ -11,5 +11,6 @@ export * from './parcelDelivery.dto';
 export * from './physicalSpecs.dto';
 export * from './place.dto';
 export * from './postalAddress.dto';
+export * from './productHash.dto';
 export * from './property.dto';
 export * from './proof.dto';

lib/general/dto/index.js

@@ -27,5 +27,6 @@ __exportStar(require("./parcelDelivery.dto"), exports);
 __exportStar(require("./physicalSpecs.dto"), exports);
 __exportStar(require("./place.dto"), exports);
 __exportStar(require("./postalAddress.dto"), exports);
+__exportStar(require("./productHash.dto"), exports);
 __exportStar(require("./property.dto"), exports);
 __exportStar(require("./proof.dto"), exports);

lib/general/dto/productHash.dto.d.ts

@@ -0,0 +1,4 @@
+export declare class ProductHashDTO {
+    productId: string;
+    productVCHash: string;
+}

lib/general/dto/productHash.dto.js

@@ -0,0 +1,26 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProductHashDTO = void 0;
+const class_validator_1 = require("class-validator");
+class ProductHashDTO {
+}
+__decorate([
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsUUID)(),
+    __metadata("design:type", String)
+], ProductHashDTO.prototype, "productId", void 0);
+__decorate([
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], ProductHashDTO.prototype, "productVCHash", void 0);
+exports.ProductHashDTO = ProductHashDTO;