Skip to content

Commit 12851f2

Browse files
committed
Avoid duplicate code
1 parent 73a5a7c commit 12851f2

File tree

1 file changed

+1
-75
lines changed

1 file changed

+1
-75
lines changed

services/migrations/github.go

Lines changed: 1 addition & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -576,81 +576,7 @@ func (g *GithubDownloaderV3) getAllCommentsSince(page, perPage int, since *time.
576576

577577
// GetPullRequests returns pull requests according page and perPage
578578
func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullRequest, bool, error) {
579-
if perPage > g.maxPerPage {
580-
perPage = g.maxPerPage
581-
}
582-
opt := &github.PullRequestListOptions{
583-
Sort: "created",
584-
Direction: "asc",
585-
State: "all",
586-
ListOptions: github.ListOptions{
587-
PerPage: perPage,
588-
Page: page,
589-
},
590-
}
591-
allPRs := make([]*base.PullRequest, 0, perPage)
592-
g.waitAndPickClient()
593-
prs, resp, err := g.getClient().PullRequests.List(g.ctx, g.repoOwner, g.repoName, opt)
594-
if err != nil {
595-
return nil, false, fmt.Errorf("error while listing repos: %w", err)
596-
}
597-
log.Trace("Request get pull requests %d/%d, but in fact get %d", perPage, page, len(prs))
598-
g.setRate(&resp.Rate)
599-
for _, pr := range prs {
600-
labels := make([]*base.Label, 0, len(pr.Labels))
601-
for _, l := range pr.Labels {
602-
labels = append(labels, convertGithubLabel(l))
603-
}
604-
605-
// get reactions
606-
reactions, err := g.getIssueReactions(pr.GetNumber(), perPage)
607-
if err != nil {
608-
return nil, false, err
609-
}
610-
611-
// download patch and saved as tmp file
612-
g.waitAndPickClient()
613-
614-
allPRs = append(allPRs, &base.PullRequest{
615-
Title: pr.GetTitle(),
616-
Number: int64(pr.GetNumber()),
617-
PosterID: pr.GetUser().GetID(),
618-
PosterName: pr.GetUser().GetLogin(),
619-
PosterEmail: pr.GetUser().GetEmail(),
620-
Content: pr.GetBody(),
621-
Milestone: pr.GetMilestone().GetTitle(),
622-
State: pr.GetState(),
623-
Created: pr.GetCreatedAt(),
624-
Updated: pr.GetUpdatedAt(),
625-
Closed: pr.ClosedAt,
626-
Labels: labels,
627-
Merged: pr.MergedAt != nil,
628-
MergeCommitSHA: pr.GetMergeCommitSHA(),
629-
MergedTime: pr.MergedAt,
630-
IsLocked: pr.ActiveLockReason != nil,
631-
Head: base.PullRequestBranch{
632-
Ref: pr.GetHead().GetRef(),
633-
SHA: pr.GetHead().GetSHA(),
634-
OwnerName: pr.GetHead().GetUser().GetLogin(),
635-
RepoName: pr.GetHead().GetRepo().GetName(),
636-
CloneURL: pr.GetHead().GetRepo().GetCloneURL(), // see below for SECURITY related issues here
637-
},
638-
Base: base.PullRequestBranch{
639-
Ref: pr.GetBase().GetRef(),
640-
SHA: pr.GetBase().GetSHA(),
641-
RepoName: pr.GetBase().GetRepo().GetName(),
642-
OwnerName: pr.GetBase().GetUser().GetLogin(),
643-
},
644-
PatchURL: pr.GetPatchURL(), // see below for SECURITY related issues here
645-
Reactions: reactions,
646-
ForeignIndex: int64(*pr.Number),
647-
})
648-
649-
// SECURITY: Ensure that the PR is safe
650-
_ = CheckAndEnsureSafePR(allPRs[len(allPRs)-1], g.baseURL, g)
651-
}
652-
653-
return allPRs, len(prs) < perPage, nil
579+
return g.GetNewPullRequests(page, perPage, time.Time{})
654580
}
655581

656582
func convertGithubReview(r *github.PullRequestReview) *base.Review {

0 commit comments

Comments
 (0)