output fixes

Author: rjtokenring

command/ota/status.go

@@ -10,7 +10,7 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-func formatOtaByIdOutput(wideOutput bool, st *otaapi.OtaStatusResponse) {
+func formatOtaByIdOutput(wideOutput bool, st *otaapi.OtaStatusPrint) {
 	if !wideOutput {
 		st.Ota.DeviceID = ""
 		st.Ota.ErrorReason = ""
@@ -89,7 +89,10 @@ func PrintOtaStatus(otaid, device, otaidpath string, wideOutput bool, cred *conf
 	} else if otaid != "" {
 		res, err := otapi.GetOtaStatusByOtaID(otaid)
 		if err == nil && res != nil {
-			formatOtaByIdOutput(wideOutput, res)
+			formatOtaByIdOutput(wideOutput, &otaapi.OtaStatusPrint{
+				Ota: res.Ota,
+				Details: res.States,
+			})
 		} else if err != nil {
 			return err
 		}

internal/ota-api/dto.go

@@ -45,32 +45,41 @@ type (
 		StateData string `json:"state_data,omitempty"`
 		Timestamp string `json:"timestamp,omitempty"`
 	}
+
+	OtaStatusPrint struct {
+		Ota     Ota     `json:"ota"`
+		Details []State `json:"details,omitempty"`
+	}	
 )
 
 func (o Ota) GetWideCSVHeader() string {
-	return "id,device_id,status,started_at,ended_at,error_reason"
+	return "ota_id,device_id,status,started_at,ended_at,error_reason"
 }
 
 func (o Ota) ToWideCSV() string {
 	return fmt.Sprintf("%s,%s,%s,%s,%s,%s", o.ID, o.DeviceID, o.Status, o.StartedAt, o.EndedAt, o.ErrorReason)
 }
 
 func (o Ota) GetCSVHeader() string {
-	return "id,status,started_at,ended_at"
+	return "ota_id,status,started_at,ended_at"
 }
 
 func (o Ota) ToCSV() string {
 	return fmt.Sprintf("%s,%s,%s,%s", o.ID, o.Status, o.StartedAt, o.EndedAt)
 }
 
 func (o Ota) ToText() string {
-	out := fmt.Sprintf("ID: %s\nStatus: %s\nStartedAt: %s\nEndedAt: %s", o.ID, o.Status, o.StartedAt, o.EndedAt)
+	out := fmt.Sprintf("ota_id: %s\nstatus: %s\nstarted_at: %s\nended_at: %s", o.ID, o.Status, o.StartedAt, o.EndedAt)
 	if o.ErrorReason != "" {
-		out += fmt.Sprintf("\nErrorReason: %s", o.ErrorReason)
+		out += fmt.Sprintf("\nerror_reason: %s", o.ErrorReason)
 	}
 	return out
 }
 
 func (s State) ToText() string {
-	return fmt.Sprintf("Timestamp: %s, State: %s", s.Timestamp, s.State)
+	rep := fmt.Sprintf("time: %s, status: %s", s.Timestamp, s.State)
+	if s.StateData != "" {
+		rep += fmt.Sprintf(", detail: %s", s.StateData)
+	}
+	return rep
 }