Added reordering

Author: rjtokenring

command/ota/status.go

@@ -15,10 +15,15 @@ func PrintOtaStatus(otaid, device string, cred *config.Credentials) error {
 	var err error
 	if otaid != "" {
 		res, err = otapi.GetOtaStatusByOtaID(otaid)
-
+		if err == nil {
+			res = res.(*otaapi.OtaStatusResponse).Ota
+		}
 	}
 	if device != "" {
 		res, err = otapi.GetOtaStatusByDeviceID(device)
+		if err == nil {
+			res = res.(*otaapi.OtaStatusByDeviceResponse).Ota
+		}
 	}
 	if err != nil {
 		return err

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"
@@ -131,6 +133,22 @@ func (c *OtaApiClient) GetOtaStatusByDeviceID(deviceID string) (*OtaStatusByDevi
 				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
 	}
 

internal/ota-api/dto.go

@@ -20,21 +20,21 @@ package otaapi
 type (
 	OtaStatusResponse struct {
 		Ota    Ota     `json:"ota"`
-		States []State `json:"states"`
+		States []State `json:"states,omitempty"`
 	}
 
 	OtaStatusByDeviceResponse struct {
 		Ota []Ota `json:"ota"`
 	}
 
 	Ota struct {
+		ID          string `json:"id"`
 		DeviceID    string `json:"device_id"`
+		Status      string `json:"status"`
+		StartedAt   string `json:"started_at"`
 		EndedAt     string `json:"ended_at"`
-		ErrorReason string `json:"error_reason"`
-		ID          string `json:"id"`
+		ErrorReason string `json:"error_reason,omitempty"`
 		Sha256      string `json:"sha256"`
-		StartedAt   string `json:"started_at"`
-		Status      string `json:"status"`
 	}
 
 	State struct {