more cannon

robertfmurdock · Jul 18, 2023 · 9790e96 · 9790e96
1 parent b5fe7de
commit 9790e96
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/...mmonMain/kotlin/com/zegreatrob/coupling/action/pairassignmentdocument/AssignPinsAction.kt b/...mmonMain/kotlin/com/zegreatrob/coupling/action/pairassignmentdocument/AssignPinsAction.kt
@@ -9,14 +9,14 @@ import com.zegreatrob.coupling.model.pairassignmentdocument.withPins
 import com.zegreatrob.coupling.model.pin.Pin
 import com.zegreatrob.coupling.model.pin.PinTarget
 import com.zegreatrob.coupling.model.player.Player
-import com.zegreatrob.testmints.action.SimpleExecutableAction
+import com.zegreatrob.testmints.action.async.SimpleSuspendAction
 import kotools.types.collection.NotEmptyList
 
 data class AssignPinsAction(
     val pairs: NotEmptyList<CouplingPair>,
     val pins: List<Pin>,
     val history: List<PairAssignmentDocument>,
-) : SimpleExecutableAction<AssignPinsActionDispatcher, NotEmptyList<PinnedCouplingPair>> {
+) : SimpleSuspendAction<AssignPinsActionDispatcher, NotEmptyList<PinnedCouplingPair>> {
     override val performFunc = link(AssignPinsActionDispatcher::perform)
 }
 

diff --git a/...m/zegreatrob/coupling/server/action/pairassignmentdocument/ServerSpinCommandDispatcher.kt b/...m/zegreatrob/coupling/server/action/pairassignmentdocument/ServerSpinCommandDispatcher.kt
@@ -1,6 +1,7 @@
 package com.zegreatrob.coupling.server.action.pairassignmentdocument
 
 import com.zegreatrob.coupling.action.VoidResult
+import com.zegreatrob.coupling.action.pairassignmentdocument.AssignPinsActionDispatcher
 import com.zegreatrob.coupling.action.pairassignmentdocument.SpinCommand
 import com.zegreatrob.coupling.model.elements
 import com.zegreatrob.coupling.model.pairassignmentdocument.PairAssignmentDocument
@@ -32,7 +33,9 @@ interface ServerSpinCommandDispatcher<out D> :
     PartyIdLoadPlayersSyntax,
     PartyIdHistorySyntax,
     PartyIdPinRecordsSyntax,
-    CannonProvider<D> where D : FindNewPairsAction.Dispatcher, D : ShufflePairsAction.Dispatcher<D> {
+    CannonProvider<D> where D : FindNewPairsAction.Dispatcher,
+      D : AssignPinsActionDispatcher,
+      D : ShufflePairsAction.Dispatcher<D> {
 
     val slackRepository: SlackRepository
     val slackAccessRepository: SlackAccessGet

diff --git a/...kotlin/com/zegreatrob/coupling/server/action/pairassignmentdocument/ShufflePairsAction.kt b/...kotlin/com/zegreatrob/coupling/server/action/pairassignmentdocument/ShufflePairsAction.kt
@@ -11,7 +11,6 @@ import com.zegreatrob.coupling.model.party.PartyDetails
 import com.zegreatrob.coupling.model.pin.Pin
 import com.zegreatrob.coupling.model.player.Player
 import com.zegreatrob.coupling.server.action.CannonProvider
-import com.zegreatrob.testmints.action.ExecutableActionExecuteSyntax
 import com.zegreatrob.testmints.action.annotation.ActionMint
 import kotools.types.collection.NotEmptyList
 
@@ -24,14 +23,11 @@ data class ShufflePairsAction(
 ) {
     interface Dispatcher<out D> :
         Clock,
-        CannonProvider<D>,
-        ExecutableActionExecuteSyntax,
-        AssignPinsActionDispatcher where D : FindNewPairsAction.Dispatcher {
+        CannonProvider<D> where D : FindNewPairsAction.Dispatcher, D : AssignPinsActionDispatcher {
 
         suspend fun perform(action: ShufflePairsAction) = action.assignPinsToPairs().let(::pairAssignmentDocument)
 
-        private suspend fun ShufflePairsAction.assignPinsToPairs() = assignPins(findNewPairs())
-        private fun ShufflePairsAction.assignPins(pairs: NotEmptyList<CouplingPair>) = execute(assignPinsAction(pairs))
+        private suspend fun ShufflePairsAction.assignPinsToPairs() = cannon.fire(assignPinsAction(findNewPairs()))
         private suspend fun ShufflePairsAction.findNewPairs() = cannon.fire(findNewPairsAction())
 
         private fun ShufflePairsAction.assignPinsAction(pairs: NotEmptyList<CouplingPair>) =

diff --git a/...t/kotlin/com/zegreatrob/coupling/server/action/pairassignmentdocument/GameExamplesTest.kt b/...t/kotlin/com/zegreatrob/coupling/server/action/pairassignmentdocument/GameExamplesTest.kt
@@ -2,6 +2,7 @@ package com.zegreatrob.coupling.server.action.pairassignmentdocument
 
 import com.benasher44.uuid.uuid4
 import com.zegreatrob.coupling.action.DispatchingActionExecutor
+import com.zegreatrob.coupling.action.pairassignmentdocument.AssignPinsActionDispatcher
 import com.zegreatrob.coupling.model.flatMap
 import com.zegreatrob.coupling.model.map
 import com.zegreatrob.coupling.model.pairassignmentdocument.CouplingPair
@@ -29,8 +30,9 @@ import kotlin.test.Test
 class GameExamplesTest {
 
     companion object :
-        ShufflePairsAction.Dispatcher<FindNewPairsAction.Dispatcher>,
+        ShufflePairsAction.Dispatcher<Companion>,
         FindNewPairsAction.Dispatcher,
+        AssignPinsActionDispatcher,
         NextPlayerAction.Dispatcher,
         CreatePairCandidateReportAction.Dispatcher,
         CreatePairCandidateReportListAction.Dispatcher,

diff --git a/...in/com/zegreatrob/coupling/server/action/pairassignmentdocument/ShufflePairsActionTest.kt b/...in/com/zegreatrob/coupling/server/action/pairassignmentdocument/ShufflePairsActionTest.kt
@@ -1,5 +1,6 @@
 package com.zegreatrob.coupling.server.action.pairassignmentdocument
 
+import com.zegreatrob.coupling.action.pairassignmentdocument.AssignPinsActionDispatcher
 import com.zegreatrob.coupling.model.map
 import com.zegreatrob.coupling.model.pairassignmentdocument.CouplingPair
 import com.zegreatrob.coupling.model.pairassignmentdocument.PairAssignmentDocument
@@ -25,10 +26,12 @@ import kotlin.test.Test
 
 class ShufflePairsActionTest {
 
+    interface ShufflePairsActionInner : FindNewPairsAction.Dispatcher, AssignPinsActionDispatcher
+
     @Test
     fun willBuildAGameRunWithAllAvailablePlayersAndThenReturnTheResults() = asyncSetup(object :
-        ShufflePairsAction.Dispatcher<FindNewPairsAction.Dispatcher>, FindNewPairsAction.Dispatcher {
-        override val cannon: ActionCannon<FindNewPairsAction.Dispatcher> get() = ActionCannon.invoke(this)
+        ShufflePairsAction.Dispatcher<ShufflePairsActionInner>, ShufflePairsActionInner {
+        override val cannon = ActionCannon(this)
         override val execute = stubActionExecutor(NextPlayerAction::class)
         override val wheel: Wheel get() = throw NotImplementedError("Stubbed")
 

diff --git a/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/CommandDispatcher.kt b/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/CommandDispatcher.kt
@@ -4,6 +4,7 @@ import com.benasher44.uuid.Uuid
 import com.zegreatrob.coupling.action.DispatchingActionExecutor
 import com.zegreatrob.coupling.action.LoggingActionPipe
 import com.zegreatrob.coupling.action.TraceIdProvider
+import com.zegreatrob.coupling.action.pairassignmentdocument.AssignPinsActionDispatcher
 import com.zegreatrob.coupling.model.Message
 import com.zegreatrob.coupling.model.PartyRecord
 import com.zegreatrob.coupling.model.party.PartyId
@@ -120,6 +121,7 @@ class CurrentPartyDispatcher(
     ICommandDispatcher by commandDispatcher,
     DispatchingActionExecutor<CurrentPartyDispatcher>,
     ShufflePairsAction.Dispatcher<CurrentPartyDispatcher>,
+    AssignPinsActionDispatcher,
     PairAssignmentDispatcher<CurrentPartyDispatcher>,
     ServerSpinCommandDispatcher<CurrentPartyDispatcher>,
     ServerSaveSlackIntegrationCommandDispatcher,

diff --git a/...n/kotlin/com/zegreatrob/coupling/server/entity/pairassignment/PairAssignmentDispatcher.kt b/...n/kotlin/com/zegreatrob/coupling/server/entity/pairassignment/PairAssignmentDispatcher.kt
@@ -1,5 +1,6 @@
 package com.zegreatrob.coupling.server.entity.pairassignment
 
+import com.zegreatrob.coupling.action.pairassignmentdocument.AssignPinsActionDispatcher
 import com.zegreatrob.coupling.server.action.pairassignmentdocument.CreatePairCandidateReportAction
 import com.zegreatrob.coupling.server.action.pairassignmentdocument.CreatePairCandidateReportListAction
 import com.zegreatrob.coupling.server.action.pairassignmentdocument.FindNewPairsAction
@@ -8,13 +9,13 @@ import com.zegreatrob.coupling.server.action.pairassignmentdocument.ShufflePairs
 import com.zegreatrob.coupling.server.action.pairassignmentdocument.Wheel
 import com.zegreatrob.testmints.action.ExecutableActionExecutor
 
-interface PairAssignmentDispatcher<D : FindNewPairsAction.Dispatcher> :
+interface PairAssignmentDispatcher<D> :
     ShufflePairsAction.Dispatcher<D>,
     FindNewPairsAction.Dispatcher,
     NextPlayerAction.Dispatcher,
     CreatePairCandidateReportListAction.Dispatcher,
     CreatePairCandidateReportAction.Dispatcher,
-    Wheel {
+    Wheel where D : AssignPinsActionDispatcher, D : FindNewPairsAction.Dispatcher {
     override val execute: ExecutableActionExecutor<PairAssignmentDispatcher<D>>
     override val wheel: Wheel get() = this
 }