[golang] update error handling and bootstrap trade procurement

1 files changed, 8 insertions, 8 deletions

diff --git a/golang/pkg/api/systems.go b/golang/pkg/api/systems.go
index 5f5def6..840f32e 100644
--- a/golang/pkg/api/systems.go
+++ b/golang/pkg/api/systems.go
@@ -16,10 +16,10 @@ func (c *Client) GetSystem(symbol string, db *database.DB) (*model.System, error
 	uriRef := url.URL{Path: path.Join("systems", symbol)}
 	var system model.System
 	if err := c.Send("GET", &uriRef, nil, &system); err != nil {
-		return nil, fmt.Errorf("failed to get system %s: %w", symbol, err)
+		return nil, fmt.Errorf("failed API request: %w", err)
 	}
 	if err := db.SaveSystem(&system); err != nil {
-		return nil, fmt.Errorf("failed to get system %s: %w", symbol, err)
+		return nil, fmt.Errorf("failed to save system %s: %w", system.Symbol, err)
 	}
 	return &system, nil
 }
@@ -33,10 +33,10 @@ func (c *Client) GetShipyard(waypoint *model.Waypoint, db *database.DB) (*model.
 	uriRef := url.URL{Path: path.Join("systems", waypoint.SystemSymbol, "waypoints", waypoint.Symbol, "shipyard")}
 	var shipyard model.Shipyard
 	if err := c.Send("GET", &uriRef, nil, &shipyard); err != nil {
-		return nil, fmt.Errorf("failed to get shipyard at %s: %w", waypoint.Symbol, err)
+		return nil, fmt.Errorf("failed API request: %w", err)
 	}
 	if err := db.SaveShipyard(&shipyard); err != nil {
-		return nil, fmt.Errorf("failed to get shipyard at %s: %w", waypoint.Symbol, err)
+		return nil, fmt.Errorf("failed to save shipyard %s: %w", shipyard.Symbol, err)
 	}
 	return &shipyard, nil
 }
@@ -50,10 +50,10 @@ func (c *Client) GetWaypoint(symbol string, db *database.DB) (*model.Waypoint, e
 	uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", symbol)}
 	var waypoint model.Waypoint
 	if err := c.Send("GET", &uriRef, nil, &waypoint); err != nil {
-		return nil, fmt.Errorf("failed to get waypoint %s: %w", symbol, err)
+		return nil, fmt.Errorf("failed API request: %w", err)
 	}
 	if err := db.SaveWaypoint(&waypoint); err != nil {
-		return nil, fmt.Errorf("failed to get waypoint %s: %w", symbol, err)
+		return nil, fmt.Errorf("failed to save waypoint %s: %w", waypoint.Symbol, err)
 	}
 	return &waypoint, nil
 }
@@ -66,11 +66,11 @@ func (c *Client) ListWaypointsInSystem(systemSymbol string, db *database.DB) ([]
 	uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints")}
 	var waypoints []model.Waypoint
 	if err := c.Send("GET", &uriRef, nil, &waypoints); err != nil {
-		return nil, fmt.Errorf("failed to list waypoints in system %s: %w", systemSymbol, err)
+		return nil, fmt.Errorf("failed API request: %w", err)
 	}
 	for _, waypoint := range waypoints {
 		if err := db.SaveWaypoint(&waypoint); err != nil {
-			return nil, fmt.Errorf("failed to list waypoints in system %s: %w", systemSymbol, err)
+			return nil, fmt.Errorf("failed to save waypoint %s: %w", waypoint.Symbol, err)
 		}
 	}
 	return waypoints, nil