Skip to content

Commit 941efe0

Browse files
committed
[refactoring] Refactored game events file
1 parent 4531536 commit 941efe0

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

internal/app/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func (c *GameController) ProcessAutoRefRequests(id string, request refproto.Auto
126126
log.Printf("Received request from autoRef '%v': %v", id, request)
127127

128128
if request.GameEvent != nil {
129-
details := NewGameEventDetails(*request.GameEvent)
129+
details := GameEventDetailsFromProto(*request.GameEvent)
130130
gameEventType := details.EventType()
131131
event := Event{GameEvent: &GameEvent{Type: gameEventType, Details: details}}
132132

internal/app/controller/engine.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ func (e *Engine) LogGameEvent(event GameEvent) {
248248
Type: RefereeEventGameEvent,
249249
Name: string(event.Type),
250250
Team: event.ByTeam(),
251-
Description: event.Details.Description(),
251+
Description: event.Details.String(),
252252
}
253253
e.RefereeEvents = append(e.RefereeEvents, gameEvent)
254254
}
@@ -260,7 +260,7 @@ func (e *Engine) LogIgnoredGameEvent(event GameEvent) {
260260
Type: RefereeEventGameEventIgnored,
261261
Name: string(event.Type),
262262
Team: event.ByTeam(),
263-
Description: event.Details.Description(),
263+
Description: event.Details.String(),
264264
}
265265
e.RefereeEvents = append(e.RefereeEvents, gameEvent)
266266
}

internal/app/controller/gameEvent.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ type GameEvent struct {
6565
Details GameEventDetails `json:"details"`
6666
}
6767

68+
// String converts the game event into a string
6869
func (e GameEvent) String() string {
6970
b, _ := json.Marshal(&e)
7071
return string(b)
7172
}
7273

74+
// AllGameEvents returns a list of all known game events
7375
func AllGameEvents() []GameEventType {
7476
return []GameEventType{
7577
GameEventBallLeftFieldTouchLine,
@@ -198,7 +200,7 @@ func (e GameEvent) IsSecondary() bool {
198200
return false
199201
}
200202

201-
// IsSkipped checks if the game event is was continued (not stopped) based on the decision of a team
203+
// IsSkipped checks if the game event is a skipped one (one for which the game was not stopped based on the decision of a team)
202204
func (e GameEvent) IsSkipped() bool {
203205
switch e.Type {
204206
case GameEventBotPushedBotSkipped,
@@ -218,6 +220,7 @@ func (e GameEvent) IsContinueGame() bool {
218220
return false
219221
}
220222

223+
// ToProto converts the internal game event into a protobuf game event
221224
func (e GameEvent) ToProto() *refproto.GameEvent {
222225
protoEvent := new(refproto.GameEvent)
223226
switch e.Type {
@@ -351,6 +354,7 @@ type GameEventDetails struct {
351354
TooManyRobots *refproto.GameEvent_TooManyRobots `json:"tooManyRobots,omitempty"`
352355
}
353356

357+
// EventType returns the internal game event type of game event details
354358
func (d GameEventDetails) EventType() GameEventType {
355359
if d.BallLeftFieldTouchLine != nil {
356360
return GameEventBallLeftFieldTouchLine
@@ -472,7 +476,8 @@ func (d GameEventDetails) EventType() GameEventType {
472476
return GameEventNone
473477
}
474478

475-
func (d GameEventDetails) Description() string {
479+
// String converts the game event details to a string
480+
func (d GameEventDetails) String() string {
476481
if d.BallLeftFieldTouchLine != nil {
477482
if d.BallLeftFieldTouchLine.ByBot != nil {
478483
return fmt.Sprintf("By bot %v", *d.BallLeftFieldTouchLine.ByBot)
@@ -680,7 +685,8 @@ func (d GameEventDetails) Description() string {
680685
return ""
681686
}
682687

683-
func NewGameEventDetails(event refproto.GameEvent) (d GameEventDetails) {
688+
// GameEventDetailsFromProto converts a protobuf game event into internal details
689+
func GameEventDetailsFromProto(event refproto.GameEvent) (d GameEventDetails) {
684690
d.BallLeftFieldTouchLine = event.GetBallLeftFieldTouchLine()
685691
d.BallLeftFieldGoalLine = event.GetBallLeftFieldGoalLine()
686692
d.AimlessKick = event.GetAimlessKick()

0 commit comments

Comments
 (0)