More grouping

Author: rtyley

modules/core/src/main/scala/org/scalasteward/core/data/Update.scala

@@ -23,6 +23,7 @@ import org.scalasteward.core.repoconfig.PullRequestGroup
 import org.scalasteward.core.util
 import org.scalasteward.core.util.Nel
 import org.scalasteward.core.coursier.VersionsCache.VersionWithFirstSeen
+import org.scalasteward.core.nurture.ApplicableUpdateSet
 
 case class ArtifactForUpdate(
     crossDependency: CrossDependency,
@@ -243,12 +244,20 @@ object Update {
     groups1.toList.distinct.sortBy(u => u: Update.Single)
   }
 
-  def groupByGroupId(updates: List[ForArtifactId]): List[Single] = {
+  /**
+   * If a set of ApplicableUpdateSet all have the same GroupId, then they could be a Update.ForGroupId()
+   *
+   * If there is only one artifact within a ApplicableUpdateSet for a given group id, just create a
+   * Update.ForArtifactId
+   *
+   * Otherwise, create a Grouped()?
+   */
+  def groupByGroupId(updates: List[ApplicableUpdateSet]): List[Single] = {
     val groups0 =
-      updates.groupByNel(s => (s.groupId, s.versionUpdate))
-    val groups1 = groups0.map { case ((_, versionUpdate), group) =>
+      updates.groupByNel(s => (s.commonGroupId, s.commonVersionUpdate))
+    val groups1 = groups0.map { case ((Some(_), Some(versionUpdate)), group) =>
       if (group.tail.isEmpty) group.head
-      else ForGroupId(group.map(_.artifactForUpdate), versionUpdate.nextVersion)
+      else ForGroupId(group.flatMap(_.artifactUpdates), versionUpdate.nextVersion)
     }
     groups1.toList.distinct.sorted
   }
@@ -260,12 +269,12 @@ object Update {
     */
   def groupByPullRequestGroup(
       groups: List[PullRequestGroup],
-      updates: List[Update.ForArtifactId]
-  ): (List[Grouped], List[Update.ForArtifactId]) =
+      updates: List[ApplicableUpdateSet]
+  ): (List[Grouped], List[ApplicableUpdateSet]) =
     groups.foldLeft((List.empty[Grouped], updates)) { case ((grouped, notGrouped), group) =>
       notGrouped.partition(group.matches) match {
         case (Nil, rest)     => (grouped, rest)
-        case (matched, rest) => (grouped :+ Grouped(group.name, group.title, matched), rest)
+        case (matched, rest) => (grouped :+ Grouped(group.name, group.title, matched.flatMap(_.artifactUpdates)), rest)
       }
     }
 

modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala

@@ -23,6 +23,7 @@ import org.scalasteward.core.application.Config.ForgeCfg
 import org.scalasteward.core.coursier.CoursierAlg
 import org.scalasteward.core.data.*
 import org.scalasteward.core.data.ProcessResult.{Created, Ignored, Updated}
+import org.scalasteward.core.edit.update.data.Substring
 import org.scalasteward.core.edit.{EditAlg, EditAttempt}
 import org.scalasteward.core.forge.ForgeType.GitHub
 import org.scalasteward.core.forge.data.*
@@ -35,6 +36,18 @@ import org.scalasteward.core.util.{Nel, UrlChecker}
 import org.scalasteward.core.{git, util}
 import org.typelevel.log4cats.Logger
 
+case class ApplicableUpdateSet(edits: List[Substring.Replacement], artifactUpdates: List[Update.ForArtifactId]) {
+  val commonGroupId: Option[GroupId] = {
+    val updatesByGroupId = artifactUpdates.groupBy(_.groupId)
+    Option.when(updatesByGroupId.size == 1)(updatesByGroupId.keys.head)
+  }
+
+  val commonVersionUpdate: Option[Version.Update] = {
+    val updatesByVersionUpdate = artifactUpdates.groupBy(_.versionUpdate)
+    Option.when(updatesByVersionUpdate.size == 1)(updatesByVersionUpdate.keys.head)
+  }
+}
+
 final class NurtureAlg[F[_]](config: ForgeCfg)(implicit
     coursierAlg: CoursierAlg[F],
     editAlg: EditAlg[F],
@@ -53,13 +66,15 @@ final class NurtureAlg[F[_]](config: ForgeCfg)(implicit
     for {
       _ <- logger.info(s"Nurture ${data.repo.show}")
       baseBranch <- cloneAndSync(data.repo, fork)
-      updatesGroupedByReplacements <- updates.traverse(update => editAlg.findUpdateReplacements(fork.repo, data.config, update).map(update -> _)).map {
-        _.toList.groupMap(_._2)(_._1)
+      applicableUpdateSets <- updates.traverse(update => editAlg.findUpdateReplacements(fork.repo, data.config, update).map(update -> _)).map {
+        x => x.toList.groupMap(_._2)(_._1).map {
+          case (r, a) => ApplicableUpdateSet(r, a)
+        }
       }
 
       (grouped, notGrouped) = Update.groupByPullRequestGroup(
         data.config.pullRequestsOrDefault.groupingOrDefault,
-        updates.toList
+        applicableUpdateSets.toList
       )
       finalUpdates = Update.groupByGroupId(notGrouped) ++ grouped
       _ <- updateDependencies(data, fork.repo, baseBranch, finalUpdates)

modules/core/src/main/scala/org/scalasteward/core/repoconfig/PullRequestGroup.scala

@@ -21,6 +21,7 @@ import cats.data.NonEmptyList
 import io.circe.generic.semiauto.*
 import io.circe.{Decoder, Encoder}
 import org.scalasteward.core.data.Update
+import org.scalasteward.core.nurture.ApplicableUpdateSet
 
 case class PullRequestGroup(
     name: String,
@@ -32,6 +33,8 @@ case class PullRequestGroup(
     */
   def matches(update: Update.ForArtifactId): Boolean = filter.exists(_.matches(update))
 
+  def matches(updates: ApplicableUpdateSet): Boolean =
+    filter.exists(f => updates.artifactUpdates.exists(update => f.matches(update)))
 }
 
 object PullRequestGroup {