Updated models

pagopa · Nov 13, 2024 · 1a5a040 · 1a5a040
1 parent d28c46e
commit 1a5a040
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 52 deletions.
diff --git a/proto/v2/eservice/eservice.proto b/proto/v2/eservice/eservice.proto
@@ -53,7 +53,6 @@ message EServiceDescriptorV2 {
   optional int64 deprecatedAt = 16;
   optional int64 archivedAt = 17;
   EServiceAttributesV2 attributes = 18;
-  repeated DescriptorRejectionReasonV2 rejectionReasons = 19;
 }
 
 message EServiceDocumentV2 {

diff --git a/proto/v2/eservice/events.proto b/proto/v2/eservice/events.proto
@@ -102,18 +102,3 @@ message EServiceDescriptorDocumentDeletedV2 {
 message EServiceDescriptionUpdatedV2 {
     EServiceV2 eservice = 1;
 }
-
-message EServiceDescriptorDelegateSubmittedV2 {
-    string descriptorId = 1;
-    EServiceV2 eservice = 2;
-}
-
-message EServiceDescriptorDelegatorApprovedV2 {
-    string descriptorId = 1;
-    EServiceV2 eservice = 2;
-}
-
-message EServiceDescriptorDelegatorRejectedV2 {
-    string descriptorId = 1;
-    EServiceV2 eservice = 2;
-}
diff --git a/proto/v2/tenant/events.proto b/proto/v2/tenant/events.proto
@@ -70,3 +70,6 @@ message TenantDelegatedProducerFeatureAddedV2 {
   TenantV2 tenant = 1;
 }
 
+message TenantDelegatedProducerFeatureRemovedV2 {
+  TenantV2 tenant = 1;
+}
diff --git a/src/eservice/eventsV2.ts b/src/eservice/eventsV2.ts
@@ -21,9 +21,6 @@ import {
   EServiceDraftDescriptorUpdatedV2,
   EServiceDescriptorQuotasUpdatedV2,
   EServiceDescriptionUpdatedV2,
-  EServiceDescriptorDelegateSubmittedV2,
-  EServiceDescriptorDelegatorApprovedV2,
-  EServiceDescriptorDelegatorRejectedV2,
 } from "../gen/v2/eservice/events.js";
 
 export function eServiceEventToBinaryDataV2(
@@ -87,15 +84,6 @@ export function eServiceEventToBinaryDataV2(
     .with({ type: "EServiceDescriptionUpdated" }, ({ data }) =>
       EServiceDescriptionUpdatedV2.toBinary(data)
     )
-    .with({ type: "EServiceDescriptorDelegateSubmitted" }, ({ data }) =>
-      EServiceDescriptorDelegateSubmittedV2.toBinary(data)
-    )
-    .with({ type: "EServiceDescriptorDelegatorApproved" }, ({ data }) =>
-      EServiceDescriptorDelegatorApprovedV2.toBinary(data)
-    )
-    .with({ type: "EServiceDescriptorDelegatorRejected" }, ({ data }) =>
-      EServiceDescriptorDelegatorRejectedV2.toBinary(data)
-    )
     .exhaustive();
 }
 
@@ -252,30 +240,6 @@ export const EServiceEventV2 = z.discriminatedUnion("type", [
     version: z.number(),
     timestamp: z.coerce.date(),
   }),
-  z.object({
-    event_version: z.literal(2),
-    type: z.literal("EServiceDescriptorDelegateSubmitted"),
-    data: protobufDecoder(EServiceDescriptorDelegateSubmittedV2),
-    stream_id: z.string(),
-    version: z.number(),
-    timestamp: z.coerce.date(),
-  }),
-  z.object({
-    event_version: z.literal(2),
-    type: z.literal("EServiceDescriptorDelegatorApproved"),
-    data: protobufDecoder(EServiceDescriptorDelegatorApprovedV2),
-    stream_id: z.string(),
-    version: z.number(),
-    timestamp: z.coerce.date(),
-  }),
-  z.object({
-    event_version: z.literal(2),
-    type: z.literal("EServiceDescriptorDelegatorRejected"),
-    data: protobufDecoder(EServiceDescriptorDelegatorRejectedV2),
-    stream_id: z.string(),
-    version: z.number(),
-    timestamp: z.coerce.date(),
-  }),
 ]);
 
 export type EServiceEventV2 = z.infer<typeof EServiceEventV2>;
diff --git a/src/tenant/eventsV2.ts b/src/tenant/eventsV2.ts
@@ -15,6 +15,7 @@ import {
   TenantKindUpdatedV2,
   MaintenanceTenantPromotedToCertifierV2,
   TenantDelegatedProducerFeatureAddedV2,
+  TenantDelegatedProducerFeatureRemovedV2,
 } from "../gen/v2/tenant/events.js";
 import { protobufDecoder } from "../utils.js";
 
@@ -62,6 +63,9 @@ export function tenantEventToBinaryDataV2(event: TenantEventV2): Uint8Array {
     .with({ type: "TenantDelegatedProducerFeatureAdded" }, ({ data }) =>
       TenantDelegatedProducerFeatureAddedV2.toBinary(data)
     )
+    .with({ type: "TenantDelegatedProducerFeatureRemoved" }, ({ data }) =>
+      TenantDelegatedProducerFeatureRemovedV2.toBinary(data)
+    )
     .exhaustive();
 }
 
@@ -178,6 +182,14 @@ export const TenantEventV2 = z.discriminatedUnion("type", [
     version: z.number(),
     timestamp: z.coerce.date(),
   }),
+  z.object({
+    event_version: z.literal(2),
+    type: z.literal("TenantDelegatedProducerFeatureRemoved"),
+    data: protobufDecoder(TenantDelegatedProducerFeatureRemovedV2),
+    stream_id: z.string(),
+    version: z.number(),
+    timestamp: z.coerce.date(),
+  }),
 ]);
 
 export type TenantEventV2 = z.infer<typeof TenantEventV2>;