Shuffle some packages

mattupstate · Dec 9, 2023 · db55c5d · db55c5d
1 parent 92cbb9f
commit db55c5d
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 80 deletions.
diff --git a/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/errorhandlers.kt b/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/errorhandlers.kt
@@ -5,8 +5,10 @@ import com.acme.ktor.server.logging.logger
 import com.acme.ktor.server.validation.RequestBodyValidationException
 import com.acme.ktor.server.validation.RequestDecodingException
 import com.acme.ktor.server.validation.getUnderlyingCause
-import com.acme.web.api.json.hal.HalLink
-import com.acme.web.api.json.hal.VndError
+import com.acme.web.api.json.HalLink
+import com.acme.web.api.json.VndError
+import com.acme.web.api.json.respondVndError
+import com.acme.web.api.json.toVndError
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.ApplicationCall
 import io.ktor.server.request.uri

diff --git a/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/factory.kt b/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/factory.kt
@@ -1,7 +1,7 @@
 package com.acme.web.api
 
 import com.acme.ktor.server.logging.logger
-import com.acme.web.api.scheduling.ktor.scheduling
+import com.acme.web.api.scheduling.scheduling
 import io.ktor.http.ContentType
 import io.ktor.server.application.Application
 import io.ktor.server.application.call

diff --git a/...tlin/com/acme/web/api/json/hal/HalLink.kt → ...n/kotlin/com/acme/web/api/json/HalLink.kt b/...tlin/com/acme/web/api/json/hal/HalLink.kt → ...n/kotlin/com/acme/web/api/json/HalLink.kt
@@ -1,4 +1,4 @@
-package com.acme.web.api.json.hal
+package com.acme.web.api.json
 
 import com.acme.serialization.URIAsStringSerializer
 import kotlinx.serialization.Serializable

diff --git a/...lin/com/acme/web/api/json/hal/VndError.kt → .../kotlin/com/acme/web/api/json/VndError.kt b/...lin/com/acme/web/api/json/hal/VndError.kt → .../kotlin/com/acme/web/api/json/VndError.kt
@@ -1,4 +1,4 @@
-package com.acme.web.api.json.hal
+package com.acme.web.api.json
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

diff --git a/.../src/main/kotlin/com/acme/web/api/json.kt → ...in/kotlin/com/acme/web/api/json/errors.kt b/.../src/main/kotlin/com/acme/web/api/json.kt → ...in/kotlin/com/acme/web/api/json/errors.kt
@@ -1,7 +1,7 @@
-package com.acme.web.api
+package com.acme.web.api.json
 
 import com.acme.ktor.server.validation.RequestBodyValidationException
-import com.acme.web.api.json.hal.VndError
+import com.acme.web.api.toJsonPointer
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.ApplicationCall

diff --git a/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/plugins.kt b/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/plugins.kt
@@ -8,6 +8,7 @@ import com.acme.ktor.server.logging.StructuredLogging
 import com.acme.ktor.server.validation.RequestBodyValidationException
 import com.acme.ktor.server.validation.RequestDecodingException
 import com.acme.ktor.server.validation.RequestValidation
+import com.acme.web.api.json.respondVndError
 import com.acme.web.api.security.PrincipalNotFoundException
 import com.acme.web.api.security.UnauthorizedAccessException
 import io.ktor.http.ContentType

diff --git a/.../acme/web/api/scheduling/ktor/commands.kt → ...n/com/acme/web/api/scheduling/commands.kt b/.../acme/web/api/scheduling/ktor/commands.kt → ...n/com/acme/web/api/scheduling/commands.kt
@@ -1,4 +1,4 @@
-package com.acme.web.api.scheduling.ktor
+package com.acme.web.api.scheduling
 
 import com.acme.core.MessageBus
 import com.acme.ktor.server.validation.receiveAndValidate
@@ -9,15 +9,10 @@ import com.acme.scheduling.MarkAppointmentUnattendedCommand
 import com.acme.scheduling.SchedulingUnitOfWork
 import com.acme.web.api.authenticatedUser
 import com.acme.web.api.defaultIdGenerator
-import com.acme.web.api.scheduling.CreateAppointmentCommandRequest
-import com.acme.web.api.scheduling.CreateClientCommandRequest
-import com.acme.web.api.scheduling.CreatePracticeCommandRequest
-import com.acme.web.api.scheduling.CreatePractitionerCommandRequest
 import com.acme.web.api.scheduling.json.AppointmentCollectionResource
 import com.acme.web.api.scheduling.json.ClientCollectionResource
 import com.acme.web.api.scheduling.json.PracticeCollectionResource
 import com.acme.web.api.scheduling.json.PractitionerCollectionResource
-import com.acme.web.api.scheduling.toCommand
 import com.acme.web.api.security.AccessControlService
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.ApplicationCall

diff --git a/...om/acme/web/api/scheduling/data/events.kt → ...lin/com/acme/web/api/scheduling/events.kt b/...om/acme/web/api/scheduling/data/events.kt → ...lin/com/acme/web/api/scheduling/events.kt
@@ -1,4 +1,4 @@
-package com.acme.web.api.scheduling.data
+package com.acme.web.api.scheduling
 
 import com.acme.scheduling.Appointment
 import com.acme.scheduling.AppointmentAttendedEvent

diff --git a/...web-api/src/main/kotlin/com/acme/web/api/scheduling/json/AppointmentCollectionResource.kt b/...web-api/src/main/kotlin/com/acme/web/api/scheduling/json/AppointmentCollectionResource.kt
@@ -1,6 +1,6 @@
 package com.acme.web.api.scheduling.json
 
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/...-web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/AppointmentResource.kt b/...-web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/AppointmentResource.kt
@@ -1,6 +1,6 @@
 package com.acme.web.api.scheduling.json
 
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/...acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/ClientCollectionResource.kt b/...acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/ClientCollectionResource.kt
@@ -1,6 +1,6 @@
 package com.acme.web.api.scheduling.json
 
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/ClientResource.kt b/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/ClientResource.kt
@@ -1,6 +1,6 @@
 package com.acme.web.api.scheduling.json
 
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/...me-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/PracticeCollectionResource.kt b/...me-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/PracticeCollectionResource.kt
@@ -1,6 +1,6 @@
 package com.acme.web.api.scheduling.json
 
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/PracticeResource.kt b/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/PracticeResource.kt
@@ -1,6 +1,6 @@
 package com.acme.web.api.scheduling.json
 
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/...eb-api/src/main/kotlin/com/acme/web/api/scheduling/json/PractitionerCollectionResource.kt b/...eb-api/src/main/kotlin/com/acme/web/api/scheduling/json/PractitionerCollectionResource.kt
@@ -1,6 +1,6 @@
 package com.acme.web.api.scheduling.json
 
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/...web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/PractitionerResource.kt b/...web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/json/PractitionerResource.kt
@@ -1,6 +1,6 @@
 package com.acme.web.api.scheduling.json
 
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

diff --git a/...acme/web/api/scheduling/ktor/locations.kt → .../com/acme/web/api/scheduling/locations.kt b/...acme/web/api/scheduling/ktor/locations.kt → .../com/acme/web/api/scheduling/locations.kt
@@ -1,6 +1,6 @@
 @file:OptIn(KtorExperimentalLocationsAPI::class)
 
-package com.acme.web.api.scheduling.ktor
+package com.acme.web.api.scheduling
 
 import io.ktor.server.locations.KtorExperimentalLocationsAPI
 import io.ktor.server.locations.Location

diff --git a/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/messageBus.kt b/acme-web/acme-web-api/src/main/kotlin/com/acme/web/api/scheduling/messageBus.kt
@@ -7,16 +7,9 @@ import com.acme.scheduling.AppointmentUnattendedEvent
 import com.acme.scheduling.ClientCreatedEvent
 import com.acme.scheduling.PracticeCreatedEvent
 import com.acme.scheduling.PractitionerCreatedEvent
-import com.acme.web.api.scheduling.data.onAppointmentAttended
-import com.acme.web.api.scheduling.data.onAppointmentCanceled
-import com.acme.web.api.scheduling.data.onAppointmentCreated
-import com.acme.web.api.scheduling.data.onAppointmentUnattended
-import com.acme.web.api.scheduling.data.onClientCreated
-import com.acme.web.api.scheduling.data.onPracticeCreated
-import com.acme.web.api.scheduling.data.onPractitionerCreated
-import com.acme.scheduling.schedulingMessageBus as baseSchedulingMessageBus
+import com.acme.scheduling.schedulingMessageBus
 
-val schedulingMessageBus = baseSchedulingMessageBus.copy().apply {
+val webApiSchedulingMessageBus = schedulingMessageBus.copy().apply {
   addEventHandler(
     PracticeCreatedEvent::class to ::onPracticeCreated,
     PractitionerCreatedEvent::class to ::onPractitionerCreated,

diff --git a/...om/acme/web/api/scheduling/ktor/module.kt → ...lin/com/acme/web/api/scheduling/module.kt b/...om/acme/web/api/scheduling/ktor/module.kt → ...lin/com/acme/web/api/scheduling/module.kt
@@ -1,11 +1,10 @@
 @file:OptIn(KtorExperimentalLocationsAPI::class)
 
-package com.acme.web.api.scheduling.ktor
+package com.acme.web.api.scheduling
 
 import com.acme.scheduling.data.SchedulingJooqUnitOfWork
 import com.acme.web.api.KetoConfiguration
 import com.acme.web.api.scheduling.data.JooqSchedulingWebViews
-import com.acme.web.api.scheduling.schedulingMessageBus
 import com.acme.web.api.security.AccessControlService
 import com.acme.web.api.security.KtorOryKetoAccessControlService
 import com.acme.web.api.security.keto.KtorOryKetoClient
@@ -36,7 +35,7 @@ fun Route.scheduling(jooqConfig: Configuration, accessControl: AccessControlServ
   val schedulingWebViews = JooqSchedulingWebViews(jooqConfig)
 
   authenticate {
-    schedulingCommands(schedulingMessageBus, accessControl, schedulingUnitOfWork, basePath)
+    schedulingCommands(webApiSchedulingMessageBus, accessControl, schedulingUnitOfWork, basePath)
     schedulingQueries(schedulingWebViews, accessControl, basePath)
   }
 }
diff --git a/...m/acme/web/api/scheduling/ktor/queries.kt → ...in/com/acme/web/api/scheduling/queries.kt b/...m/acme/web/api/scheduling/ktor/queries.kt → ...in/com/acme/web/api/scheduling/queries.kt
@@ -1,15 +1,14 @@
 @file:OptIn(KtorExperimentalLocationsAPI::class)
 
-package com.acme.web.api.scheduling.ktor
+package com.acme.web.api.scheduling
 
 import com.acme.web.api.authenticatedUser
-import com.acme.web.api.json.hal.HalLink
+import com.acme.web.api.json.HalLink
 import com.acme.web.api.scheduling.data.SchedulingWebViews
 import com.acme.web.api.scheduling.json.AppointmentResource
 import com.acme.web.api.scheduling.json.ClientResource
 import com.acme.web.api.scheduling.json.PracticeResource
 import com.acme.web.api.scheduling.json.PractitionerResource
-import com.acme.web.api.scheduling.toResource
 import com.acme.web.api.security.AccessControlService
 import com.acme.web.api.security.UnauthorizedAccessException
 import io.ktor.http.HttpStatusCode

diff --git a/...stBodyValidationExceptionExtensionTest.kt → ...lin/com/acme/web/api/json/VndErrorTest.kt b/...stBodyValidationExceptionExtensionTest.kt → ...lin/com/acme/web/api/json/VndErrorTest.kt
@@ -1,16 +1,14 @@
-package com.acme.web.api.core.ktor
+package com.acme.web.api.json
 
 import com.acme.ktor.server.validation.RequestBodyValidationException
-import com.acme.web.api.json.hal.VndError
 import com.acme.web.api.scheduling.constraintValidator
-import com.acme.web.api.toVndError
 import io.kotest.core.spec.style.ShouldSpec
 import io.kotest.matchers.shouldBe
 import jakarta.validation.constraints.NotBlank
 import jakarta.validation.constraints.NotNull
 import jakarta.validation.constraints.Size
 
-class RequestBodyValidationExceptionExtensionTest : ShouldSpec({
+class VndErrorTest : ShouldSpec({
 
   data class FakeBean(
     @field:NotNull
@@ -42,8 +40,7 @@ class RequestBodyValidationExceptionExtensionTest : ShouldSpec({
               )
             )
           )
-        )
-        )
+        ))
     }
   }
 })