File tree Expand file tree Collapse file tree 3 files changed +7
-3
lines changed
apps/webapp/app/presenters/v3 Expand file tree Collapse file tree 3 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ export class ApiRetrieveRunPresenter extends BasePresenter {
80
80
version : taskRun . lockedToVersion ? taskRun . lockedToVersion . version : undefined ,
81
81
createdAt : taskRun . createdAt ?? undefined ,
82
82
updatedAt : taskRun . updatedAt ?? undefined ,
83
- startedAt : taskRun . startedAt ?? undefined ,
83
+ startedAt : taskRun . startedAt ?? taskRun . lockedAt ?? undefined ,
84
84
finishedAt : ApiRetrieveRunPresenter . isStatusFinished ( apiStatus )
85
85
? taskRun . updatedAt
86
86
: undefined ,
Original file line number Diff line number Diff line change @@ -157,6 +157,7 @@ export class RunListPresenter extends BasePresenter {
157
157
status : TaskRunStatus ;
158
158
createdAt : Date ;
159
159
startedAt : Date | null ;
160
+ lockedAt : Date | null ;
160
161
updatedAt : Date ;
161
162
isTest : boolean ;
162
163
spanId : string ;
@@ -173,6 +174,7 @@ export class RunListPresenter extends BasePresenter {
173
174
tr.status AS status,
174
175
tr."createdAt" AS "createdAt",
175
176
tr."startedAt" AS "startedAt",
177
+ tr."lockedAt" AS "lockedAt",
176
178
tr."updatedAt" AS "updatedAt",
177
179
tr."isTest" AS "isTest",
178
180
tr."spanId" AS "spanId",
@@ -272,13 +274,15 @@ export class RunListPresenter extends BasePresenter {
272
274
273
275
const hasFinished = FINISHED_STATUSES . includes ( run . status ) ;
274
276
277
+ const startedAt = run . startedAt ?? run . lockedAt ;
278
+
275
279
return {
276
280
id : run . id ,
277
281
friendlyId : run . runFriendlyId ,
278
282
number : Number ( run . number ) ,
279
283
createdAt : run . createdAt . toISOString ( ) ,
280
284
updatedAt : run . updatedAt . toISOString ( ) ,
281
- startedAt : run . startedAt ? run . startedAt . toISOString ( ) : undefined ,
285
+ startedAt : startedAt ? startedAt . toISOString ( ) : undefined ,
282
286
hasFinished,
283
287
finishedAt : hasFinished ? run . updatedAt . toISOString ( ) : undefined ,
284
288
isTest : run . isTest ,
Original file line number Diff line number Diff line change @@ -311,7 +311,7 @@ export class TaskListPresenter extends BasePresenter {
311
311
> `
312
312
SELECT
313
313
tr."taskIdentifier",
314
- AVG(EXTRACT(EPOCH FROM (tr."updatedAt" - tr."startedAt"))) as duration
314
+ AVG(EXTRACT(EPOCH FROM (tr."updatedAt" - COALESCE( tr."startedAt", tr."lockedAt") ))) as duration
315
315
FROM
316
316
${ sqlDatabaseSchema } ."TaskRun" as tr
317
317
WHERE
You can’t perform that action at this time.
0 commit comments