Release/1.2.0 (#22)

* Bump version

* Added delegation events

* Updated event names

* Revert update event names

* Updated event names

* Bump version

* Updated changelog

* Bump version

* Fix version

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.2.0
+
+### Added
+
+- Added `Delegation` data models
+- Added delegation events: `ProducerDelegationSubmittedV2`, `ProducerDelegationApprovedV2`, `ProducerDelegationRejectedV2` and `ProducerDelegationRevokedV2`
+- Added eservice events: `EServiceDescriptorSubmittedByDelegateV2`, `EServiceDescriptorApprovedByDelegatorV2` and `EServiceDescriptorRejectedByDelegatorV2`
+- Added `rejectionReasons` property in `EServiceDescriptorV2` data model
+
 ## 1.1.0
 
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagopa/interop-outbound-models",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "PagoPA Interoperability outbound models",
   "main": "dist",
   "type": "module",

proto/v2/delegation/delegation.proto

@@ -0,0 +1,52 @@
+syntax = "proto3";
+
+package delegation.v2;
+
+message DelegationV2 {
+  string id = 1;
+  string delegatorId = 2;
+  string delegateId = 3;
+  string eserviceId = 4;
+  int64 createdAt = 5;
+  int64 submittedAt = 6;
+  optional int64 approvedAt = 7;
+  optional int64 rejectedAt = 8;
+  optional string rejectionReason = 9;
+  optional int64 revokedAt = 10;
+  DelegationStateV2 state = 11;
+  DelegationKindV2 kind = 12;
+  DelegationStampsV2 stamps = 13;  
+  optional DelegationContractDocumentV2 activationContract = 14;
+  optional DelegationContractDocumentV2 revocationContract = 15;
+}
+
+message DelegationContractDocumentV2 {
+  string id = 1;
+  string name = 2;
+  string prettyName = 3;
+  string contentType = 4;
+  int64 createdAt = 5;
+}
+
+message DelegationStampV2 {
+  int64 when = 1;
+}
+
+message DelegationStampsV2 {
+  DelegationStampV2 submission = 1;
+  optional DelegationStampV2 activation = 2;
+  optional DelegationStampV2 rejection = 3;
+  optional DelegationStampV2 revocation = 4;
+}
+
+enum DelegationStateV2 {
+  WAITING_FOR_APPROVAL= 0;
+  ACTIVE= 1;
+  REJECTED= 2;
+  REVOKED= 3;
+}
+
+enum DelegationKindV2 {
+  DELEGATED_PRODUCER = 0;
+  DELEGATED_CONSUMER = 1;
+}

proto/v2/delegation/events.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package delegation.v2;
+
+import "v2/delegation/delegation.proto";
+
+message ProducerDelegationSubmittedV2 {
+  DelegationV2 delegation = 1;
+}
+
+message ProducerDelegationApprovedV2 {
+  DelegationV2 delegation = 1;
+}
+
+message ProducerDelegationRejectedV2 {
+  DelegationV2 delegation = 1;
+}
+
+message ProducerDelegationRevokedV2 {
+  DelegationV2 delegation = 1;
+}

proto/v2/eservice/eservice.proto

@@ -53,6 +53,7 @@ message EServiceDescriptorV2 {
   optional int64 deprecatedAt = 16;
   optional int64 archivedAt = 17;
   EServiceAttributesV2 attributes = 18;
+  repeated DescriptorRejectionReasonV2 rejectionReasons = 19;
 }
 
 message EServiceDocumentV2 {

proto/v2/eservice/events.proto

@@ -103,6 +103,21 @@ message EServiceDescriptionUpdatedV2 {
     EServiceV2 eservice = 1;
 }
 
+message EServiceDescriptorSubmittedByDelegateV2 {
+    string descriptorId = 1;
+    EServiceV2 eservice = 2;
+}
+
+message EServiceDescriptorApprovedByDelegatorV2 {
+    string descriptorId = 1;
+    EServiceV2 eservice = 2;
+}
+
+message EServiceDescriptorRejectedByDelegatorV2 {
+    string descriptorId = 1;
+    EServiceV2 eservice = 2;
+}
+
 message EServiceDescriptorAttributesUpdatedV2 {
   string descriptorId = 1;
   repeated string attributeIds = 2;

src/delegation/eventsV2.ts

@@ -0,0 +1,65 @@
+import { z } from "zod";
+import { match } from "ts-pattern";
+import {
+  ProducerDelegationSubmittedV2,
+  ProducerDelegationApprovedV2,
+  ProducerDelegationRejectedV2,
+  ProducerDelegationRevokedV2,
+} from "../gen/v2/delegation/events.js";
+import { protobufDecoder } from "../utils.js";
+
+export function delegationEventToBinaryDataV2(
+  event: DelegationEventV2
+): Uint8Array {
+  return match(event)
+    .with({ type: "ProducerDelegationSubmitted" }, ({ data }) =>
+      ProducerDelegationSubmittedV2.toBinary(data)
+    )
+    .with({ type: "ProducerDelegationApproved" }, ({ data }) =>
+      ProducerDelegationApprovedV2.toBinary(data)
+    )
+    .with({ type: "ProducerDelegationRejected" }, ({ data }) =>
+      ProducerDelegationRejectedV2.toBinary(data)
+    )
+    .with({ type: "ProducerDelegationRevoked" }, ({ data }) =>
+      ProducerDelegationRevokedV2.toBinary(data)
+    )
+    .exhaustive();
+}
+
+export const DelegationEventV2 = z.discriminatedUnion("type", [
+  z.object({
+    event_version: z.literal(2),
+    type: z.literal("ProducerDelegationSubmitted"),
+    data: protobufDecoder(ProducerDelegationSubmittedV2),
+    stream_id: z.string(),
+    version: z.number(),
+    timestamp: z.coerce.date(),
+  }),
+  z.object({
+    event_version: z.literal(2),
+    type: z.literal("ProducerDelegationApproved"),
+    data: protobufDecoder(ProducerDelegationApprovedV2),
+    stream_id: z.string(),
+    version: z.number(),
+    timestamp: z.coerce.date(),
+  }),
+  z.object({
+    event_version: z.literal(2),
+    type: z.literal("ProducerDelegationRejected"),
+    data: protobufDecoder(ProducerDelegationRejectedV2),
+    stream_id: z.string(),
+    version: z.number(),
+    timestamp: z.coerce.date(),
+  }),
+  z.object({
+    event_version: z.literal(2),
+    type: z.literal("ProducerDelegationRevoked"),
+    data: protobufDecoder(ProducerDelegationRevokedV2),
+    stream_id: z.string(),
+    version: z.number(),
+    timestamp: z.coerce.date(),
+  }),
+]);
+
+export type DelegationEventV2 = z.infer<typeof DelegationEventV2>;

src/delegation/index.ts

@@ -0,0 +1,49 @@
+import { match } from "ts-pattern";
+import { z } from "zod";
+import { VersionedEvent } from "../utils.js";
+import {
+  DelegationEventV2,
+  delegationEventToBinaryDataV2,
+} from "./eventsV2.js";
+
+function delegationEventToBinaryData(event: DelegationEvent): Uint8Array {
+  return match(event)
+    .with({ event_version: 2 }, delegationEventToBinaryDataV2)
+    .exhaustive();
+}
+
+export function encodeOutboundDelegationEvent(event: DelegationEvent): string {
+  return JSON.stringify({
+    event_version: event.event_version,
+    type: event.type,
+    data: Buffer.from(delegationEventToBinaryData(event)).toString("hex"),
+    stream_id: event.stream_id,
+    version: event.version,
+    timestamp: event.timestamp,
+  });
+}
+
+export function decodeOutboundDelegationEvent(
+  encodedEvent: string
+): DelegationEvent {
+  return DelegationEvent.parse(JSON.parse(encodedEvent));
+}
+
+export const DelegationEvent = VersionedEvent.transform((obj, ctx) => {
+  const res = match(obj)
+    .with({ event_version: 1 }, () => {
+      throw new Error("Unsupported event version");
+    })
+    .with({ event_version: 2 }, () => DelegationEventV2.safeParse(obj))
+    .exhaustive();
+
+  if (!res.success) {
+    res.error.issues.forEach(ctx.addIssue);
+    return z.NEVER;
+  }
+  return res.data;
+});
+
+export type DelegationEventType = DelegationEvent["type"];
+export type DelegationEvent = z.infer<typeof DelegationEvent>;
+export { DelegationEventV2 };

src/eservice/eventsV2.ts

@@ -21,6 +21,9 @@ import {
   EServiceDraftDescriptorUpdatedV2,
   EServiceDescriptorQuotasUpdatedV2,
   EServiceDescriptionUpdatedV2,
+  EServiceDescriptorSubmittedByDelegateV2,
+  EServiceDescriptorApprovedByDelegatorV2,
+  EServiceDescriptorRejectedByDelegatorV2,
   EServiceDescriptorAttributesUpdatedV2,
   EServiceNameUpdatedV2,
 } from "../gen/v2/eservice/events.js";
@@ -86,6 +89,15 @@ export function eServiceEventToBinaryDataV2(
     .with({ type: "EServiceDescriptionUpdated" }, ({ data }) =>
       EServiceDescriptionUpdatedV2.toBinary(data)
     )
+    .with({ type: "EServiceDescriptorSubmittedByDelegate" }, ({ data }) =>
+      EServiceDescriptorSubmittedByDelegateV2.toBinary(data)
+    )
+    .with({ type: "EServiceDescriptorApprovedByDelegator" }, ({ data }) =>
+      EServiceDescriptorApprovedByDelegatorV2.toBinary(data)
+    )
+    .with({ type: "EServiceDescriptorRejectedByDelegator" }, ({ data }) =>
+      EServiceDescriptorRejectedByDelegatorV2.toBinary(data)
+    )
     .with({ type: "EServiceDescriptorAttributesUpdated" }, ({ data }) =>
       EServiceDescriptorAttributesUpdatedV2.toBinary(data)
     )
@@ -248,6 +260,30 @@ export const EServiceEventV2 = z.discriminatedUnion("type", [
     version: z.number(),
     timestamp: z.coerce.date(),
   }),
+  z.object({
+    event_version: z.literal(2),
+    type: z.literal("EServiceDescriptorSubmittedByDelegate"),
+    data: protobufDecoder(EServiceDescriptorSubmittedByDelegateV2),
+    stream_id: z.string(),
+    version: z.number(),
+    timestamp: z.coerce.date(),
+  }),
+  z.object({
+    event_version: z.literal(2),
+    type: z.literal("EServiceDescriptorApprovedByDelegator"),
+    data: protobufDecoder(EServiceDescriptorApprovedByDelegatorV2),
+    stream_id: z.string(),
+    version: z.number(),
+    timestamp: z.coerce.date(),
+  }),
+  z.object({
+    event_version: z.literal(2),
+    type: z.literal("EServiceDescriptorRejectedByDelegator"),
+    data: protobufDecoder(EServiceDescriptorRejectedByDelegatorV2),
+    stream_id: z.string(),
+    version: z.number(),
+    timestamp: z.coerce.date(),
+  }),
   z.object({
     event_version: z.literal(2),
     type: z.literal("EServiceDescriptorAttributesUpdated"),

src/index.ts

@@ -2,6 +2,7 @@ export * from "./eservice/index.js";
 export * from "./agreement/index.js";
 export * from "./purpose/index.js";
 export * from "./tenant/index.js";
+export * from "./delegation/index.js";
 
 export * from "./gen/v1/agreement/agreement.js";
 export * from "./gen/v1/agreement/events.js";
@@ -20,3 +21,5 @@ export * from "./gen/v2/purpose/purpose.js";
 export * from "./gen/v2/purpose/events.js";
 export * from "./gen/v2/tenant/tenant.js";
 export * from "./gen/v2/tenant/events.js";
+export * from "./gen/v2/delegation/delegation.js";
+export * from "./gen/v2/delegation/events.js";

tests/eservice.test.ts

@@ -42,6 +42,7 @@ describe("eservice", () => {
                 verified: [],
                 declared: [],
               },
+              rejectionReasons: [],
             },
           ],
         },