[bugfix] Duplicate game events do not inc foul counter within 5s

Especially for use with more than one autoRef and without majority vote.

Author: g3force

internal/app/controller/engine.go

@@ -682,9 +682,9 @@ func (e *Engine) processGameEvent(event *GameEvent) error {
 		e.LogIgnoredGameEvent(*event)
 		return nil
 	}
-	e.AddGameEvent(*event)
+	event.SetOccurred(e.TimeProvider())
 
-	if event.IncrementsFoulCounter() {
+	if !e.State.MatchesRecentGameEvent(event) && event.IncrementsFoulCounter() {
 		team := event.ByTeam()
 		if team.Unknown() {
 			e.State.TeamState[TeamYellow].FoulCounter++
@@ -697,6 +697,8 @@ func (e *Engine) processGameEvent(event *GameEvent) error {
 		}
 	}
 
+	e.AddGameEvent(*event)
+
 	if event.AddsYellowCard() {
 		team := event.ByTeam()
 		if team.Unknown() {

internal/app/controller/gameEvent.go

@@ -6,6 +6,7 @@ import (
 	"github.com/RoboCup-SSL/ssl-game-controller/pkg/refproto"
 	"log"
 	"reflect"
+	"time"
 )
 
 type GameEventType string
@@ -113,9 +114,18 @@ func (g GameEventType) Valid() bool {
 
 // GameEvent combines the type of a game event with the corresponding detail structures
 type GameEvent struct {
-	Type    GameEventType    `json:"type"`
-	Details GameEventDetails `json:"details"`
-	Origins []string         `json:"origins"`
+	Type     GameEventType    `json:"type"`
+	Details  GameEventDetails `json:"details"`
+	Origins  []string         `json:"origins"`
+	occurred time.Time        `json:"-"`
+}
+
+func (e *GameEvent) SetOccurred(occurred time.Time) {
+	e.occurred = occurred
+}
+
+func (e GameEvent) Occurred() time.Time {
+	return e.occurred
 }
 
 // String converts the game event into a string

internal/app/controller/state.go

@@ -571,6 +571,16 @@ func (s *State) GetFirstGameEvent(gameEventType GameEventType) *GameEvent {
 	return nil
 }
 
+func (s *State) MatchesRecentGameEvent(event *GameEvent) bool {
+	for _, gameEvent := range s.GameEvents {
+		if gameEvent.Type == event.Type &&
+			event.Occurred().Sub(gameEvent.Occurred()) < 5*time.Second {
+			return true
+		}
+	}
+	return false
+}
+
 // Location is a two-dimensional coordinate
 type Location struct {
 	X float64 `json:"x" yaml:"x"`