fix: handle error when branch already exists #48
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,25 @@ | ||
| const { | ||
| ResourceNotFoundError, | ||
| AllContributorBotError, | ||
| } = require('../utils/errors') | ||
|
|
||
| class Repository { | ||
| constructor({ repo, owner, github, defaultBranch }) { | ||
| this.github = github | ||
| this.repo = repo | ||
| this.owner = owner | ||
| this.defaultBranch = defaultBranch | ||
| this.basedBranch | ||
| } | ||
|
|
||
| getFullname() { | ||
| return `${this.owner}/${this.repo}` | ||
| } | ||
|
|
||
| setBasedBranch(branchName) { | ||
| this.basedBranch = branchName | ||
| } | ||
|
|
||
| async getFile(filePath) { | ||
| // https://octokit.github.io/rest.js/#api-Repos-getContents | ||
| let file | ||
|
|
@@ -19,6 +28,7 @@ class Repository { | |
| owner: this.owner, | ||
| repo: this.repo, | ||
| path: filePath, | ||
| ref: this.basedBranch, | ||
| }) | ||
| } catch (error) { | ||
| if (error.status === 404) { | ||
|
|
@@ -61,17 +71,17 @@ class Repository { | |
| return multipleFilesByPath | ||
| } | ||
|
|
||
| async getHeadRef(branchName) { | ||
sinchang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const result = await this.github.git.getRef({ | ||
|
There was a problem hiding this comment. Instead of checking 404 above when called. Can we throw an error here? (BranchAlreadyExists) and catch that |
||
| owner: this.owner, | ||
| repo: this.repo, | ||
| ref: `heads/${branchName}`, | ||
| }) | ||
| return result.data.object.sha | ||
| } | ||
|
|
||
| async createBranch(branchName) { | ||
| const fromSha = await this.getHeadRef(this.defaultBranch) | ||
|
|
||
| // https://octokit.github.io/rest.js/#api-Git-createRef | ||
| await this.github.git.createRef({ | ||
|
|
@@ -140,41 +150,41 @@ class Repository { | |
| await Promise.all(createOrUpdateFilesMultiple) | ||
| } | ||
|
|
||
| async createPullRequest({ title, body, branchName }) { | ||
| const result = await this.github.pulls.create({ | ||
| owner: this.owner, | ||
| repo: this.repo, | ||
| title, | ||
| body, | ||
| head: branchName, | ||
| base: this.defaultBranch, | ||
| maintainer_can_modify: true, | ||
| }) | ||
| return result.data.html_url | ||
| } | ||
|
|
||
| async createPullRequestFromFiles({ title, body, filesByPath, branchName }) { | ||
| if (this.basedBranch === this.defaultBranch) | ||
sinchang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| await this.createBranch(branchName) | ||
|
|
||
| await this.createOrUpdateFiles({ | ||
| filesByPath, | ||
| branchName, | ||
| }) | ||
|
|
||
| try { | ||
| const pullRequestURL = await this.createPullRequest({ | ||
| title, | ||
| body, | ||
| branchName, | ||
| }) | ||
| return pullRequestURL | ||
| } catch (error) { | ||
|
There was a problem hiding this comment. This catch and error thrown should be done in the |
||
| if (error.status === 422) | ||
| throw new AllContributorBotError('Pull request is already open') | ||
|
There was a problem hiding this comment. Can we add a link? I don't think this should error too, could we handle this as a reply case here: (https://github.com/all-contributors/all-contributors-bot/blob/master/src/processIssueComment.js#L65-L67) e.g. can throw the error, but catch it here |
||
|
|
||
| throw error | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder how we can take the latest master file and overwrite the current branch :think: like a rebase
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We probably shouldn't address this here. This is probably a whole ticket in itself. #62.
I'm interested in hearing how you would solve this problem tho.