Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions packages/das/src/webhook/github-fetcher.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -931,26 +931,29 @@ export class GitHubFetcherService implements OnModuleInit {
break;
}

await this.issueRepo.upsert(
{
repoFullName,
issueNumber: issue.number,
authorGithubId: String(issue.author?.databaseId ?? ""),
authorLogin: issue.author?.login ?? null,
authorAssociation: issue.authorAssociation ?? null,
title: issue.title,
state: issue.state, // OPEN / CLOSED
stateReason: issue.stateReason ?? null,
createdAt: issue.createdAt,
closedAt: issue.closedAt ?? null,
updatedAt: issue.updatedAt ?? null,
lastEditedAt: issue.lastEditedAt ?? null,
labels: (issue.labels?.nodes ?? []).map(
(l: { name: string }) => l.name,
),
},
["repoFullName", "issueNumber"],
);
const issueData: Partial<Issue> = {
repoFullName,
issueNumber: issue.number,
authorGithubId: String(issue.author?.databaseId ?? ""),
authorLogin: issue.author?.login ?? null,
authorAssociation: issue.authorAssociation ?? null,
title: issue.title,
state: issue.state, // OPEN / CLOSED
stateReason: issue.stateReason ?? null,
createdAt: issue.createdAt,
closedAt: issue.closedAt ?? null,
updatedAt: issue.updatedAt ?? null,
lastEditedAt: issue.lastEditedAt ?? null,
labels: (issue.labels?.nodes ?? []).map(
(l: { name: string }) => l.name,
),
};

if (issue.state === "OPEN") {
issueData.solvedByPr = null;
}

await this.issueRepo.upsert(issueData, ["repoFullName", "issueNumber"]);

// Upsert label events for this issue
await this.saveLabelTimelineEvents(
Expand Down
7 changes: 6 additions & 1 deletion packages/das/src/webhook/handlers/issue.handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,26 @@ export class IssueHandler {
// Skip pull request events delivered as issue events
if (issue.pull_request) return;

const issueState = issue.state.toUpperCase();
const data: Partial<Issue> = {
repoFullName,
issueNumber: issue.number,
authorGithubId: String(issue.user.id),
authorLogin: issue.user.login,
authorAssociation: issue.author_association,
title: issue.title ?? null,
state: issue.state.toUpperCase(),
state: issueState,
stateReason: issue.state_reason?.toUpperCase() ?? null,
createdAt: issue.created_at,
closedAt: issue.closed_at ?? null,
updatedAt: issue.updated_at ?? null,
labels: (issue.labels ?? []).map((l: any) => l.name),
};

if (issueState === "OPEN") {
data.solvedByPr = null;
}

// The `edited` action fires specifically for body or title changes.
// Use the webhook's updated_at as the precise edit timestamp — for
// other actions (labeled, closed, commented, etc.) don't touch
Expand Down
Loading