refactor: regionCountRepository -> regionCountAllUntilNowRepository

GiganticMinecraft · Feb 11, 2025 · d04aa8c · d04aa8c
1 parent c2652f5
commit d04aa8c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/main/scala/com/github/unchama/seichiassist/subsystems/gridregion/System.scala b/src/main/scala/com/github/unchama/seichiassist/subsystems/gridregion/System.scala
@@ -11,18 +11,18 @@ import com.github.unchama.minecraft.bukkit.algebra.BukkitPlayerHasUuid.instance
 import com.github.unchama.seichiassist.SeichiAssist
 import com.github.unchama.seichiassist.meta.subsystem.Subsystem
 import com.github.unchama.seichiassist.subsystems.gridregion.application.repository.{
-  RegionCountRepositoryDefinition,
+  RegionCountAllUntilNowRepositoryDefinition,
   RULChangePerClickSettingRepositoryDefinition,
   RegionUnitsRepositoryDefinition
 }
 import com.github.unchama.seichiassist.subsystems.gridregion.bukkit.BukkitRegionOperations
 import com.github.unchama.seichiassist.subsystems.gridregion.domain._
 import com.github.unchama.seichiassist.subsystems.gridregion.domain.persistence.{
-  RegionCountPersistence,
+  RegionCountAllUntilNowPersistence,
   RegionTemplatePersistence
 }
 import com.github.unchama.seichiassist.subsystems.gridregion.infrastructure.{
-  JdbcRegionCountPersistence,
+  JdbcRegionCountAllUntilNowPersistence,
   JdbcRegionTemplatePersistence
 }
 import org.bukkit.Location
@@ -40,8 +40,8 @@ object System {
 
   def wired[F[_], G[_]: SyncEffect: ContextCoercion[*[_], F]]
     : G[System[F, Player, Location]] = {
-    implicit val regionCountPersistence: RegionCountPersistence[G] =
-      new JdbcRegionCountPersistence[G]
+    implicit val regionCountPersistence: RegionCountAllUntilNowPersistence[G] =
+      new JdbcRegionCountAllUntilNowPersistence[G]
     val regionTemplatePersistence: RegionTemplatePersistence[G] =
       new JdbcRegionTemplatePersistence[G]
 
@@ -62,16 +62,16 @@ object System {
             RegionUnitsRepositoryDefinition.finalization[G, Player]
           )
       )
-      regionCountRepositoryControls <- BukkitRepositoryControls.createHandles(
-        RegionCountRepositoryDefinition.withContext[G, Player]
+      regionCountAllUntilNowRepositoryControls <- BukkitRepositoryControls.createHandles(
+        RegionCountAllUntilNowRepositoryDefinition.withContext[G, Player]
       )
     } yield {
       val rulPerClickSettingRepository =
         rulChangePerClickSettingRepositoryControls.repository
       val regionUnitsRepository =
         regionUnitsRepositoryControls.repository
       implicit val regionCountRepository: KeyedDataRepository[Player, Ref[G, RegionCount]] =
-        regionCountRepositoryControls.repository
+        regionCountAllUntilNowRepositoryControls.repository
       val regionOperations: RegionOperations[G, Location, Player] = new BukkitRegionOperations
 
       new System[F, Player, Location] {
@@ -134,7 +134,7 @@ object System {
         override val managedRepositoryControls: Seq[BukkitRepositoryControls[F, _]] = Seq(
           rulChangePerClickSettingRepositoryControls,
           regionUnitsRepositoryControls,
-          regionCountRepositoryControls
+          regionCountAllUntilNowRepositoryControls
         ).map(_.coerceFinalizationContextTo[F])
       }
     }

diff --git a/...ory/RegionCountRepositoryDefinition.scala → ...ountAllUntilNowRepositoryDefinition.scala b/...ory/RegionCountRepositoryDefinition.scala → ...ountAllUntilNowRepositoryDefinition.scala
@@ -6,12 +6,12 @@ import com.github.unchama.datarepository.definitions.RefDictBackedRepositoryDefi
 import com.github.unchama.datarepository.template.RepositoryDefinition
 import com.github.unchama.minecraft.algebra.HasUuid
 import com.github.unchama.seichiassist.subsystems.gridregion.domain.RegionCount
-import com.github.unchama.seichiassist.subsystems.gridregion.domain.persistence.RegionCountPersistence
+import com.github.unchama.seichiassist.subsystems.gridregion.domain.persistence.RegionCountAllUntilNowPersistence
 
-object RegionCountRepositoryDefinition {
+object RegionCountAllUntilNowRepositoryDefinition {
 
   def withContext[F[_]: Sync, Player: HasUuid](
-    implicit persistence: RegionCountPersistence[F]
+    implicit persistence: RegionCountAllUntilNowPersistence[F]
   ): RepositoryDefinition[F, Player, Ref[F, RegionCount]] =
     RefDictBackedRepositoryDefinition
       .usingUuidRefDict[F, Player, RegionCount](persistence)(RegionCount(0))

diff --git a/...com/github/unchama/seichiassist/subsystems/gridregion/bukkit/BukkitRegionOperations.scala b/...com/github/unchama/seichiassist/subsystems/gridregion/bukkit/BukkitRegionOperations.scala
@@ -14,7 +14,7 @@ import org.bukkit.Location
 import org.bukkit.entity.Player
 
 class BukkitRegionOperations[F[_]: Sync](
-  implicit regionCountRepository: KeyedDataRepository[Player, Ref[F, RegionCount]]
+  implicit regionCountAllUntilNowRepository: KeyedDataRepository[Player, Ref[F, RegionCount]]
 ) extends RegionOperations[F, Location, Player] {
   override def getSelectionCorners(
     currentLocation: Location,
@@ -73,7 +73,7 @@ class BukkitRegionOperations[F[_]: Sync](
   import cats.implicits._
 
   override def tryCreatingSelectedWorldGuardRegion(player: Player): F[Unit] = for {
-    regionCount <- regionCountRepository(player).get
+    regionCount <- regionCountAllUntilNowRepository(player).get
     wgManager = WorldGuardWrapper.getRegionManager(player.getWorld)
     selection = WorldEditWrapper.getSelection(player)
     regionName = s"${player.getName}_${regionCount.value}"
@@ -85,7 +85,7 @@ class BukkitRegionOperations[F[_]: Sync](
     regionCreateResult <- Sync[F].delay {
       wgManager.addRegion(region)
     }
-    _ <- regionCountRepository(player).update(_.increment)
+    _ <- regionCountAllUntilNowRepository(player).update(_.increment)
   } yield regionCreateResult
 
   override def canCreateRegion(

diff --git a/.../persistence/RegionCountPersistence.scala → ...e/RegionCountAllUntilNowPersistence.scala b/.../persistence/RegionCountPersistence.scala → ...e/RegionCountAllUntilNowPersistence.scala
@@ -5,4 +5,4 @@ import com.github.unchama.seichiassist.subsystems.gridregion.domain.RegionCount
 
 import java.util.UUID
 
-trait RegionCountPersistence[F[_]] extends RefDict[F, UUID, RegionCount]
+trait RegionCountAllUntilNowPersistence[F[_]] extends RefDict[F, UUID, RegionCount]
diff --git a/...tructure/JdbcRegionCountPersistence.scala → ...bcRegionCountAllUntilNowPersistence.scala b/...tructure/JdbcRegionCountPersistence.scala → ...bcRegionCountAllUntilNowPersistence.scala
@@ -2,12 +2,12 @@ package com.github.unchama.seichiassist.subsystems.gridregion.infrastructure
 
 import cats.effect.Sync
 import com.github.unchama.seichiassist.subsystems.gridregion.domain.RegionCount
-import com.github.unchama.seichiassist.subsystems.gridregion.domain.persistence.RegionCountPersistence
+import com.github.unchama.seichiassist.subsystems.gridregion.domain.persistence.RegionCountAllUntilNowPersistence
 import scalikejdbc.{DB, scalikejdbcSQLInterpolationImplicitDef}
 
 import java.util.UUID
 
-class JdbcRegionCountPersistence[F[_]: Sync] extends RegionCountPersistence[F] {
+class JdbcRegionCountAllUntilNowPersistence[F[_]: Sync] extends RegionCountAllUntilNowPersistence[F] {
 
   override def write(uuid: UUID, regionCount: RegionCount): F[Unit] = Sync[F].delay {
     DB.localTx { implicit session =>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,4 @@ import com.github.unchama.seichiassist.subsystems.gridregion.domain.RegionCount

		import java.util.UUID

		trait RegionCountPersistence[F[_]] extends RefDict[F, UUID, RegionCount]
		trait RegionCountAllUntilNowPersistence[F[_]] extends RefDict[F, UUID, RegionCount]