1 files changed, 67 insertions, 32 deletions

diff --git a/golang/pkg/api/systems.go b/golang/pkg/api/systems.go
index 3d3a373..2cdfeca 100644
--- a/golang/pkg/api/systems.go
+++ b/golang/pkg/api/systems.go
@@ -5,55 +5,90 @@ import (
 	"net/url"
 	"path"
 
-	"git.adyxax.org/adyxax/spacetraders/golang/pkg/database"
 	"git.adyxax.org/adyxax/spacetraders/golang/pkg/model"
 )
 
-func (c *Client) GetSystem(symbol string, db *database.DB) (*model.System, error) {
-	if system, err := db.LoadSystem(symbol); err == nil && system != nil {
-		return system, nil
+func (c *Client) GetMarket(waypointSymbol string) (*model.Market, error) {
+	if market, err := c.db.LoadMarket(waypointSymbol); err == nil && market != nil {
+		// TODO check last updated time
+		return market, nil
 	}
-	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)
+	systemSymbol := WaypointSymbolToSystemSymbol(waypointSymbol)
+	uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", waypointSymbol, "market")}
+	var market model.Market
+	if err := c.Send("GET", &uriRef, nil, &market); err != nil {
+		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)
+	if err := c.db.SaveMarket(&market); err != nil {
+		return nil, fmt.Errorf("failed to save market %s: %w", market.Symbol, err)
 	}
-	return &system, nil
+	return &market, nil
 }
 
-func (c *Client) ListWaypointsInSystem(system *model.System, db *database.DB) ([]model.Waypoint, error) {
-	// TODO database caching
-	// TODO pagination
-	// TODO check updated
-	uriRef := url.URL{Path: path.Join("systems", system.Symbol, "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", system.Symbol, err)
+func (c *Client) GetShipyard(waypointSymbol string) (*model.Shipyard, error) {
+	if shipyard, err := c.db.LoadShipyard(waypointSymbol); err == nil && shipyard != nil &&
+		(shipyard.Ships != nil) { // TODO || !IsThereAShipAtWaypoint(waypoint)) {
+		// TODO check last updated time
+		return shipyard, nil
 	}
-	for _, waypoint := range waypoints {
-		if err := db.SaveWaypoint(&waypoint); err != nil {
-			return nil, fmt.Errorf("failed to list waypoints in system %s: %w", system.Symbol, err)
-		}
+	systemSymbol := WaypointSymbolToSystemSymbol(waypointSymbol)
+	uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", waypointSymbol, "shipyard")}
+	var shipyard model.Shipyard
+	if err := c.Send("GET", &uriRef, nil, &shipyard); err != nil {
+		return nil, fmt.Errorf("failed API request: %w", err)
 	}
-	return waypoints, nil
+	if err := c.db.SaveShipyard(&shipyard); err != nil {
+		return nil, fmt.Errorf("failed to save shipyard %s: %w", shipyard.Symbol, err)
+	}
+	return &shipyard, nil
 }
 
-func (c *Client) GetWaypoint(symbol string, db *database.DB) (*model.Waypoint, error) {
-	// TODO check updated
-	if waypoint, err := db.LoadWaypoint(symbol); err == nil && waypoint != nil {
+func (c *Client) GetSystem(systemSymbol string) (*model.System, error) {
+	if system, err := c.db.LoadSystem(systemSymbol); err == nil && system != nil {
+		return system, nil
+	}
+	uriRef := url.URL{Path: path.Join("systems", systemSymbol)}
+	var system model.System
+	if err := c.Send("GET", &uriRef, nil, &system); err != nil {
+		return nil, fmt.Errorf("failed API request: %w", err)
+	}
+	if err := c.db.SaveSystem(&system); err != nil {
+		return nil, fmt.Errorf("failed to save system %s: %w", system.Symbol, err)
+	}
+	return &system, nil
+}
+
+func (c *Client) GetWaypoint(waypointSymbol string) (*model.Waypoint, error) {
+	if waypoint, err := c.db.LoadWaypoint(waypointSymbol); err == nil && waypoint != nil {
+		// TODO check last updated time
 		return waypoint, nil
 	}
-	systemSymbol := WaypointSymbolToSystemSymbol(symbol)
-	uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", symbol)}
+	systemSymbol := WaypointSymbolToSystemSymbol(waypointSymbol)
+	uriRef := url.URL{Path: path.Join("systems", systemSymbol, "waypoints", waypointSymbol)}
 	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)
+	if err := c.db.SaveWaypoint(&waypoint); err != nil {
+		return nil, fmt.Errorf("failed to save waypoint %s: %w", waypoint.Symbol, err)
 	}
 	return &waypoint, nil
 }
+
+func (c *Client) ListWaypointsInSystem(systemSymbol string) ([]model.Waypoint, error) {
+	if waypoints, err := c.db.LoadWaypointsInSystem(systemSymbol); err == nil && waypoints != nil {
+		// TODO check last updated time
+		return waypoints, nil
+	}
+	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 API request: %w", err)
+	}
+	for _, waypoint := range waypoints {
+		if err := c.db.SaveWaypoint(&waypoint); err != nil {
+			return nil, fmt.Errorf("failed to save waypoint %s: %w", waypoint.Symbol, err)
+		}
+	}
+	return waypoints, nil
+}