Skip to content

Commit 233316f

Browse files
committed
TaskRun.startedAt will now be lazily migrated
1 parent 1b90ffb commit 233316f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

apps/webapp/app/presenters/v3/ApiRetrieveRunPresenter.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export class ApiRetrieveRunPresenter extends BasePresenter {
8080
version: taskRun.lockedToVersion ? taskRun.lockedToVersion.version : undefined,
8181
createdAt: taskRun.createdAt ?? undefined,
8282
updatedAt: taskRun.updatedAt ?? undefined,
83-
startedAt: taskRun.startedAt ?? undefined,
83+
startedAt: taskRun.startedAt ?? taskRun.lockedAt ?? undefined,
8484
finishedAt: ApiRetrieveRunPresenter.isStatusFinished(apiStatus)
8585
? taskRun.updatedAt
8686
: undefined,

apps/webapp/app/presenters/v3/RunListPresenter.server.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ export class RunListPresenter extends BasePresenter {
157157
status: TaskRunStatus;
158158
createdAt: Date;
159159
startedAt: Date | null;
160+
lockedAt: Date | null;
160161
updatedAt: Date;
161162
isTest: boolean;
162163
spanId: string;
@@ -173,6 +174,7 @@ export class RunListPresenter extends BasePresenter {
173174
tr.status AS status,
174175
tr."createdAt" AS "createdAt",
175176
tr."startedAt" AS "startedAt",
177+
tr."lockedAt" AS "lockedAt",
176178
tr."updatedAt" AS "updatedAt",
177179
tr."isTest" AS "isTest",
178180
tr."spanId" AS "spanId",
@@ -272,13 +274,15 @@ export class RunListPresenter extends BasePresenter {
272274

273275
const hasFinished = FINISHED_STATUSES.includes(run.status);
274276

277+
const startedAt = run.startedAt ?? run.lockedAt;
278+
275279
return {
276280
id: run.id,
277281
friendlyId: run.runFriendlyId,
278282
number: Number(run.number),
279283
createdAt: run.createdAt.toISOString(),
280284
updatedAt: run.updatedAt.toISOString(),
281-
startedAt: run.startedAt ? run.startedAt.toISOString() : undefined,
285+
startedAt: startedAt ? startedAt.toISOString() : undefined,
282286
hasFinished,
283287
finishedAt: hasFinished ? run.updatedAt.toISOString() : undefined,
284288
isTest: run.isTest,

apps/webapp/app/presenters/v3/TaskListPresenter.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ export class TaskListPresenter extends BasePresenter {
311311
>`
312312
SELECT
313313
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
315315
FROM
316316
${sqlDatabaseSchema}."TaskRun" as tr
317317
WHERE

0 commit comments

Comments
 (0)