Added temp limit/sort client side for ota states

Author: rjtokenring

command/ota/status.go

@@ -62,7 +62,7 @@ func PrintOtaStatus(otaid, device string, cred *config.Credentials, limit int, o
 	otapi := otaapi.NewClient(cred)
 
 	if otaid != "" {
-		res, err := otapi.GetOtaStatusByOtaID(otaid)
+		res, err := otapi.GetOtaStatusByOtaID(otaid, limit, order)
 		if err == nil && res != nil {
 			formatOtaByIdOutput(&otaapi.OtaStatusPrint{
 				Ota: res.Ota,

internal/ota-api/client.go

@@ -23,7 +23,9 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"sort"
 	"strings"
+	"time"
 
 	"github.com/arduino/arduino-cloud-cli/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
@@ -65,7 +67,7 @@ func (c *OtaApiClient) performGetRequest(endpoint, token string) (*http.Response
 	return res, nil
 }
 
-func (c *OtaApiClient) GetOtaStatusByOtaID(otaid string) (*OtaStatusResponse, error) {
+func (c *OtaApiClient) GetOtaStatusByOtaID(otaid string, limit int, order string) (*OtaStatusResponse, error) {
 
 	if otaid == "" {
 		return nil, fmt.Errorf("invalid ota-id: empty")
@@ -95,6 +97,28 @@ func (c *OtaApiClient) GetOtaStatusByOtaID(otaid string) (*OtaStatusResponse, er
 				return nil, err
 			}
 		}
+
+		if len(otaResponse.States) > 0 {
+			// Sort output by StartedAt
+			sort.Slice(otaResponse.States, func(i, j int) bool {
+				t1, err := time.Parse(time.RFC3339, otaResponse.States[i].Timestamp)
+				if err != nil {
+					return false
+				}
+				t2, err := time.Parse(time.RFC3339, otaResponse.States[j].Timestamp)
+				if err != nil {
+					return false
+				}
+				if order == "asc" {
+					return t1.Before(t2)
+				}
+				return t1.After(t2)
+			})
+			if limit > 0 && len(otaResponse.States) > limit {
+				otaResponse.States = otaResponse.States[:limit]
+			}
+		}
+
 		return &otaResponse, nil
 	} else if res.StatusCode == 404 || res.StatusCode == 400 {
 		return nil, fmt.Errorf("ota-id %s not found", otaid)
@@ -139,23 +163,6 @@ func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string, limit int, order
 				return nil, err
 			}
 		}
-
-		/*
-		if len(otaResponse.Ota) > 0 {
-			// Sort output by StartedAt
-			sort.Slice(otaResponse.Ota, func(i, j int) bool {
-				t1, err := time.Parse(time.RFC3339, otaResponse.Ota[i].StartedAt)
-				if err != nil {
-					return false
-				}
-				t2, err := time.Parse(time.RFC3339, otaResponse.Ota[j].StartedAt)
-				if err != nil {
-					return false
-				}
-				return t1.After(t2)
-			})
-		}
-		*/
 		return &otaResponse, nil
 	} else if res.StatusCode == 404 || res.StatusCode == 400 {
 		return nil, fmt.Errorf("device-id %s not found", deviceID)