From b212d5fb147e09edeed3766a717846610808096d Mon Sep 17 00:00:00 2001
From: Jiacheng Xu <xjcmaxwellcjx@gmail.com>
Date: Mon, 3 Jun 2024 10:56:20 +0800
Subject: [PATCH] fix: load missing fields for archived workflows (#13136)

Signed-off-by: Jiacheng Xu <xjcmaxwellcjx@gmail.com>
---
 persist/sqldb/workflow_archive.go | 44 ++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/persist/sqldb/workflow_archive.go b/persist/sqldb/workflow_archive.go
index 55d4800cfe89..9868d59944c8 100644
--- a/persist/sqldb/workflow_archive.go
+++ b/persist/sqldb/workflow_archive.go
@@ -8,6 +8,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/upper/db/v4"
 	"google.golang.org/grpc/codes"
+	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
@@ -31,9 +32,16 @@ type archivedWorkflowMetadata struct {
 	Phase       wfv1.WorkflowPhase `db:"phase"`
 	StartedAt   time.Time          `db:"startedat"`
 	FinishedAt  time.Time          `db:"finishedat"`
-	Labels      string             `db:"labels,omitempty"`
-	Annotations string             `db:"annotations,omitempty"`
-	Progress    string             `db:"progress,omitempty"`
+
+	// The following fields are not stored as columns in the database, and they are stored as JSON strings in the workflow column, and will be loaded from there.
+	CreationTimestamp string `db:"creationtimestamp,omitempty"`
+	Labels            string `db:"labels,omitempty"`
+	Annotations       string `db:"annotations,omitempty"`
+	Suspend           *bool  `db:"suspend,omitempty"`
+	Message           string `db:"message,omitempty"`
+	Progress          string `db:"progress,omitempty"`
+	EstimatedDuration int    `db:"estimatedduration,omitempty"`
+	ResourcesDuration string `db:"resourcesduration,omitempty"`
 }
 
 type archivedWorkflowRecord struct {
@@ -182,20 +190,36 @@ func (r *workflowArchive) ListWorkflows(options sutils.ListOptions) (wfv1.Workfl
 			return nil, err
 		}
 
+		t, err := time.Parse(time.RFC3339, md.CreationTimestamp)
+		if err != nil {
+			return nil, err
+		}
+
+		resourcesDuration := make(map[corev1.ResourceName]wfv1.ResourceDuration)
+		if err := json.Unmarshal([]byte(md.ResourcesDuration), &resourcesDuration); err != nil {
+			return nil, err
+		}
+
 		wfs[i] = wfv1.Workflow{
 			ObjectMeta: v1.ObjectMeta{
 				Name:              md.Name,
 				Namespace:         md.Namespace,
 				UID:               types.UID(md.UID),
-				CreationTimestamp: v1.Time{Time: md.StartedAt},
+				CreationTimestamp: v1.Time{Time: t},
 				Labels:            labels,
 				Annotations:       annotations,
 			},
+			Spec: wfv1.WorkflowSpec{
+				Suspend: md.Suspend,
+			},
 			Status: wfv1.WorkflowStatus{
-				Phase:      md.Phase,
-				StartedAt:  v1.Time{Time: md.StartedAt},
-				FinishedAt: v1.Time{Time: md.FinishedAt},
-				Progress:   wfv1.Progress(md.Progress),
+				Phase:             md.Phase,
+				StartedAt:         v1.Time{Time: md.StartedAt},
+				FinishedAt:        v1.Time{Time: md.FinishedAt},
+				Progress:          wfv1.Progress(md.Progress),
+				Message:           md.Message,
+				EstimatedDuration: wfv1.EstimatedDuration(md.EstimatedDuration),
+				ResourcesDuration: resourcesDuration,
 			},
 		}
 	}
@@ -356,9 +380,9 @@ func (r *workflowArchive) DeleteExpiredWorkflows(ttl time.Duration) error {
 func selectArchivedWorkflowQuery(t dbType) (*db.RawExpr, error) {
 	switch t {
 	case MySQL:
-		return db.Raw("name, namespace, uid, phase, startedat, finishedat, coalesce(workflow->>'$.metadata.labels', '{}') as labels,coalesce(workflow->>'$.metadata.annotations', '{}') as annotations, coalesce(workflow->>'$.status.progress', '') as progress"), nil
+		return db.Raw("name, namespace, uid, phase, startedat, finishedat, coalesce(workflow->>'$.metadata.labels', '{}') as labels,coalesce(workflow->>'$.metadata.annotations', '{}') as annotations, coalesce(workflow->>'$.status.progress', '') as progress, coalesce(workflow->>'$.metadata.creationTimestamp', '') as creationtimestamp, workflow->>'$.spec.suspend' as suspend, coalesce(workflow->>'$.status.message', '') as message, coalesce(workflow->>'$.status.estimatedDuration', '0') as estimatedduration, coalesce(workflow->>'$.status.resourcesDuration', '{}') as resourcesduration"), nil
 	case Postgres:
-		return db.Raw("name, namespace, uid, phase, startedat, finishedat, coalesce((workflow::json)->'metadata'->>'labels', '{}') as labels, coalesce((workflow::json)->'metadata'->>'annotations', '{}') as annotations, coalesce((workflow::json)->'status'->>'progress', '') as progress"), nil
+		return db.Raw("name, namespace, uid, phase, startedat, finishedat, coalesce((workflow::json)->'metadata'->>'labels', '{}') as labels, coalesce((workflow::json)->'metadata'->>'annotations', '{}') as annotations, coalesce((workflow::json)->'status'->>'progress', '') as progress, coalesce((workflow::json)->'metadata'->>'creationTimestamp', '') as creationtimestamp, (workflow::json)->'spec'->>'suspend' as suspend, coalesce((workflow::json)->'status'->>'message', '') as message, coalesce((workflow::json)->'status'->>'estimatedDuration', '0') as estimatedduration, coalesce((workflow::json)->'status'->>'resourcesDuration', '{}') as resourcesduration"), nil
 	}
 	return nil, fmt.Errorf("unsupported db type %s", t)
 }