Add globally unique id to GameEvent and connect it with proposal group

Author: g3force

frontend/src/helpers/ChangeDetails.ts

@@ -129,7 +129,7 @@ export function changeDetails(change: Change): ChangeDetails {
     const details = changeDetails.acceptProposalGroupChange;
     return {
       typeName: "Proposals accepted",
-      title: `Proposal ${details.groupId!} accepted by ${details.acceptedBy}`,
+      title: `Proposal accepted by ${details.acceptedBy}: '${details.groupId!}'`,
       icon: "check_circle_outline",
     }
   }

frontend/src/proto/ssl_gc_game_event.ts

@@ -11,6 +11,9 @@ import { Vector2 } from "./ssl_gc_geometry";
  * An autoRef should ideally set all fields, except if there are good reasons to not do so.
  */
 export interface GameEvent {
+  /** A globally unique id of the game event. */
+  id?: string;
+  /** The type of the game event. */
   type?: GameEvent_Type;
   /**
    * The origins of this game event.
@@ -856,6 +859,7 @@ export interface GameEvent_PenaltyKickFailed {
 export const GameEvent = {
   fromJSON(object: any): GameEvent {
     return {
+      id: isSet(object.id) ? String(object.id) : "",
       type: isSet(object.type) ? gameEvent_TypeFromJSON(object.type) : GameEvent_Type.UNKNOWN_GAME_EVENT_TYPE,
       origin: Array.isArray(object?.origin) ? object.origin.map((e: any) => String(e)) : [],
       createdTimestamp: isSet(object.createdTimestamp) ? Number(object.createdTimestamp) : 0,
@@ -1033,6 +1037,7 @@ export const GameEvent = {
 
   toJSON(message: GameEvent): unknown {
     const obj: any = {};
+    message.id !== undefined && (obj.id = message.id);
     message.type !== undefined && (obj.type = gameEvent_TypeToJSON(message.type));
     if (message.origin) {
       obj.origin = message.origin.map((e) => e);

internal/app/engine/engine.go

@@ -7,6 +7,7 @@ import (
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/statemachine"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/store"
 	"github.com/RoboCup-SSL/ssl-game-controller/pkg/timer"
+	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/durationpb"
@@ -151,6 +152,13 @@ func (e *Engine) processGameEvent(gameEvent *state.GameEvent) *state.GameEvent {
 	gameEvent.CreatedTimestamp = new(uint64)
 	*gameEvent.CreatedTimestamp = uint64(e.timeProvider().UnixMicro())
 
+	// Set unique id
+	if gameEvent.Id != nil {
+		log.Printf("Ignore existing id in enqueued game event: %v", gameEvent)
+	}
+	gameEvent.Id = new(string)
+	*gameEvent.Id = uuid.NewString()
+
 	// convert aimless kick if necessary
 	if e.currentState.Division.Div() == config.DivA && *gameEvent.Type == state.GameEvent_AIMLESS_KICK {
 		return convertAimlessKick(gameEvent)

internal/app/state/ssl_gc_game_event.pb.go

@@ -14,7 +14,7 @@ func (s *StateMachine) processChangeAcceptProposals(newState *state.State, chang
 		return
 	}
 
-	majorityEvent := s.createMergedGameEvent(group.Proposals, change.AcceptedBy)
+	majorityEvent := s.createMergedGameEvent(group, change.AcceptedBy)
 	changes = append(changes, &Change{
 		Change: &Change_AddGameEventChange{
 			AddGameEventChange: &Change_AddGameEvent{
@@ -37,10 +37,12 @@ func findGroupById(groups []*state.ProposalGroup, id string) *state.ProposalGrou
 	return nil
 }
 
-func (s *StateMachine) createMergedGameEvent(proposals []*state.Proposal, acceptedBy *string) *state.GameEvent {
+func (s *StateMachine) createMergedGameEvent(group *state.ProposalGroup, acceptedBy *string) *state.GameEvent {
+	proposals := group.Proposals
 	event := new(state.GameEvent)
 	proto.Merge(event, proposals[0].GameEvent)
 	event.Origin = []string{}
+	event.Id = group.Id
 	byTeam := map[state.Team]int{}
 	origins := map[string]struct{}{}
 	for _, e := range proposals {

internal/app/statemachine/change_acceptproposal.go

@@ -13,6 +13,10 @@ import "ssl_gc_geometry.proto";
 // An autoRef should ideally set all fields, except if there are good reasons to not do so.
 message GameEvent {
 
+    // A globally unique id of the game event.
+    optional string id = 50;
+
+    // The type of the game event.
     optional Type type = 40;
 
     // The origins of this game event.