Updated funnel schemas

buda/entities/funnel.proto

@@ -2,18 +2,13 @@ syntax = "proto3";
 
 package buda.entities;
 
+import "buda/entities/uuid.proto";
 import "google/protobuf/timestamp.proto";
 
-message FunnelEvent {
-    string id = 1;
-    string user_id = 2;
+message Funnel {
+    Uuid id = 1;
+    Uuid user_id = 2;
     google.protobuf.Timestamp created_at = 3;
-    string funnel_id = 4;
-    string funnel_event_id = 5;
-    repeated FunnelTag tags = 6;
-}
-
-message FunnelTag {
-    string key = 1;
-    string value = 2;
+    string name = 4;
+    map<string, string> tags = 5;
 }

buda/entities/funnel_event.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package buda.entities;
+
+import "buda/entities/uuid.proto";
+import "buda/entities/link.proto";
+import "google/protobuf/timestamp.proto";
+
+message FunnelEvent {
+    Uuid id = 1;
+    Uuid funnel_id = 2;
+    Uuid funnel_step_id = 3;
+    Uuid user_id = 4;
+    google.protobuf.Timestamp created_at = 5;
+    map<string, string> tags = 6;
+    bool funnel_end = 16;
+    repeated Link links = 17;
+}

buda/entities/link.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package buda.entities;
+
+import "buda/entities/uuid.proto";
+
+message Link {
+  string target = 1;
+  Uuid target_id = 2;
+}

buda/entities/uuid.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package buda.entities;
+
+message Uuid {
+    string id = 1;
+}

buda/services/events_collector.proto

@@ -3,8 +3,10 @@ syntax = "proto3";
 package buda.services;
 
 import "buda/entities/funnel.proto";
+import "buda/entities/funnel_event.proto";
 
 service EventsCollector {
+  rpc CollectFunnel (buda.entities.Funnel) returns (Response) {}
   rpc CollectFunnelEvent (buda.entities.FunnelEvent) returns (Response) {}
 }