Formatted TS

Author: rjtokenring

internal/ota-api/dto.go

@@ -17,7 +17,10 @@
 
 package otaapi
 
-import "fmt"
+import (
+	"fmt"
+	"time"
+)
 
 type (
 	OtaStatusResponse struct {
@@ -49,28 +52,39 @@ type (
 	OtaStatusPrint struct {
 		Ota     Ota     `json:"ota"`
 		Details []State `json:"details,omitempty"`
-	}	
+	}
 )
 
 func (o Ota) ToLine() string {
 	if o.ErrorReason != "" {
-		return fmt.Sprintf("ota_id: %s, started_at: %s, ended_at: %s, status: %s, error_reason: %s", o.ID, o.StartedAt, o.EndedAt, o.Status, o.ErrorReason)
+		return fmt.Sprintf("ota_id: %s, started_at: %s, ended_at: %s, status: %s, error_reason: %s", o.ID, formatHumanReadableTs(o.StartedAt), formatHumanReadableTs(o.EndedAt), o.Status, o.ErrorReason)
 	}
-	return fmt.Sprintf("ota_id: %s, started_at: %s, ended_at: %s, status: %s", o.ID, o.StartedAt, o.EndedAt, o.Status)
+	return fmt.Sprintf("ota_id: %s, started_at: %s, ended_at: %s, status: %s", o.ID, formatHumanReadableTs(o.StartedAt), formatHumanReadableTs(o.EndedAt), o.Status)
 }
 
 func (o Ota) ToText() string {
-	out := fmt.Sprintf("ota_id: %s\nstatus: %s\nstarted_at: %s\nended_at: %s\ndevice_id: %s", o.ID, o.Status, o.StartedAt, o.EndedAt, o.DeviceID)
+	out := fmt.Sprintf("ota_id: %s\nstatus: %s\nstarted_at: %s\nended_at: %s\ndevice_id: %s", o.ID, o.Status, formatHumanReadableTs(o.StartedAt), formatHumanReadableTs(o.EndedAt), o.DeviceID)
 	if o.ErrorReason != "" {
 		out += fmt.Sprintf("\nerror_reason: %s", o.ErrorReason)
 	}
 	return out
 }
 
 func (s State) ToText() string {
-	rep := fmt.Sprintf("time: %s, status: %s", s.Timestamp, s.State)
+	rep := fmt.Sprintf("time: %s, status: %s", formatHumanReadableTs(s.Timestamp), s.State)
 	if s.StateData != "" {
 		rep += fmt.Sprintf(", detail: %s", s.StateData)
 	}
 	return rep
 }
+
+func formatHumanReadableTs(ts string) string {
+	if ts == "" {
+		return ""
+	}
+	parsed, err := time.Parse(time.RFC3339Nano, ts)
+	if err != nil {
+		return ts
+	}
+	return parsed.Format(time.RFC3339)
+}