first command conversion since switching the sdk over - went well

robertfmurdock · Jul 15, 2023 · 3a70bf5 · 3a70bf5
1 parent 7e27d36
commit 3a70bf5
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 8 deletions.
diff --git a/...mponents/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/party/PartyConfig.kt b/...mponents/src/jsMain/kotlin/com/zegreatrob/coupling/client/components/party/PartyConfig.kt
@@ -3,6 +3,7 @@ package com.zegreatrob.coupling.client.components.party
 import com.benasher44.uuid.uuid4
 import com.zegreatrob.coupling.action.party.DeletePartyCommand
 import com.zegreatrob.coupling.action.party.SavePartyCommand
+import com.zegreatrob.coupling.action.party.perform
 import com.zegreatrob.coupling.client.components.DispatchFunc
 import com.zegreatrob.coupling.client.components.Paths
 import com.zegreatrob.coupling.client.components.useForm
@@ -34,7 +35,15 @@ val PartyConfig by nfc<PartyConfigProps<*>> { (party, commandFunc) ->
     val (redirectUrl, setRedirectUrl) = useState<String?>(null)
     val redirectToPartyList = { setRedirectUrl(Paths.partyList()) }
     val onSave = commandFunc({ SavePartyCommand(updatedParty) }, { redirectToPartyList() })
-    val onDelete = if (isNew) null else commandFunc({ DeletePartyCommand(party.id) }, { redirectToPartyList() })
+    val onDelete = if (isNew) {
+        null
+    } else {
+        commandFunc(
+            commandFunc = { DeletePartyCommand(party.id) },
+            fireFunc = ::perform,
+            response = { redirectToPartyList() },
+        )
+    }
 
     if (redirectUrl != null) {
         Navigate { to = redirectUrl }

diff --git a/e2e/src/jsE2eTest/kotlin/com/zegreatrob/coupling/e2e/test/E2eSetup.kt b/e2e/src/jsE2eTest/kotlin/com/zegreatrob/coupling/e2e/test/E2eSetup.kt
@@ -1,6 +1,7 @@
 package com.zegreatrob.coupling.e2e.test
 
 import com.zegreatrob.coupling.action.party.DeletePartyCommand
+import com.zegreatrob.coupling.action.party.fire
 import com.zegreatrob.coupling.model.Record
 import com.zegreatrob.coupling.model.party.PartyDetails
 import com.zegreatrob.coupling.sdk.CouplingSdkDispatcher

diff --git a/...s/action/src/commonMain/kotlin/com/zegreatrob/coupling/action/party/DeletePartyCommand.kt b/...s/action/src/commonMain/kotlin/com/zegreatrob/coupling/action/party/DeletePartyCommand.kt
@@ -2,11 +2,10 @@ package com.zegreatrob.coupling.action.party
 
 import com.zegreatrob.coupling.action.VoidResult
 import com.zegreatrob.coupling.model.party.PartyId
-import com.zegreatrob.testmints.action.async.SimpleSuspendAction
-
-data class DeletePartyCommand(val partyId: PartyId) : SimpleSuspendAction<DeletePartyCommand.Dispatcher, VoidResult> {
-    override val performFunc = link(Dispatcher::perform)
+import com.zegreatrob.testmints.action.annotation.MintAction
 
+@MintAction
+data class DeletePartyCommand(val partyId: PartyId) {
     interface Dispatcher {
         suspend fun perform(command: DeletePartyCommand): VoidResult
     }

diff --git a/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/AuthorizedSdk.kt b/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/AuthorizedSdk.kt
@@ -4,6 +4,7 @@ package com.zegreatrob.coupling.sdk
 
 import com.benasher44.uuid.uuid4
 import com.zegreatrob.coupling.action.party.DeletePartyCommand
+import com.zegreatrob.coupling.action.party.fire
 import com.zegreatrob.coupling.sdk.gql.graphQuery
 import com.zegreatrob.testmints.action.ActionCannon
 import io.ktor.client.HttpClient

diff --git a/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/SdkPairAssignmentDocumentTest.kt b/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/SdkPairAssignmentDocumentTest.kt
@@ -6,6 +6,7 @@ import com.zegreatrob.coupling.action.pairassignmentdocument.SavePairAssignments
 import com.zegreatrob.coupling.action.pairassignmentdocument.fire
 import com.zegreatrob.coupling.action.party.DeletePartyCommand
 import com.zegreatrob.coupling.action.party.SavePartyCommand
+import com.zegreatrob.coupling.action.party.fire
 import com.zegreatrob.coupling.model.PartyRecord
 import com.zegreatrob.coupling.model.data
 import com.zegreatrob.coupling.model.element

diff --git a/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/SdkPlayerTest.kt b/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/SdkPlayerTest.kt
@@ -4,6 +4,7 @@ import com.benasher44.uuid.uuid4
 import com.zegreatrob.coupling.action.CommandResult
 import com.zegreatrob.coupling.action.party.DeletePartyCommand
 import com.zegreatrob.coupling.action.party.SavePartyCommand
+import com.zegreatrob.coupling.action.party.fire
 import com.zegreatrob.coupling.action.player.DeletePlayerCommand
 import com.zegreatrob.coupling.action.player.SavePlayerCommand
 import com.zegreatrob.coupling.model.player.Player

diff --git a/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/SpinTest.kt b/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/SpinTest.kt
@@ -7,6 +7,7 @@ import com.zegreatrob.coupling.action.pairassignmentdocument.SpinCommand
 import com.zegreatrob.coupling.action.pairassignmentdocument.fire
 import com.zegreatrob.coupling.action.party.DeletePartyCommand
 import com.zegreatrob.coupling.action.party.SavePartyCommand
+import com.zegreatrob.coupling.action.party.fire
 import com.zegreatrob.coupling.action.pin.SavePinCommand
 import com.zegreatrob.coupling.action.pin.fire
 import com.zegreatrob.coupling.action.player.SavePlayerCommand

diff --git a/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/WebsocketTest.kt b/sdk/src/commonTest/kotlin/com/zegreatrob/coupling/sdk/WebsocketTest.kt
@@ -4,6 +4,7 @@ import com.zegreatrob.coupling.action.pairassignmentdocument.SavePairAssignments
 import com.zegreatrob.coupling.action.pairassignmentdocument.fire
 import com.zegreatrob.coupling.action.party.DeletePartyCommand
 import com.zegreatrob.coupling.action.party.SavePartyCommand
+import com.zegreatrob.coupling.action.party.fire
 import com.zegreatrob.coupling.json.JsonCouplingSocketMessage
 import com.zegreatrob.coupling.json.JsonMessage
 import com.zegreatrob.coupling.json.fromJsonString

diff --git a/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/entity/party/DeletePartyResolver.kt b/server/src/jsMain/kotlin/com/zegreatrob/coupling/server/entity/party/DeletePartyResolver.kt
@@ -1,19 +1,21 @@
 package com.zegreatrob.coupling.server.entity.party
 
 import com.zegreatrob.coupling.action.party.DeletePartyCommand
+import com.zegreatrob.coupling.action.party.perform
 import com.zegreatrob.coupling.json.DeletePartyInput
 import com.zegreatrob.coupling.server.external.graphql.Resolver
 import com.zegreatrob.coupling.server.graphql.DispatcherProviders.authorizedPartyDispatcher
-import com.zegreatrob.coupling.server.graphql.dispatch
+import com.zegreatrob.coupling.server.graphql.dispatchAction
 import kotlinx.serialization.json.JsonNull
 
-val deletePartyResolver: Resolver = dispatch(
+val deletePartyResolver: Resolver = dispatchAction(
     dispatcherFunc = { request, _: JsonNull, args ->
         authorizedPartyDispatcher(
             context = request,
             partyId = args.partyId.value,
         )
     },
-    queryFunc = { _, input: DeletePartyInput -> DeletePartyCommand(input.partyId) },
+    commandFunc = { _, input: DeletePartyInput -> DeletePartyCommand(input.partyId) },
+    fireFunc = ::perform,
     toSerializable = { true },
 )