Skip to content

Commit 4ae38b7

Browse files
committed
fix(relay): order environment label updates
1 parent 1ef1fec commit 4ae38b7

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎infra/relay/src/environments/EnvironmentConnector.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ describe("EnvironmentConnector", () => {
365365
userId: "user_123",
366366
environmentId: "env-connector-test",
367367
label: "Studio Mac",
368+
checkedAt: expect.any(String),
368369
},
369370
]);
370371
}).pipe(

‎infra/relay/src/environments/EnvironmentConnector.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ const make = Effect.gen(function* () {
536536
userId: input.userId,
537537
environmentId: input.environmentId,
538538
label: decoded.descriptor.label,
539+
checkedAt: decoded.checkedAt,
539540
})
540541
.pipe(
541542
Effect.tapError((error) =>

‎infra/relay/src/environments/EnvironmentLinks.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,20 @@ describe("EnvironmentLinks", () => {
6868
userId: "user-1",
6969
environmentId: "env-1",
7070
label: "Studio Mac",
71+
checkedAt: "2026-08-20T12:00:00.000Z",
7172
});
7273

7374
expect(updateValues).toHaveLength(1);
7475
expect(updateValues[0]?.environmentLabel).toBe("Studio Mac");
75-
expect(typeof updateValues[0]?.updatedAt).toBe("string");
76+
expect(updateValues[0]?.updatedAt).toBe("2026-08-20T12:00:00.000Z");
7677
expect(whereConditions).toHaveLength(1);
7778

7879
const query = new PgDialect().sqlToQuery(whereConditions[0] as never);
7980
expect(query.sql).toContain('"relay_environment_links"."user_id" = $1');
8081
expect(query.sql).toContain('"relay_environment_links"."environment_id" = $2');
8182
expect(query.sql).toContain('"relay_environment_links"."revoked_at" is null');
82-
expect(query.params).toEqual(["user-1", "env-1"]);
83+
expect(query.sql).toContain('"relay_environment_links"."updated_at" <= $3');
84+
expect(query.params).toEqual(["user-1", "env-1", "2026-08-20T12:00:00.000Z"]);
8385
}).pipe(
8486
Effect.provide(
8587
EnvironmentLinks.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb))),

‎infra/relay/src/environments/EnvironmentLinks.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as DateTime from "effect/DateTime";
99
import * as Effect from "effect/Effect";
1010
import * as Layer from "effect/Layer";
1111
import * as Schema from "effect/Schema";
12-
import { and, eq, isNull, or } from "drizzle-orm";
12+
import { and, eq, isNull, lte, or } from "drizzle-orm";
1313

1414
import * as RelayDb from "../db.ts";
1515
import { relayEnvironmentLinks } from "../persistence/schema.ts";
@@ -150,6 +150,7 @@ export class EnvironmentLinks extends Context.Service<
150150
readonly userId: string;
151151
readonly environmentId: string;
152152
readonly label: string;
153+
readonly checkedAt: string;
153154
}) => Effect.Effect<void, EnvironmentLinkLabelUpdatePersistenceError>;
154155
readonly revokeForUser: (input: {
155156
readonly userId: string;
@@ -419,18 +420,18 @@ const make = Effect.gen(function* () {
419420
yield* Effect.annotateCurrentSpan({
420421
"relay.environment_id": input.environmentId,
421422
});
422-
const updatedAt = DateTime.formatIso(yield* DateTime.now);
423423
yield* db
424424
.update(relayEnvironmentLinks)
425425
.set({
426426
environmentLabel: input.label,
427-
updatedAt,
427+
updatedAt: input.checkedAt,
428428
})
429429
.where(
430430
and(
431431
eq(relayEnvironmentLinks.userId, input.userId),
432432
eq(relayEnvironmentLinks.environmentId, input.environmentId),
433433
isNull(relayEnvironmentLinks.revokedAt),
434+
lte(relayEnvironmentLinks.updatedAt, input.checkedAt),
434435
),
435436
)
436437
.pipe(

0 commit comments

Comments
 (0)