Restore lastActivity logic

Author: aledbf

components/ws-manager-mk2/service/manager.go

@@ -464,7 +464,7 @@ func (wsm *WorkspaceManagerServer) DescribeWorkspace(ctx context.Context, req *w
 		Status: wsm.extractWorkspaceStatus(&ws),
 	}
 
-	lastActivity := ws.Status.LastActivity
+	lastActivity := getLastActivity(&ws)
 	if lastActivity != nil {
 		result.LastActivity = lastActivity.UTC().Format(time.RFC3339Nano)
 	}
@@ -1483,7 +1483,7 @@ func (wav *workspaceActivityVec) getWorkspaceActivityCounts() (active, notActive
 			continue
 		}
 
-		hasActivity := ws.Status.LastActivity != nil
+		hasActivity := getLastActivity(&ws) != nil
 		if hasActivity {
 			active++
 		} else {
@@ -1493,3 +1493,21 @@ func (wav *workspaceActivityVec) getWorkspaceActivityCounts() (active, notActive
 
 	return
 }
+
+func getLastActivity(ws *workspacev1.Workspace) *time.Time {
+	lastActivity := ws.Status.LastActivity
+	if lastActivity != nil {
+		return &lastActivity.Time
+	}
+
+	// In case we don't have a record of the workspace's last activity, check for the FirstUserActivity condition
+	// to see if the lastActivity got lost on a manager restart.
+	if ws.IsConditionTrue(workspacev1.WorkspaceConditionFirstUserActivity) {
+		now := time.Now().UTC()
+		lastActivityStatus := metav1.NewTime(now)
+		return &lastActivityStatus.Time
+	}
+
+	// If the FirstUserActivity condition isn't present we know that the workspace has never had user activity.
+	return nil
+}