Move transactions to domain layer

simplenotes-app/build.gradle.kts

@@ -25,7 +25,6 @@ dependencies {
     implementation(Libs.javaxServlet)
     implementation(Libs.kotlinxSerializationJson)
     implementation(Libs.logbackClassic)
-    implementation(Libs.ktormCore)
 
     implementation(Libs.micronaut)
     kapt(Libs.micronautProcessor)

simplenotes-app/src/main/kotlin/be/simplenotes/app/filters/TransactionFilter.kt

@@ -1,15 +0,0 @@
-package be.simplenotes.app.filters
-
-import me.liuwj.ktorm.database.Database
-import org.http4k.core.Filter
-import org.http4k.core.HttpHandler
-import javax.inject.Singleton
-
-@Singleton
-class TransactionFilter(private val db: Database) : Filter {
-    override fun invoke(next: HttpHandler): HttpHandler = { request ->
-        db.useTransaction {
-            next(request)
-        }
-    }
-}

simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/ApiRoutes.kt

@@ -2,10 +2,8 @@ package be.simplenotes.app.routes
 
 import be.simplenotes.app.api.ApiNoteController
 import be.simplenotes.app.api.ApiUserController
-import be.simplenotes.app.filters.TransactionFilter
 import be.simplenotes.app.filters.auth.RequiredAuthFilter
 import be.simplenotes.app.filters.auth.RequiredAuthLens
-import org.http4k.core.Filter
 import org.http4k.core.Method.*
 import org.http4k.core.Request
 import org.http4k.core.then
@@ -21,16 +19,11 @@ import javax.inject.Singleton
 class ApiRoutes(
     private val apiUserController: ApiUserController,
     private val apiNoteController: ApiNoteController,
-    private val transaction: TransactionFilter,
     @Named("api") private val auth: RequiredAuthFilter,
     @Named("required") private val authLens: RequiredAuthLens,
 ) : Supplier<RoutingHttpHandler> {
     override fun get(): RoutingHttpHandler {
 
-        fun Filter.then(next: ProtectedHandler) = then { req: Request ->
-            next(req, authLens(req))
-        }
-
         infix fun PathMethod.to(action: ProtectedHandler) =
             this to { req: Request -> action(req, authLens(req)) }
 
@@ -41,10 +34,10 @@ class ApiRoutes(
                 auth.then(
                     routes(
                         "/" bind GET to ::notes,
-                        "/" bind POST to transaction.then(::createNote),
+                        "/" bind POST to ::createNote,
                         "/search" bind POST to ::search,
                         "/{uuid}" bind GET to ::note,
-                        "/{uuid}" bind PUT to transaction.then(::update),
+                        "/{uuid}" bind PUT to ::update,
                     )
                 ).withBasePath("/notes")
             }

simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/BasicRoutes.kt

@@ -5,11 +5,9 @@ import be.simplenotes.app.controllers.HealthCheckController
 import be.simplenotes.app.controllers.NoteController
 import be.simplenotes.app.controllers.UserController
 import be.simplenotes.app.filters.ImmutableFilter
-import be.simplenotes.app.filters.TransactionFilter
 import be.simplenotes.app.filters.auth.OptionalAuthFilter
 import be.simplenotes.app.filters.auth.OptionalAuthLens
 import org.http4k.core.ContentType
-import org.http4k.core.Filter
 import org.http4k.core.Method.GET
 import org.http4k.core.Method.POST
 import org.http4k.core.Request
@@ -27,15 +25,10 @@ class BasicRoutes(
     private val noteCtrl: NoteController,
     @Named("optional") private val authLens: OptionalAuthLens,
     private val auth: OptionalAuthFilter,
-    private val transactionFilter: TransactionFilter,
 ) : Supplier<RoutingHttpHandler> {
 
     override fun get(): RoutingHttpHandler {
 
-        fun Filter.then(next: PublicHandler) = then { req: Request ->
-            next(req, authLens(req))
-        }
-
         infix fun PathMethod.to(action: PublicHandler) =
             this to { req: Request -> action(req, authLens(req)) }
 
@@ -52,7 +45,7 @@ class BasicRoutes(
                 routes(
                     "/" bind GET to baseCtrl::index,
                     "/register" bind GET to userCtrl::register,
-                    "/register" bind POST to transactionFilter.then(userCtrl::register),
+                    "/register" bind POST to userCtrl::register,
                     "/login" bind GET to userCtrl::login,
                     "/login" bind POST to userCtrl::login,
                     "/logout" bind POST to userCtrl::logout,

simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/NoteRoutes.kt

@@ -1,10 +1,8 @@
 package be.simplenotes.app.routes
 
 import be.simplenotes.app.controllers.NoteController
-import be.simplenotes.app.filters.TransactionFilter
 import be.simplenotes.app.filters.auth.RequiredAuthFilter
 import be.simplenotes.app.filters.auth.RequiredAuthLens
-import org.http4k.core.Filter
 import org.http4k.core.Method.GET
 import org.http4k.core.Method.POST
 import org.http4k.core.Request
@@ -20,16 +18,11 @@ import javax.inject.Singleton
 @Singleton
 class NoteRoutes(
     private val noteCtrl: NoteController,
-    private val transaction: TransactionFilter,
     private val auth: RequiredAuthFilter,
     @Named("required") private val authLens: RequiredAuthLens,
 ) : Supplier<RoutingHttpHandler> {
     override fun get(): RoutingHttpHandler {
 
-        fun Filter.then(next: ProtectedHandler) = then { req: Request ->
-            next(req, authLens(req))
-        }
-
         infix fun PathMethod.to(action: ProtectedHandler) =
             this to { req: Request -> action(req, authLens(req)) }
 
@@ -39,13 +32,13 @@ class NoteRoutes(
                     "/" bind GET to ::list,
                     "/" bind POST to ::search,
                     "/new" bind GET to ::new,
-                    "/new" bind POST to transaction.then(::new),
+                    "/new" bind POST to ::new,
                     "/trash" bind GET to ::trash,
                     "/{uuid}" bind GET to ::note,
-                    "/{uuid}" bind POST to transaction.then(::note),
+                    "/{uuid}" bind POST to ::note,
                     "/{uuid}/edit" bind GET to ::edit,
-                    "/{uuid}/edit" bind POST to transaction.then(::edit),
-                    "/deleted/{uuid}" bind POST to transaction.then(::deleted),
+                    "/{uuid}/edit" bind POST to ::edit,
+                    "/deleted/{uuid}" bind POST to ::deleted,
                 ).withBasePath("/notes")
             }
         )

simplenotes-app/src/main/kotlin/be/simplenotes/app/routes/SettingsRoutes.kt

@@ -1,10 +1,8 @@
 package be.simplenotes.app.routes
 
 import be.simplenotes.app.controllers.SettingsController
-import be.simplenotes.app.filters.TransactionFilter
 import be.simplenotes.app.filters.auth.RequiredAuthFilter
 import be.simplenotes.app.filters.auth.RequiredAuthLens
-import org.http4k.core.Filter
 import org.http4k.core.Method.GET
 import org.http4k.core.Method.POST
 import org.http4k.core.Request
@@ -20,23 +18,18 @@ import javax.inject.Singleton
 @Singleton
 class SettingsRoutes(
     private val settingsController: SettingsController,
-    private val transaction: TransactionFilter,
     private val auth: RequiredAuthFilter,
     @Named("required") private val authLens: RequiredAuthLens,
 ) : Supplier<RoutingHttpHandler> {
     override fun get(): RoutingHttpHandler {
 
-        fun Filter.then(next: ProtectedHandler) = then { req: Request ->
-            next(req, authLens(req))
-        }
-
         infix fun PathMethod.to(action: ProtectedHandler) =
             this to { req: Request -> action(req, authLens(req)) }
 
         return auth.then(
             routes(
                 "/settings" bind GET to settingsController::settings,
-                "/settings" bind POST to transaction.then(settingsController::settings),
+                "/settings" bind POST to settingsController::settings,
                 "/export" bind POST to settingsController::export,
             )
         )