-
Notifications
You must be signed in to change notification settings - Fork 512
Fix bug #3797: Ensure PR is still open before commenting #3804
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.
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
Open
rtyley
wants to merge
2
commits into
main
Choose a base branch
from
ensure-pr-state-is-still-open-before-commenting
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+572
−87
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
88 changes: 88 additions & 0 deletions
88
modules/core/src/main/scala/org/scalasteward/core/nurture/PullRequestService.scala
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Copyright 2018-2025 Scala Steward contributors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.scalasteward.core.nurture | ||
|
|
||
| import cats.* | ||
| import cats.syntax.all.* | ||
| import org.scalasteward.core.data.* | ||
| import org.scalasteward.core.forge.data.{ | ||
| NewPullRequestData, | ||
| PullRequestNumber, | ||
| PullRequestOut, | ||
| PullRequestState | ||
| } | ||
| import org.scalasteward.core.forge.{ForgeApiAlg, ForgeType} | ||
| import org.scalasteward.core.repoconfig.RetractedArtifact | ||
|
|
||
| final class PullRequestService[F[_]]( | ||
| pullRequestRepository: PullRequestRepository[F], | ||
| forgeApiAlg: ForgeApiAlg[F] | ||
| )(implicit | ||
| F: Monad[F] | ||
| ) { | ||
|
|
||
| def createPullRequest( | ||
| updateData: UpdateData, | ||
| requestData: NewPullRequestData | ||
| ): F[PullRequestOut] = for { | ||
| pr <- forgeApiAlg.createPullRequest(updateData.repo, requestData) | ||
| _ <- pullRequestRepository.createOrUpdate(updateData.repo, PullRequestData(pr, updateData)) | ||
| } yield pr | ||
|
|
||
| def listPullRequestsForUpdate(data: UpdateData, forgeType: ForgeType): F[List[PullRequestOut]] = { | ||
| val head = forgeType.pullRequestHeadFor(data.fork, data.updateBranch) | ||
| for { | ||
| pullRequests <- forgeApiAlg.listPullRequests(data.repo, head, data.baseBranch) | ||
| _ <- pullRequests.headOption.traverse_ { pr => | ||
| pullRequestRepository.createOrUpdate(data.repo, PullRequestData(pr, data)) | ||
| } | ||
| } yield pullRequests | ||
| } | ||
|
|
||
| def getObsoleteOpenPullRequests(repo: Repo, update: Update.Single): F[List[PullRequestData[Id]]] = | ||
| flatTraverseOpts(pullRequestRepository.getObsoleteOpenPullRequests(repo, update))( | ||
| refreshAndEnsureStillOpen(repo) | ||
| ) | ||
|
|
||
| def getRetractedOpenPullRequests( | ||
| repo: Repo, | ||
| allRetractedArtifacts: List[RetractedArtifact] | ||
| ): F[List[(PullRequestData[Id], RetractedArtifact)]] = | ||
| flatTraverseOpts( | ||
| pullRequestRepository.getRetractedOpenPullRequests(repo, allRetractedArtifacts) | ||
| ) { case (stalePr, retractedArtifact) => | ||
| refreshAndEnsureStillOpen(repo)(stalePr).map(_.map(_ -> retractedArtifact)) | ||
| } | ||
|
|
||
| private def flatTraverseOpts[T](items: F[List[T]])(f: T => F[Option[T]]): F[List[T]] = | ||
| items.flatMap(_.flatTraverse(f(_).map(_.toList))) | ||
|
|
||
| private def refreshAndEnsureStillOpen( | ||
| repo: Repo | ||
| ): PullRequestData[Id] => F[Option[PullRequestData[Id]]] = { stalePrData => | ||
| for { | ||
| freshPr <- forgeApiAlg.getPullRequest(repo, stalePrData.number) | ||
| _ <- pullRequestRepository.changeState(repo, stalePrData.url, freshPr.state) | ||
| updatedPrData = stalePrData.copy(state = freshPr.state) | ||
| } yield Option.when(updatedPrData.state == PullRequestState.Open)(updatedPrData) | ||
| } | ||
|
|
||
| def closePullRequest(repo: Repo, number: PullRequestNumber): F[PullRequestOut] = for { | ||
| pr <- forgeApiAlg.closePullRequest(repo, number) | ||
| _ <- pullRequestRepository.changeState(repo, pr.html_url, PullRequestState.Closed) | ||
| } yield pr | ||
| } |
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.
This is the key line that actually fixes issue #3797 - instead of just checking our file-based
pullRequestRepositoryto query which of the pull-requests Scala Steward has opened are now obsolete, we now call our newpullRequestService- and that service additionally hits the Forge API to ensure that the PRs we get from thepullRequestRepositoryremain currently open.