refactor the code

This commit is contained in:
Yuki Osaki committed 2021-10-31 22:28:03 +09:00
1 parent c1f3fd6b3f
commit 515e2d2fa9
3 files changed
+12 -4

No files matched your search

+2 -2
View File
@@ -39,11 +39,11 @@ func (c *GitCommand) GenerateGithubPullRequestMap(prs []*models.GithubPullReques
prWithStringKey := map[string]models.GithubPullRequest{}
for _, pr := range prs {
prWithStringKey[pr.HeadRepositoryOwner.Login+":"+pr.HeadRefName] = *pr
prWithStringKey[pr.UserName()+":"+pr.BranchName()] = *pr
}
for _, branch := range branches {
if branch.UpstreamName == "" {
if !branch.IsTrackingRemote() {
continue
}
+2 -2
View File
@@ -99,8 +99,8 @@ func (b *BranchListBuilder) obtainBranches() []*models.Branch {
}
// Build the list of branches for the current repo
func (b *BranchListBuilder) Build() (branches []*models.Branch) {
branches = b.obtainBranches()
func (b *BranchListBuilder) Build() []*models.Branch {
branches := b.obtainBranches()
reflogBranches := b.obtainReflogBranches()
+8
View File
@@ -8,6 +8,14 @@ type GithubPullRequest struct {
HeadRepositoryOwner GithubRepositoryOwner `json:"headRepositoryOwner"`
}
func (pr *GithubPullRequest) UserName() string {
return pr.HeadRepositoryOwner.Login
}
func (pr *GithubPullRequest) BranchName() string {
return pr.HeadRefName
}
type GithubRepositoryOwner struct {
ID string `json:"id"`
Name string `json:"name"`