Merge pull request #26 from doneill/task/jdo-45-reduce-patrols-data

Update patrols data

Author: doneill

api/apipatrols.go

@@ -33,7 +33,7 @@ type Patrol struct {
 }
 
 type PatrolSegment struct {
-	ID            string    `json:"id"`
+	ID     string `json:"id"`
 	Leader *struct {
 		Name string `json:"name"`
 	} `json:"leader"`
@@ -68,6 +68,7 @@ type DateRangeFilter struct {
 func (c *Client) Patrols(days int, status string) (*PatrolsResponse, error) {
 	params := url.Values{}
 	params.Add("exclude_empty_patrols", "true")
+	params.Add("page_size", "200")
 
 	if status != "" {
 		params.Add("status", status)

api/ersvc.go

@@ -1,15 +1,20 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
+	"net"
 	"net/http"
+	"os"
+	"strings"
 	"time"
 )
 
 // ----------------------------------------------
 // const endpoints
 // ----------------------------------------------
+
 const DOMAIN = ".pamdas.org"
 
 const API_V1 = "/api/v1.0"
@@ -85,7 +90,7 @@ func (c *Client) newRequest(method, endpoint string, isAuth bool) (*http.Request
 func (c *Client) doRequest(req *http.Request, v interface{}) error {
 	resp, err := c.httpClient.Do(req)
 	if err != nil {
-		return fmt.Errorf("failed to make request: %w", err)
+		return c.handleRequestError(err)
 	}
 	defer resp.Body.Close()
 
@@ -100,6 +105,36 @@ func (c *Client) doRequest(req *http.Request, v interface{}) error {
 	return nil
 }
 
+func (c *Client) handleRequestError(err error) error {
+	// Check for timeout errors
+	if os.IsTimeout(err) {
+		return fmt.Errorf("request timed out - try reducing the requested data and/or check your network connection")
+	}
+
+	// Check for context deadline exceeded (another form of timeout)
+	if err == context.DeadlineExceeded || strings.Contains(err.Error(), "context deadline exceeded") {
+		return fmt.Errorf("request timed out - try reducing the date range with --days or check your network connection")
+	}
+
+	// Check for network timeout specifically
+	if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
+		return fmt.Errorf("network timeout - try reducing the date range with --days or check your network connection")
+	}
+
+	// Check for DNS resolution errors
+	if strings.Contains(err.Error(), "no such host") {
+		return fmt.Errorf("unable to connect to EarthRanger server - check your network connection and site name")
+	}
+
+	// Check for connection refused
+	if strings.Contains(err.Error(), "connection refused") {
+		return fmt.Errorf("connection refused - check your network connection and EarthRanger server status")
+	}
+
+	// Default error message for other request failures
+	return fmt.Errorf("failed to connect to EarthRanger server: %v", err)
+}
+
 // ----------------------------------------------
 // Helper functions
 // ----------------------------------------------

cmd/patrols.go

@@ -37,6 +37,12 @@ var patrolsCmd = &cobra.Command{
 				return fmt.Errorf("invalid status value: %s\nValid status values are: active, done, cancelled", status)
 			}
 		}
+		if days > 30 {
+			return fmt.Errorf("days value cannot exceed 30 (got %d)", days)
+		}
+		if days < 0 {
+			return fmt.Errorf("days value must be positive (got %d)", days)
+		}
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
@@ -126,13 +132,13 @@ func formatPatrolData(patrol *api.Patrol) []string {
 		fmt.Sprintf("%d", patrol.SerialNumber),
 		patrol.State,
 		patrol.ID,
-		segmentID,
 		title,
 		leader,
 		startLocation,
 		endLocation,
 		startTime,
 		endTime,
+		segmentID,
 	}
 }
 
@@ -142,13 +148,13 @@ func configurePatrolsTable() *tablewriter.Table {
 		"Serial",
 		"State",
 		"ID",
-		"Segment ID",
 		"Title",
 		"Leader",
 		"Start Location",
 		"End Location",
 		"Start Time",
 		"End Time",
+		"Segment ID",
 	})
 	table.SetBorders(tablewriter.Border{
 		Left:   true,