Pass JsonKeyValueStore as parameter to repositories

Author: fthomas

modules/core/src/main/scala/org/scalasteward/core/application/Context.scala

@@ -34,7 +34,7 @@ import org.scalasteward.core.sbt.SbtAlg
 import org.scalasteward.core.scalafmt.ScalafmtAlg
 import org.scalasteward.core.update.json.JsonUpdateRepository
 import org.scalasteward.core.update.{FilterAlg, UpdateRepository, UpdateService}
-import org.scalasteward.core.util.{DateTimeAlg, HttpExistenceClient, HttpJsonClient}
+import org.scalasteward.core.util._
 import org.scalasteward.core.vcs.data.AuthenticatedUser
 import org.scalasteward.core.vcs.{VCSApiAlg, VCSExtraAlg, VCSRepoAlg, VCSSelection}
 
@@ -58,17 +58,20 @@ object Context {
       implicit val gitAlg: GitAlg[F] = GitAlg.create[F]
       implicit val httpJsonClient: HttpJsonClient[F] = new HttpJsonClient[F]
       implicit val httpExistenceClient: HttpExistenceClient[F] = new HttpExistenceClient[F]
-      implicit val repoCacheRepository: RepoCacheRepository[F] = new JsonRepoCacheRepository[F]
+      implicit val repoCacheRepository: RepoCacheRepository[F] =
+        new JsonRepoCacheRepository[F](new JsonKeyValueStore("repos", "6"))
       val vcsSelection = new VCSSelection[F]
       implicit val vcsApiAlg: VCSApiAlg[F] = vcsSelection.getAlg(config)
       implicit val vcsRepoAlg: VCSRepoAlg[F] = VCSRepoAlg.create[F](config, gitAlg)
       implicit val vcsExtraAlg: VCSExtraAlg[F] = VCSExtraAlg.create[F]
-      implicit val pullRequestRepo: PullRequestRepository[F] = new JsonPullRequestRepo[F]
+      implicit val pullRequestRepo: PullRequestRepository[F] =
+        new JsonPullRequestRepo[F](new JsonKeyValueStore("prs", "3"))
       implicit val scalafmtAlg: ScalafmtAlg[F] = ScalafmtAlg.create[F]
       implicit val sbtAlg: SbtAlg[F] = SbtAlg.create[F]
       implicit val repoCacheAlg: RepoCacheAlg[F] = new RepoCacheAlg[F]
       implicit val editAlg: EditAlg[F] = new EditAlg[F]
-      implicit val updateRepository: UpdateRepository[F] = new JsonUpdateRepository[F]
+      implicit val updateRepository: UpdateRepository[F] =
+        new JsonUpdateRepository[F](new JsonKeyValueStore("updates", "3"))
       implicit val coursierAlg: CoursierAlg[F] = CoursierAlg.create
       implicit val nurtureAlg: NurtureAlg[F] = new NurtureAlg[F]
       implicit val updateService: UpdateService[F] = new UpdateService[F]

modules/core/src/main/scala/org/scalasteward/core/nurture/json/JsonPullRequestRepo.scala

@@ -16,24 +16,19 @@
 
 package org.scalasteward.core.nurture.json
 
+import cats.FlatMap
 import cats.implicits._
 import org.http4s.Uri
 import org.scalasteward.core.data.{Dependency, Update}
 import org.scalasteward.core.git.Sha1
-import org.scalasteward.core.io.{FileAlg, WorkspaceAlg}
 import org.scalasteward.core.nurture.PullRequestRepository
 import org.scalasteward.core.update.UpdateService
-import org.scalasteward.core.util.{JsonKeyValueStore, MonadThrowable}
+import org.scalasteward.core.util.JsonKeyValueStore
 import org.scalasteward.core.vcs.data.{PullRequestState, Repo}
 
-final class JsonPullRequestRepo[F[_]](
-    implicit
-    fileAlg: FileAlg[F],
-    workspaceAlg: WorkspaceAlg[F],
-    F: MonadThrowable[F]
+final class JsonPullRequestRepo[F[_]: FlatMap](
+    kvStore: JsonKeyValueStore[F, Repo, Map[String, PullRequestData]]
 ) extends PullRequestRepository[F] {
-  private val kvStore = new JsonKeyValueStore[F, Repo, Map[String, PullRequestData]]("prs", "3")
-
   override def createOrUpdate(
       repo: Repo,
       url: Uri,

modules/core/src/main/scala/org/scalasteward/core/repocache/json/JsonRepoCacheRepository.scala

@@ -16,21 +16,16 @@
 
 package org.scalasteward.core.repocache.json
 
+import cats.Functor
 import cats.implicits._
 import org.scalasteward.core.data.Dependency
-import org.scalasteward.core.io.{FileAlg, WorkspaceAlg}
 import org.scalasteward.core.repocache.{RepoCache, RepoCacheRepository}
-import org.scalasteward.core.util.{JsonKeyValueStore, MonadThrowable}
+import org.scalasteward.core.util.JsonKeyValueStore
 import org.scalasteward.core.vcs.data.Repo
 
-final class JsonRepoCacheRepository[F[_]](
-    implicit
-    fileAlg: FileAlg[F],
-    workspaceAlg: WorkspaceAlg[F],
-    F: MonadThrowable[F]
+final class JsonRepoCacheRepository[F[_]: Functor](
+    kvStore: JsonKeyValueStore[F, Repo, RepoCache]
 ) extends RepoCacheRepository[F] {
-  private val kvStore = new JsonKeyValueStore[F, Repo, RepoCache]("repos", "6")
-
   override def findCache(repo: Repo): F[Option[RepoCache]] =
     kvStore.get(repo)
 

modules/core/src/main/scala/org/scalasteward/core/update/json/JsonUpdateRepository.scala

@@ -16,19 +16,15 @@
 
 package org.scalasteward.core.update.json
 
+import cats.FlatMap
 import cats.implicits._
 import org.scalasteward.core.data.Update
-import org.scalasteward.core.io.{FileAlg, WorkspaceAlg}
 import org.scalasteward.core.update.UpdateRepository
-import org.scalasteward.core.util.{JsonKeyValueStore, MonadThrowable}
+import org.scalasteward.core.util.JsonKeyValueStore
 
-final class JsonUpdateRepository[F[_]](
-    implicit
-    fileAlg: FileAlg[F],
-    workspaceAlg: WorkspaceAlg[F],
-    F: MonadThrowable[F]
+final class JsonUpdateRepository[F[_]: FlatMap](
+    kvStore: JsonKeyValueStore[F, String, List[Update.Single]]
 ) extends UpdateRepository[F] {
-  private val kvStore = new JsonKeyValueStore[F, String, List[Update.Single]]("updates", "3")
   private val key = "updates"
 
   override def deleteAll: F[Unit] =

modules/core/src/main/scala/org/scalasteward/core/util/JsonKeyValueStore.scala

@@ -33,8 +33,11 @@ final class JsonKeyValueStore[F[_], K, V](name: String, schemaVersion: String)(
     valueDecoder: Decoder[V],
     valueEncoder: Encoder[V]
 ) {
+  private val filename =
+    s"${name}_v${schemaVersion}.json"
+
   private val jsonFile: F[File] =
-    workspaceAlg.rootDir.map(_ / s"${name}_v${schemaVersion}.json")
+    workspaceAlg.rootDir.map(_ / filename)
 
   def get(key: K): F[Option[V]] =
     read.map(_.get(key))

modules/core/src/test/scala/org/scalasteward/core/mock/MockContext.scala

@@ -15,7 +15,7 @@ import org.scalasteward.core.repoconfig.RepoConfigAlg
 import org.scalasteward.core.sbt.SbtAlg
 import org.scalasteward.core.scalafmt.ScalafmtAlg
 import org.scalasteward.core.update.FilterAlg
-import org.scalasteward.core.util.{BracketThrowable, DateTimeAlg}
+import org.scalasteward.core.util.{BracketThrowable, DateTimeAlg, JsonKeyValueStore}
 import org.scalasteward.core.vcs.VCSRepoAlg
 import org.scalasteward.core.vcs.data.AuthenticatedUser
 import scala.concurrent.duration._
@@ -58,7 +58,7 @@ object MockContext {
   implicit val gitHubRepoAlg: VCSRepoAlg[MockEff] = VCSRepoAlg.create(config, gitAlg)
   implicit val scalafmtAlg: ScalafmtAlg[MockEff] = ScalafmtAlg.create
   implicit val cacheRepository: RepoCacheRepository[MockEff] =
-    new JsonRepoCacheRepository[MockEff]()
+    new JsonRepoCacheRepository[MockEff](new JsonKeyValueStore("repos", "6"))
   implicit val sbtAlg: SbtAlg[MockEff] = SbtAlg.create
   implicit val editAlg: EditAlg[MockEff] = new EditAlg[MockEff]
   implicit val repoConfigAlg: RepoConfigAlg[MockEff] = new RepoConfigAlg[MockEff]