Skip to content

Commit c3ef01f

Browse files
committed
fix(forgejo): merged and closed pull request lists only return their own rows
Forgejo's API has no merged list state, so a merged list queries state=closed and gets merged and closed-unmerged rows alike. The provider pushed every row without filtering, so the Merged list showed closed-unmerged pull requests, the Closed list showed merged ones, and both consumed their page budget on rows the client then discarded. Filter rows by their mapped state (the row schema already decodes merged) and count only matching rows toward the requested limit; the cursor still advances over raw rows so paging stays consistent.
1 parent e9d6125 commit c3ef01f

2 files changed

Lines changed: 64 additions & 3 deletions

File tree

‎packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.test.ts‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,58 @@ it.effect("reads file revisions from the pull request diff and refuses a truncat
6666
assert.strictEqual(refused._tag, "PullRequestProviderError");
6767
}),
6868
);
69+
70+
it.effect("filters listed pull requests by the requested state", () =>
71+
Effect.gen(function* () {
72+
// Forgejo answers a `state=closed` query with merged and closed-unmerged rows alike.
73+
const rows = [true, false].map((merged) => ({
74+
number: merged ? 1 : 2,
75+
title: `Pull request ${merged ? 1 : 2}`,
76+
body: "",
77+
html_url: `https://forge.example:3000/maria/project/pulls/${merged ? 1 : 2}`,
78+
user: { login: "maria" },
79+
state: "closed",
80+
merged,
81+
head: { ref: "feature", sha: "head-sha", repo: null },
82+
base: { ref: "main", sha: "base-sha", repo: null },
83+
created_at: "2026-10-12T00:00:00Z",
84+
updated_at: "2026-10-12T00:00:00Z",
85+
closed_at: "2026-10-13T00:00:00Z",
86+
merged_at: merged ? "2026-10-13T00:00:00Z" : null,
87+
labels: [],
88+
}));
89+
const provider = yield* ForgejoPullRequestProvider.make.pipe(
90+
Effect.provide(
91+
Layer.mock(ForgejoCli.ForgejoCli)({
92+
api: (input) => {
93+
const [path, query] = input.path.split("?");
94+
assert.strictEqual(path, "repos/maria/project/pulls");
95+
const params = new URLSearchParams(query);
96+
// A merged list asks Forgejo for closed rows and separates them itself.
97+
const state = params.get("state");
98+
assert.ok(state === "closed" || state === "open" || state === "all");
99+
const page = params.get("page") === "1" && state !== "open" ? rows : [];
100+
return Effect.succeed(TestSourceControlHost.processOutput(JSON.stringify(page)));
101+
},
102+
}),
103+
),
104+
);
105+
const input = {
106+
cwd: "/forgejo",
107+
repository: "maria/project",
108+
host: "forge.example:3000",
109+
involvement: "all" as const,
110+
viewer: "maria",
111+
limit: 10,
112+
};
113+
const numbers = (state: "open" | "closed" | "merged" | "all") =>
114+
provider
115+
.listChangeRequests({ ...input, state })
116+
.pipe(Effect.map((page) => page.items.map((item) => item.number)));
117+
118+
assert.deepStrictEqual(yield* numbers("merged"), [1]);
119+
assert.deepStrictEqual(yield* numbers("closed"), [2]);
120+
assert.deepStrictEqual(yield* numbers("all"), [1, 2]);
121+
assert.deepStrictEqual(yield* numbers("open"), []);
122+
}),
123+
);

‎packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,16 +308,22 @@ export const make = Effect.gen(function* () {
308308
const firstIndex = Math.floor(offset / pageSize) + 1;
309309
let consumed = 0;
310310
let more = true;
311-
for (let index = firstIndex; more && consumed < input.limit; index++) {
311+
// Forgejo has no `merged` list state: `state=closed` returns merged and
312+
// closed-unmerged rows alike, so rows are filtered by their mapped state and
313+
// only matching rows count toward the requested limit.
314+
for (let index = firstIndex; more && items.length < input.limit; index++) {
312315
const result =
313316
index === 1 ? first : yield* readPage(query, Schema.NullOr(ForgejoPullRequest), index);
314317
const rows = result.rows;
315318
const start = index === firstIndex ? offset % pageSize : 0;
316319
const countBefore = consumed;
317320
for (const row of rows.slice(start)) {
318-
if (consumed >= input.limit) break;
321+
if (items.length >= input.limit) break;
319322
consumed++;
320-
if (row) items.push(forgejoChangeRequest(row));
323+
if (!row) continue;
324+
const changeRequest = forgejoChangeRequest(row);
325+
if (input.state !== "all" && changeRequest.state !== input.state) continue;
326+
items.push(changeRequest);
321327
}
322328
more = result.more || rows.length - start > consumed - countBefore;
323329
}

0 commit comments

Comments
 (0)