From 075a502103f5725dabf17478eeff0ed9bd0175d0 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Wed, 22 Jul 2020 19:25:47 +0100
Subject: [PATCH] Pull the repair function out

---
 pkg/rove/world.go | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkg/rove/world.go b/pkg/rove/world.go
index 10fae64..9d2e27c 100644
--- a/pkg/rove/world.go
+++ b/pkg/rove/world.go
@@ -338,6 +338,26 @@ func (w *World) RoverTurn(rover string, bearing roveapi.Bearing) (roveapi.Bearin
 	return r.Bearing, nil
 }
 
+// RoverRepair will turn the rover
+func (w *World) RoverRepair(rover string) (int, error) {
+	w.worldMutex.Lock()
+	defer w.worldMutex.Unlock()
+
+	r, ok := w.Rovers[rover]
+	if !ok {
+		return 0, fmt.Errorf("no rover matching id")
+	}
+
+	// Consume an inventory item to repair if possible
+	if len(r.Inventory) > 0 && r.Integrity < r.MaximumIntegrity {
+		r.Inventory = r.Inventory[:len(r.Inventory)-1]
+		r.Integrity = r.Integrity + 1
+		r.AddLogEntryf("repaired self to %d", r.Integrity)
+	}
+
+	return r.Integrity, nil
+}
+
 // RadarFromRover can be used to query what a rover can currently see
 func (w *World) RadarFromRover(rover string) (radar []roveapi.Tile, objs []roveapi.Object, err error) {
 	w.worldMutex.RLock()
@@ -501,17 +521,9 @@ func (w *World) ExecuteCommand(c *roveapi.Command, rover string) (err error) {
 		}
 
 	case roveapi.CommandType_repair:
-		r, err := w.GetRover(rover)
-		if err != nil {
+		if _, err := w.RoverRepair(rover); err != nil {
 			return err
 		}
-		// Consume an inventory item to repair if possible
-		if len(r.Inventory) > 0 && r.Integrity < r.MaximumIntegrity {
-			r.Inventory = r.Inventory[:len(r.Inventory)-1]
-			r.Integrity = r.Integrity + 1
-			r.AddLogEntryf("repaired self to %d", r.Integrity)
-			w.Rovers[rover] = r
-		}
 
 	case roveapi.CommandType_broadcast:
 		if err := w.RoverBroadcast(rover, c.GetBroadcast()); err != nil {