fix(status): correctly display duration of stopped workflows (reanahu…

…b#156) Closes reanahub/reana-client#699
giuseppe-steduto · Jan 29, 2024 · 233c616 · 233c616
1 parent d70f5e0
commit 233c616
Show file tree

Hide file tree

Showing 7 changed files with 181 additions and 10 deletions.
diff --git a/client/operations/get_workflow_status_responses.go b/client/operations/get_workflow_status_responses.go
diff --git a/client/operations/get_workflows_responses.go b/client/operations/get_workflows_responses.go
diff --git a/client/operations/launch_responses.go b/client/operations/launch_responses.go
diff --git a/cmd/list.go b/cmd/list.go
@@ -255,6 +255,7 @@ func displayListPayload(
 				value, err = workflows.GetDuration(
 					workflow.Progress.RunStartedAt,
 					workflow.Progress.RunFinishedAt,
+					workflow.Progress.RunStoppedAt,
 				)
 				if err != nil {
 					return err

diff --git a/cmd/status.go b/cmd/status.go
@@ -153,6 +153,7 @@ func displayStatusPayload(
 			value, err = workflows.GetDuration(
 				p.Progress.RunStartedAt,
 				p.Progress.RunFinishedAt,
+				p.Progress.RunStoppedAt,
 			)
 			if err != nil {
 				return err

diff --git a/pkg/workflows/utils.go b/pkg/workflows/utils.go
@@ -27,7 +27,7 @@ func GetNameAndRunNumber(workflowName string) (string, string) {
 }
 
 // GetDuration calculates and returns the duration the workflow, based on the given timestamps.
-func GetDuration(runStartedAt, runFinishedAt *string) (any, error) {
+func GetDuration(runStartedAt, runFinishedAt *string, runStoppedAt *string) (any, error) {
 	if runStartedAt == nil {
 		return nil, nil
 	}
@@ -43,6 +43,11 @@ func GetDuration(runStartedAt, runFinishedAt *string) (any, error) {
 		if err != nil {
 			return nil, err
 		}
+	} else if runStoppedAt != nil {
+		endTime, err = datautils.FromIsoToTimestamp(*runStoppedAt)
+		if err != nil {
+			return nil, err
+		}
 	} else {
 		endTime = time.Now()
 	}

diff --git a/pkg/workflows/utils_test.go b/pkg/workflows/utils_test.go
@@ -45,16 +45,33 @@ func TestGetDuration(t *testing.T) {
 	tests := map[string]struct {
 		runStartedAt  *string
 		runFinishedAt *string
+		runStoppedAt  *string
 		want          any
 		wantError     bool
 	}{
 		"finished instantly":    {runStartedAt: &curTime, runFinishedAt: &curTime, want: 0.0},
 		"finished in 1 second":  {runStartedAt: &curTime, runFinishedAt: &future, want: 1.0},
 		"finished before start": {runStartedAt: &curTime, runFinishedAt: &past, want: -1.0},
-		"nil arguments":         {runStartedAt: nil, runFinishedAt: nil, want: nil},
-		"nil start":             {runStartedAt: nil, runFinishedAt: &curTime, want: nil},
-		"nil finish":            {runStartedAt: &curTime, runFinishedAt: nil},
-		"bad start format":      {runStartedAt: &badFormat, wantError: true},
+		"stopped in 1 second": {
+			runStartedAt:  &curTime,
+			runFinishedAt: nil,
+			runStoppedAt:  &future,
+			want:          1.0,
+		},
+		"nil arguments": {
+			runStartedAt:  nil,
+			runFinishedAt: nil,
+			runStoppedAt:  nil,
+			want:          nil,
+		},
+		"nil start":        {runStartedAt: nil, runFinishedAt: &curTime, want: nil},
+		"nil finish":       {runStartedAt: &curTime, runFinishedAt: nil},
+		"bad start format": {runStartedAt: &badFormat, wantError: true},
+		"bad stop format": {
+			runStartedAt: &curTime,
+			runStoppedAt: &badFormat,
+			wantError:    true,
+		},
 		"bad finish format": {
 			runStartedAt:  &curTime,
 			runFinishedAt: &badFormat,
@@ -63,7 +80,7 @@ func TestGetDuration(t *testing.T) {
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			got, err := GetDuration(test.runStartedAt, test.runFinishedAt)
+			got, err := GetDuration(test.runStartedAt, test.runFinishedAt, test.runStoppedAt)
 			if test.wantError {
 				if err == nil {
 					t.Errorf("Expected error, got nil")