Skip to content

Commit 3cd48f0

Browse files
committed
fix(server): report automatically settled PR threads
1 parent 7b0f271 commit 3cd48f0

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

‎apps/server/src/pullRequest/linkedThreads.test.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ it.effect(
4747
source: "manual",
4848
},
4949
{ id: "settled", host: "github.com", repository: "acme/web", number: 7, source: "manual" },
50+
{
51+
id: "auto-settled",
52+
host: "github.com",
53+
repository: "acme/web",
54+
number: 7,
55+
source: "manual",
56+
},
5057
{ id: "active", host: "github.com", repository: "acme/web", number: 7, source: "manual" },
5158
{
5259
id: "archived",
@@ -96,6 +103,7 @@ it.effect(
96103
const payload = yield* encodePayload({
97104
linkedPullRequest: null,
98105
settledOverride: ["settled", "archived"].includes(fixture.id) ? "settled" : null,
106+
settledAt: fixture.id === "auto-settled" ? archivedAt : null,
99107
...(fixture.id === "side-chat" ? { lineage: { sideChat: true } } : {}),
100108
pullRequests: [{ ...fixture, linkedAt: createdAt, snapshot: null, stack: null }],
101109
});
@@ -175,6 +183,13 @@ it.effect(
175183
archivedAt: null,
176184
settled: false,
177185
},
186+
{
187+
id: "auto-settled",
188+
projectId: "project-1",
189+
title: "auto-settled",
190+
archivedAt: null,
191+
settled: true,
192+
},
178193
{
179194
id: "settled",
180195
projectId: "project-1",

‎apps/server/src/pullRequest/linkedThreads.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ export const listLinkedPullRequestThreads = Effect.fn("listLinkedPullRequestThre
3131
}>`
3232
SELECT t.thread_id AS id, t.project_id AS "projectId", t.title,
3333
t.archived_at AS "archivedAt",
34-
(json_extract(t.payload_json, '$.settledOverride') IS 'settled') AS settled,
34+
(json_extract(t.payload_json, '$.settledAt') IS NOT NULL
35+
OR json_extract(t.payload_json, '$.settledOverride') IS 'settled') AS settled,
3536
json_extract(link.value, '$.host') AS host,
3637
json_extract(link.value, '$.repository') AS repository,
3738
json_extract(link.value, '$.number') AS number,

0 commit comments

Comments
 (0)