workin on submit/refresh issue

.gitignore

@@ -39,4 +39,7 @@ bin/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
+
+### Misc ###
+*.db

README.md

@@ -9,7 +9,6 @@ Sample application showing how htmx teams up with javalin
 - jdbi 3.44
 - htmx 2.x
 - apache velocity 2.3
-- docker 25
 - spock 2.3
 
 A [good kotlin ide][10] is also recommended.
@@ -44,9 +43,16 @@ java -jar build/libs/sample-htmx-javalin-1.0-SNAPSHOT-all.jar
 - Spock demands us to enable the groovy language in the project
 - Groovy support has issues to proper set jvm toolchain, fallbacks to system
 - There is a [nice htmx plugin][70] for intellij
+- JDBI [fluent api][80] makes database access easier
+- TodoItem needs an empty constructor so JDBI bean mapper can fill attributes in 
 
 ## Next steps
 
+- A good form to object mapper would be handy. Javalin has [validators][90] but
+ mapping pretty much manual
+- Need a coverage solution that handles spock properly
+- 
+
 [00]: https://github.com/sombriks/sample-htmx-javalin
 [10]: https://www.jetbrains.com/idea/download
 [20]: https://imperceptiblethoughts.com/shadow/getting-started/
@@ -55,3 +61,4 @@ java -jar build/libs/sample-htmx-javalin-1.0-SNAPSHOT-all.jar
 [50]: https://javalin.io/plugins/rendering#configuring-a-template-engine
 [60]: https://javalin.io/tutorials/javalin-logging
 [70]: https://plugins.jetbrains.com/plugin/20588-htmx-support
+[80]: https://jdbi.org/releases/3.44.1/#_fluent_api

build.gradle.kts

@@ -19,17 +19,21 @@ application {
 
 dependencies {
  implementation("io.javalin:javalin:6.0.1")
- implementation("org.slf4j:slf4j-simple:2.0.10")
  implementation("io.javalin:javalin-rendering:6.0.1")
  implementation("org.apache.velocity:velocity-engine-core:2.3")
- implementation("org.jdbi:jdbi3-kotlin-sqlobject:3.44.1")
- implementation("io.github.cdimascio:dotenv-kotlin:6.4.1")
  implementation("org.webjars.npm:htmx.org:2.0.0-alpha1")
  implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
  implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")
+ implementation("org.jdbi:jdbi3-kotlin-sqlobject:3.44.1")
+ implementation("com.zaxxer:HikariCP:5.1.0")
+ implementation("org.slf4j:slf4j-simple:2.0.10")
+ implementation("io.github.cdimascio:dotenv-kotlin:6.4.1")
 
  testImplementation("org.jetbrains.kotlin:kotlin-test")
  testImplementation("org.spockframework:spock-core:2.3-groovy-4.0")
+
+ runtimeOnly("com.h2database:h2:2.2.224")
+
 }
 
 tasks.test {

src/main/kotlin/sample/htmx/App.kt

@@ -10,6 +10,7 @@ import sample.htmx.config.Database
 import sample.htmx.controller.TodoController
 import sample.htmx.model.TodoItem
 import sample.htmx.service.TodoService
+import javax.xml.crypto.Data
 
 class App(
  private val controller: TodoController = TodoController(),
@@ -40,6 +41,7 @@ class App(
 }
 
 fun main() {
+ Database.init()
  val app = App()
  app.start()
 }

src/main/kotlin/sample/htmx/config/Database.kt

@@ -1,7 +1,42 @@
 package sample.htmx.config
 
-import org.slf4j.LoggerFactory
+import com.zaxxer.hikari.HikariConfig
+import com.zaxxer.hikari.HikariDataSource
+import io.github.cdimascio.dotenv.Dotenv
+import org.jdbi.v3.core.Jdbi
+import javax.sql.DataSource
 
 class Database {
- private val logger by lazy { LoggerFactory.getLogger(Database::class.java) }
+
+ companion object {
+
+ private val dotenv by lazy {
+ Dotenv.configure().load()
+ }
+
+ private val config by lazy {
+ HikariConfig(dotenv.get("DATASOURCE_PROPERTIES"))
+ }
+
+ private val dataSource: DataSource by lazy {
+ HikariDataSource(config)
+ }
+
+ val jdbi: Jdbi by lazy {
+ Jdbi.create(dataSource)
+ }
+
+ fun init() {
+ jdbi.withHandle<Any, Exception> { handle ->
+ handle.execute("""
+ create table if not exists todos(
+ id integer primary key auto_increment,
+ description text not null,
+ done boolean default false,
+ created timestamp default now()
+ );
+ """.trimIndent())
+ }
+ }
+ }
 }

src/main/kotlin/sample/htmx/controller/TodoController.kt

@@ -39,7 +39,10 @@ class TodoController(private val service: TodoService = TodoService()) {
 
  fun update(ctx: Context): Context {
  logger.info("update")
- val todo = ctx.bodyAsClass<TodoItem>()
+ val todo = TodoItem(
+ description = ctx.formParam("description").toString(),
+ done = ctx.formParam("done").toBoolean()
+ )
  val id = ctx.pathParam("id").toLong()
  todo.id = id
  service.update(todo)

src/main/kotlin/sample/htmx/model/TodoItem.kt

@@ -4,7 +4,7 @@ import java.time.LocalDateTime
 
 class TodoItem(
  var id: Long? = -1,
- var description: String?,
+ var description: String? = "",
  var done: Boolean? = false,
  var created: LocalDateTime? = LocalDateTime.now()
 )

src/main/kotlin/sample/htmx/service/TodoService.kt

@@ -1,34 +1,70 @@
 package sample.htmx.service
 
+import org.jdbi.v3.core.Jdbi
 import org.slf4j.LoggerFactory
 import sample.htmx.config.Database
 import sample.htmx.model.TodoItem
 
-class TodoService(private val db: Database = Database()) {
+class TodoService(private val db: Jdbi = Database.jdbi) {
 
  private val logger by lazy { LoggerFactory.getLogger(TodoService::class.java) }
  fun list(q: String? = ""): List<TodoItem> {
  logger.info("list todos")
- return listOf(TodoItem(1, "test"), TodoItem(2, "test"))
+ return db.withHandle<List<TodoItem>, Exception> { handle ->
+ handle.createQuery(
+ """
+ select * from todos
+ where lower(description) like lower(:q)
+ """.trimIndent()
+ ).bind("q", "%$q%").mapToBean(TodoItem::class.java).list()
+ }
  }
 
  fun find(id: Long): TodoItem {
  logger.info("find todos")
- return TodoItem(id, "test")
+ return db.withHandle<TodoItem, Exception> { handle ->
+ handle.createQuery(
+ """
+ select * from todos
+ where id = :id
+ """.trimIndent()
+ ).bind("id", id).mapToBean(TodoItem::class.java).one()
+ }
  }
 
- fun insert(item: TodoItem): String {
+ fun insert(item: TodoItem): Int {
  logger.info("insert todo")
- return "OK"
+ return db.withHandle<Int, Exception> { handle ->
+ handle.createUpdate(
+ """
+ insert into todos(description, done)
+ values (:description, :done)
+ """.trimIndent()
+ ).bindBean(item).execute()
+ }
  }
 
- fun update(item: TodoItem): String {
+ fun update(item: TodoItem): Int {
  logger.info("update todo")
- return "OK"
+ return db.withHandle<Int, Exception> { handle ->
+ handle.createUpdate(
+ """
+ update todos
+ set description = :description, 
+ done = :done where id = :id
+ """.trimIndent()
+ ).bindBean(item).execute()
+ }
  }
 
- fun delete(id: Long): String {
+ fun delete(id: Long): Int {
  logger.info("delete todo")
- return "OK"
+ return db.withHandle<Int, Exception> { handle ->
+ handle.createUpdate(
+ """
+ delete from todos where id = :id
+ """.trimIndent()
+ ).bind("id", id).execute()
+ }
  }
 }

src/main/resources/.env

@@ -1,6 +1,4 @@
 # the app is customizable via environment variables
-DB_URL=
-DB_USER=
-DB_PASS=
+DATASOURCE_PROPERTIES=/todo-datasource-dev.properties
 # either development, test or production
 MODE=development

src/main/resources/templates/velocity/index.vm

@@ -6,13 +6,7 @@
 </head>
 <body>
 <h1>TODO List</h1>
-<form hx-post="/todos"
- hx-on::after-request="this.reset()" hx-swap="outerHTML" hx-target="#table">
- <label>
- <input name="description" placeholder="New todo here"/>
- </label>
- <button type="submit">Save</button>
-</form>
+ #parse("/templates/velocity/todos/form.vm")
  #parse("/templates/velocity/todos/list.vm")
 </body>
 </html>

src/main/resources/templates/velocity/todos/form.vm

@@ -0,0 +1,7 @@
+<form id="form" hx-post="/todos"
+ hx-on::after-request="this.reset()" hx-swap="outerHTML" hx-target="#table">
+ <label>Description
+ <input name="description" placeholder="New todo here"/>
+ </label>
+ <button type="submit">Save</button>
+</form>

src/main/resources/templates/velocity/todos/list.vm

@@ -3,12 +3,21 @@
  <th>#</th>
  <th>Description</th>
  <th>Done?</th>
+ <th></th>
  </tr>
  #foreach($todo in $todos)
  <tr>
- <td>$todo.id</td>
- <td>$todo.description</td>
- <td>$todo.done</td>
+ <form hx-put="/todos/$todo.id" id="item$todo.id" hx-swap="outerHTML" hx-target="#table">
+ <td>$todo.id</td>
+ <td><input type="text" name="description" value="$todo.description"/></td>
+ <td>
+ <select name="done">
+ <option #if($todo.done) selected #end>true</option>
+ <option #if(!$todo.done) selected #end>false</option>
+ </select>
+ </td>
+ <td><button type="submit">Save</button></td>
+ </form>
  </tr>
  #end
 </table>

src/main/resources/todo-datasource-dev.properties

@@ -0,0 +1,8 @@
+# src/main/resources/todo-datasource-dev.properties
+
+driverClassName=org.h2.Driver
+jdbcUrl=jdbc:h2:./todo
+maximumPoolSize=10
+minimumIdle=2
+username=sa
+password=sa

src/test/resources/.env

@@ -1,6 +1,4 @@
 # the app is customizable via environment variables
-DB_URL=
-DB_USER=
-DB_PASS=
+DATASOURCE_PROPERTIES=/todo-datasource-test.properties
 # either development, test or production
 MODE=test

src/test/resources/todo-datasource-test.properties

@@ -0,0 +1,8 @@
+# src/test/resources/todo-datasource-test.properties
+
+driverClassName=org.h2.Driver
+jdbcUrl=jdbc:h2:mem:todo
+maximumPoolSize=10
+minimumIdle=2
+username=sa
+password=sa