fix: anomolies in deployment status timeline

Author: Ash-exp

pkg/app/AppService.go

@@ -610,6 +610,7 @@ func (impl *AppServiceImpl) UpdatePipelineStatusTimelineForApplicationChanges(ap
 				haveNewTimeline = true
 				timeline.Status = timelineStatus.TIMELINE_STATUS_APP_HEALTHY
 				timeline.StatusDetail = "App status is Healthy."
+				timeline.StatusTime = statusTime
 			}
 			if haveNewTimeline {
 				// not checking if this status is already present or not because already checked for terminal status existence earlier

pkg/app/status/PipelineStatusTimelineResourcesService.go

@@ -92,18 +92,24 @@ func (impl *PipelineStatusTimelineResourcesServiceImpl) SaveOrUpdatePipelineTime
 	if application != nil && application.Status.OperationState != nil && application.Status.OperationState.SyncResult != nil {
 		for _, resource := range application.Status.OperationState.SyncResult.Resources {
 			if resource != nil {
+				resourceStatus := string(resource.HookPhase)
+				if len(resourceStatus) == 0 {
+					resourceStatus = string(resource.Status)
+				}
+				//if resource is already present in the timelineResources, then update it
 				if index, ok := oldTimelineResourceMap[resource.Name]; ok {
-					timelineResources[index].ResourceStatus = string(resource.HookPhase)
+					timelineResources[index].ResourceStatus = resourceStatus
 					timelineResources[index].StatusMessage = resource.Message
 					timelineResources[index].UpdatedBy = userId
 					timelineResources[index].UpdatedOn = time.Now()
 					timelineResourcesToBeUpdated = append(timelineResourcesToBeUpdated, timelineResources[index])
 				} else {
+					//if resource is not present in the timelineResources, then create a new one
 					newTimelineResource := &pipelineConfig.PipelineStatusTimelineResources{
 						ResourceName:   resource.Name,
 						ResourceKind:   resource.Kind,
 						ResourceGroup:  resource.Group,
-						ResourceStatus: string(resource.HookPhase),
+						ResourceStatus: resourceStatus,
 						StatusMessage:  resource.Message,
 						AuditLog: sql.AuditLog{
 							CreatedBy: userId,

pkg/argoApplication/helper/deploymentStatusHelper.go

@@ -10,13 +10,14 @@ import (
 func GetSyncStartTime(app *v1alpha1.Application, defaultStartTime time.Time) time.Time {
 	startTime := metav1.NewTime(defaultStartTime)
 	gitHash := app.Status.Sync.Revision
-	if app.Status.OperationState != nil {
+	if app.Status.OperationState != nil &&
+		app.Status.OperationState.Operation.Sync != nil &&
+		app.Status.OperationState.Operation.Sync.Revision == gitHash {
 		startTime = app.Status.OperationState.StartedAt
-	} else if app.Status.History != nil {
-		for _, history := range app.Status.History {
-			if history.Revision == gitHash {
-				startTime = *history.DeployStartedAt
-			}
+	} else if len(app.Status.History) != 0 {
+		if app.Status.History.LastRevisionHistory().Revision == gitHash &&
+			app.Status.History.LastRevisionHistory().DeployStartedAt != nil {
+			startTime = *app.Status.History.LastRevisionHistory().DeployStartedAt
 		}
 	}
 	return startTime.Time
@@ -26,7 +27,10 @@ func GetSyncStartTime(app *v1alpha1.Application, defaultStartTime time.Time) tim
 func GetSyncFinishTime(app *v1alpha1.Application, defaultEndTime time.Time) time.Time {
 	finishTime := metav1.NewTime(defaultEndTime)
 	gitHash := app.Status.Sync.Revision
-	if app.Status.OperationState != nil && app.Status.OperationState.FinishedAt != nil {
+	if app.Status.OperationState != nil &&
+		app.Status.OperationState.Operation.Sync != nil &&
+		app.Status.OperationState.Operation.Sync.Revision == gitHash &&
+		app.Status.OperationState.FinishedAt != nil {
 		finishTime = *app.Status.OperationState.FinishedAt
 	} else if app.Status.History != nil {
 		for _, history := range app.Status.History {