Merge pull request #45 from dolittle/add-projection-key-to-states

Add projection key while getting states + a little cleanup

Source/Fundamentals/Execution/ExecutionContext.proto

@@ -19,4 +19,4 @@ message ExecutionContext {
     protobuf.Uuid correlationId = 4;
     repeated security.Claim claims = 5;
     string environment = 6;
-}
+}

Source/Fundamentals/Protobuf/Failure.proto

@@ -13,4 +13,4 @@ option go_package = "go.dolittle.io/contracts/protobuf";
 message Failure {
     Uuid id = 1;
     string reason = 2;
-}
+}

Source/Fundamentals/Protobuf/Uuid.proto

@@ -10,4 +10,4 @@ option go_package = "go.dolittle.io/contracts/protobuf";
 
 message Uuid {
     bytes value = 1;
-}
+}

Source/Fundamentals/Security/Claim.proto

@@ -12,4 +12,4 @@ message Claim {
     string key = 1;
     string value = 2;
     string valueType = 3;
-}
+}

Source/Fundamentals/Services/CallContext.proto

@@ -14,4 +14,4 @@ option go_package = "go.dolittle.io/contracts/services";
 message CallRequestContext {
     execution.ExecutionContext executionContext = 1;
     protobuf.Uuid headId = 2;
-}
+}

Source/Fundamentals/Services/Ping.proto

@@ -9,9 +9,7 @@ option csharp_namespace = "Dolittle.Services.Contracts";
 option go_package = "go.dolittle.io/contracts/services";
 
 message Ping {
-
 }
 
 message Pong {
-
-}
+}

Source/Fundamentals/Services/ReverseCallContext.proto

@@ -25,4 +25,4 @@ message ReverseCallRequestContext {
 
 message ReverseCallResponseContext {
     protobuf.Uuid callId = 1;
-}
+}

Source/Fundamentals/Versioning/Version.proto

@@ -14,4 +14,4 @@ message Version {
     int32 patch = 3;
     int32 build = 4;
     string preReleaseString = 5;
-}
+}

Source/Runtime/EventHorizon/Consumer.proto

@@ -52,6 +52,7 @@ message EventHorizonProducerToConsumerMessage {
         services.Ping ping = 3;
     }
 }
+
 service Consumer {
     rpc Subscribe(stream EventHorizonConsumerToProducerMessage) returns(stream EventHorizonProducerToConsumerMessage);
-}
+}

Source/Runtime/EventHorizon/Subscriptions.proto

@@ -28,4 +28,4 @@ message Subscription {
 
 service Subscriptions {
     rpc Subscribe(Subscription) returns(SubscriptionResponse);
-}
+}

Source/Runtime/Events.Processing/Filters.proto

@@ -60,4 +60,4 @@ service Filters {
     rpc Connect(stream FilterClientToRuntimeMessage) returns(stream FilterRuntimeToClientMessage);
     rpc ConnectPartitioned(stream PartitionedFilterClientToRuntimeMessage) returns (stream FilterRuntimeToClientMessage);
     rpc ConnectPublic(stream PublicFilterClientToRuntimeMessage) returns (stream FilterRuntimeToClientMessage);
-}
+}

Source/Runtime/Events.Processing/Projections.proto

@@ -10,6 +10,7 @@ import "Fundamentals/Services/ReverseCallContext.proto";
 import "Fundamentals/Services/Ping.proto";
 import "Runtime/Events.Processing/StreamEvent.proto";
 import "Runtime/Events.Processing/Processors.proto";
+import "Runtime/Projections/State.proto";
 
 package dolittle.runtime.events.processing;
 
@@ -68,22 +69,11 @@ message ProjectionRegistrationResponse {
     protobuf.Failure failure = 1;
 }
 
-enum ProjectionCurrentStateType {
-    CREATED_FROM_INITIAL_STATE = 0;
-    PERSISTED = 1;
-}
-
-message ProjectionCurrentState {
-    ProjectionCurrentStateType type = 1;
-    string state = 2;
-}
-
 message ProjectionRequest {
     services.ReverseCallRequestContext callContext = 1;
-    string key = 2;
-    ProjectionCurrentState currentState = 3;
-    StreamEvent event = 4;
-    RetryProcessingState retryProcessingState = 5;
+    projections.ProjectionCurrentState currentState = 2;
+    StreamEvent event = 3;
+    RetryProcessingState retryProcessingState = 4;
 }
 
 message ProjectionRuntimeToClientMessage {

Source/Runtime/Events/Aggregate.proto

@@ -13,4 +13,4 @@ option go_package = "go.dolittle.io/contracts/runtime/events";
 message Aggregate {
     protobuf.Uuid eventSourceId = 1;
     protobuf.Uuid aggregateRootId = 2;
-}
+}

Source/Runtime/Projections/State.proto

@@ -0,0 +1,20 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+syntax = "proto3";
+
+package dolittle.runtime.projections;
+
+option csharp_namespace = "Dolittle.Runtime.Projections.Contracts";
+option go_package = "go.dolittle.io/contracts/runtime/projections";
+
+enum ProjectionCurrentStateType {
+    CREATED_FROM_INITIAL_STATE = 0;
+    PERSISTED = 1;
+}
+
+message ProjectionCurrentState {
+    ProjectionCurrentStateType type = 1;
+    string key = 2;
+    string state = 3;
+}

Source/Runtime/Projections/Projections.proto → Source/Runtime/Projections/Store.proto

@@ -6,7 +6,7 @@ syntax = "proto3";
 import "Fundamentals/Protobuf/Failure.proto";
 import "Fundamentals/Protobuf/Uuid.proto";
 import "Fundamentals/Services/CallContext.proto";
-import "Runtime/Events.Processing/Projections.proto";
+import "Runtime/Projections/State.proto";
 
 package dolittle.runtime.projections;
 
@@ -27,13 +27,13 @@ message GetAllRequest {
 }
 
 message GetOneResponse {
-    protobuf.Failure failure = 1; // not set if not failed
-    events.processing.ProjectionCurrentState state = 2;
+    ProjectionCurrentState state = 1;
+    protobuf.Failure failure = 2; // not set if not failed
 }
 
 message GetAllResponse {
-    protobuf.Failure failure = 1; // not set if not failed
-    repeated events.processing.ProjectionCurrentState states = 2;
+    repeated ProjectionCurrentState states = 1;
+    protobuf.Failure failure = 2; // not set if not failed
 }