From 84d4a17da1ecc944c7c704f8c8f087ba3362abe6 Mon Sep 17 00:00:00 2001
From: woksin <sindrewilting@gmail.com>
Date: Tue, 15 Mar 2022 17:52:00 +0100
Subject: [PATCH 1/2] Event Horizon unbreaking

---
 Source/Runtime/EventHorizon/Consumer.proto    | 24 ++++++++++++++++---
 .../Runtime/EventHorizon/Subscriptions.proto  |  3 ++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Source/Runtime/EventHorizon/Consumer.proto b/Source/Runtime/EventHorizon/Consumer.proto
index e4e4f08..a3ddbd3 100644
--- a/Source/Runtime/EventHorizon/Consumer.proto
+++ b/Source/Runtime/EventHorizon/Consumer.proto
@@ -3,29 +3,47 @@
 
 syntax = "proto3";
 
+import "Fundamentals/Artifacts/Artifact.proto";
+import "Fundamentals/Execution/ExecutionContext.proto";
 import "Fundamentals/Protobuf/Failure.proto";
 import "Fundamentals/Protobuf/Uuid.proto";
 import "Fundamentals/Services/ReverseCallContext.proto";
 import "Fundamentals/Services/Ping.proto";
 import "Runtime/EventHorizon/Subscriptions.proto";
-import "Runtime/Events/Committed.proto";
+import "google/protobuf/timestamp.proto";
 
 package dolittle.runtime.eventhorizon;
 
 option csharp_namespace = "Dolittle.Runtime.EventHorizon.Contracts";
 option go_package = "go.dolittle.io/contracts/runtime/eventhorizon";
 
+
+message EventHorizonCommittedEvent {
+    uint64 eventLogSequenceNumber = 1; 
+    google.protobuf.Timestamp occurred = 2;
+    protobuf.Uuid eventSourceId = 3;
+    execution.ExecutionContext executionContext = 4;
+    artifacts.Artifact eventType = 5;
+    bool public = 6;
+    string content = 7;
+    bool external = 8;
+    uint64 externalEventLogSequenceNumber = 9;
+    google.protobuf.Timestamp externalEventReceived = 10;
+    string eventSourceIdString = 11;
+}
+
 message EventHorizonEvent {
     uint64 streamSequenceNumber = 1;
-    events.CommittedEvent event = 2; 
+    EventHorizonCommittedEvent event = 2; 
 }
 
 message ConsumerSubscriptionRequest {
     services.ReverseCallArgumentsContext callContext = 1;
     protobuf.Uuid tenantId = 2;
     protobuf.Uuid streamId = 3;
-    string partitionId = 4;
+    protobuf.Uuid partitionId = 4;
     uint64 streamPosition = 5;
+    string partitionIdString = 6;
 }
 
 message ConsumerResponse {
diff --git a/Source/Runtime/EventHorizon/Subscriptions.proto b/Source/Runtime/EventHorizon/Subscriptions.proto
index 0d5e226..c768ab8 100644
--- a/Source/Runtime/EventHorizon/Subscriptions.proto
+++ b/Source/Runtime/EventHorizon/Subscriptions.proto
@@ -22,8 +22,9 @@ message Subscription {
     protobuf.Uuid microserviceId = 2;
     protobuf.Uuid tenantId = 3;
     protobuf.Uuid streamId = 4;
-    string partitionId = 5;
+    protobuf.Uuid partitionId = 5;
     protobuf.Uuid scopeId = 6;
+    string partitionIdString = 7;
 }
 
 service Subscriptions {

From 2009d174ed1d988bac589671814dde0ae8a272ee Mon Sep 17 00:00:00 2001
From: woksin <sindrewilting@gmail.com>
Date: Tue, 15 Mar 2022 17:55:43 +0100
Subject: [PATCH 2/2] Don't think we need to change this?

---
 Source/Runtime/EventHorizon/Subscriptions.proto | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/Runtime/EventHorizon/Subscriptions.proto b/Source/Runtime/EventHorizon/Subscriptions.proto
index c768ab8..0d5e226 100644
--- a/Source/Runtime/EventHorizon/Subscriptions.proto
+++ b/Source/Runtime/EventHorizon/Subscriptions.proto
@@ -22,9 +22,8 @@ message Subscription {
     protobuf.Uuid microserviceId = 2;
     protobuf.Uuid tenantId = 3;
     protobuf.Uuid streamId = 4;
-    protobuf.Uuid partitionId = 5;
+    string partitionId = 5;
     protobuf.Uuid scopeId = 6;
-    string partitionIdString = 7;
 }
 
 service Subscriptions {