Skip to content

fix: requested-reviewer events dont break transform when requesting team reviews #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2024
Merged

fix: requested-reviewer events dont break transform when requesting team reviews #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions packages/functions/transform/src/merge-request-metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,14 +846,14 @@ async function selectForgeUsers<K>(db: TransformDatabase, users: { key: K, userI
break;
case 'review_requested':
const requestedReviewerId = (u.data as extract.ReviewRequestedEvent).requestedReviewerId;
if (!uniqueUserQuery.has(requestedReviewerId)) {
if (requestedReviewerId !== undefined && !uniqueUserQuery.has(requestedReviewerId)) {
uniqueUserQuery.set(requestedReviewerId, requestedReviewerId);
userQuery.push(eq(transformForgeUsers.externalId, requestedReviewerId));
}
break;
case 'review_request_removed':
const requestedReviewerRemovedId = (u.data as extract.ReviewRequestedEvent).requestedReviewerId;
if (!uniqueUserQuery.has(requestedReviewerRemovedId)) {
const requestedReviewerRemovedId = (u.data as extract.ReviewRequestRemovedEvent).requestedReviewerId;
if (requestedReviewerRemovedId !== undefined && !uniqueUserQuery.has(requestedReviewerRemovedId)) {
uniqueUserQuery.set(requestedReviewerRemovedId, requestedReviewerRemovedId);
userQuery.push(eq(transformForgeUsers.externalId, requestedReviewerRemovedId));
}
Expand Down Expand Up @@ -893,10 +893,12 @@ async function selectForgeUsers<K>(db: TransformDatabase, users: { key: K, userI
userIdentifier = (u.data as extract.UnassignedEvent).assigneeId;
break;
case 'review_requested':
userIdentifier = (u.data as extract.ReviewRequestedEvent).requestedReviewerId;
const requestedReviewerId = (u.data as extract.ReviewRequestedEvent).requestedReviewerId;
userIdentifier = requestedReviewerId === undefined ? null : requestedReviewerId;
break;
case 'review_request_removed':
userIdentifier = (u.data as extract.ReviewRequestRemovedEvent).requestedReviewerId;
const unrequestedReviewerId = (u.data as extract.ReviewRequestRemovedEvent).requestedReviewerId
userIdentifier = unrequestedReviewerId === undefined ? null : unrequestedReviewerId;
break;
default:
userIdentifier = null;
Expand Down
8 changes: 4 additions & 4 deletions packages/schemas/extract/src/timeline-events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ export const CommittedEventSchema = z.object({


export const ReviewRequestRemovedEventSchema = z.object({
requestedReviewerId: z.number(),
requestedReviewerName: z.string(),
requestedReviewerId: z.number().optional(),
requestedReviewerName: z.string().optional(),
});

export const ReviewRequestedEventSchema = z.object({
requestedReviewerId: z.number(),
requestedReviewerName: z.string(),
requestedReviewerId: z.number().optional(),
requestedReviewerName: z.string().optional(),
});

export const ReviewedEventSchema = z.object({
Expand Down