Extract transaction stuff to external package.

Author: Al Scott

.idea/kotlinc.xml

@@ -38,6 +38,11 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>com.campspot</groupId>
+      <artifactId>dropwizard-jdbi3-transactions-core</artifactId>
+      <version>1.0</version>
+    </dependency>
     <dependency>
       <groupId>io.dropwizard</groupId>
       <artifactId>dropwizard-core</artifactId>
@@ -55,21 +60,6 @@
       <artifactId>dropwizard-jdbi3</artifactId>
       <version>1.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.jdbi</groupId>
-      <artifactId>jdbi3-core</artifactId>
-      <version>3.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jdbi</groupId>
-      <artifactId>jdbi3-kotlin</artifactId>
-      <version>3.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jdbi</groupId>
-      <artifactId>jdbi3-kotlin-sqlobject</artifactId>
-      <version>3.0.1</version>
-    </dependency>
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -104,6 +94,12 @@
     </dependency>
 
 
+    <dependency>
+      <groupId>com.campspot</groupId>
+      <artifactId>dropwizard-jdbi3-transactions-test</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.dropwizard</groupId>
       <artifactId>dropwizard-testing</artifactId>
@@ -247,6 +243,11 @@
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
         <version>${kotlin.version}</version>
+        <configuration>
+          <args>
+            <arg>-java-parameters</arg>
+          </args>
+        </configuration>
         <executions>
           <execution>
             <id>compile</id>

pom.xml

@@ -1,13 +1,15 @@
 package com.campspot
 
 import com.campspot.dao.PunchDAO
+import com.campspot.jdbi3.DAOManager
+import com.campspot.jdbi3.TransactionApplicationListener
 import com.campspot.lib.MockableObject
 import com.campspot.lib.PunchLib
 import com.campspot.middleware.charset.CharsetResponseFilter
-import com.campspot.middleware.transactions.DAOManager
-import com.campspot.middleware.transactions.TransactionApplicationListener
 import com.campspot.resources.PunchResource
+import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.module.paramnames.ParameterNamesModule
 import com.github.arteam.jdbi3.JdbiFactory
 import io.dropwizard.Application
 import io.dropwizard.assets.AssetsBundle
@@ -45,6 +47,7 @@ class TimeTrackingApplication : Application<TimeTrackingConfiguration>() {
 
     val objectMapper = environment.objectMapper
     objectMapper.registerModule(KotlinModule())
+    objectMapper.registerModule(ParameterNamesModule(JsonCreator.Mode.PROPERTIES))
     objectMapper.configure(com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
     objectMapper.setTimeZone(utc)
 

src/main/kotlin/com/campspot/TimeTrackingApplication.kt

@@ -7,5 +7,6 @@ data class Punch(
   val start: ZonedDateTime,
   val end: ZonedDateTime,
   val category: String,
-  val description: String
+  val description: String,
+  var isPaid: Boolean
 )

src/main/kotlin/com/campspot/api/Punch.kt

@@ -1,6 +1,7 @@
 package com.campspot.dao
 
 import com.campspot.api.Punch
+import com.campspot.jdbi3.DAO
 import org.jdbi.v3.sqlobject.statement.GetGeneratedKeys
 import org.jdbi.v3.sqlobject.statement.SqlQuery
 import org.jdbi.v3.sqlobject.statement.SqlUpdate

src/main/kotlin/com/campspot/dao/DAO.kt

@@ -4,7 +4,7 @@ import com.campspot.api.Punch
 import com.campspot.dao.PunchDAO
 import com.campspot.exceptions.EntityNotFoundException
 import com.campspot.exceptions.PunchCannotOverlapException
-import com.campspot.middleware.transactions.DAOManager
+import com.campspot.jdbi3.DAOManager
 import java.time.ZonedDateTime
 
 class PunchLib(

src/main/kotlin/com/campspot/dao/PunchDAO.kt

@@ -2,8 +2,8 @@ package com.campspot.resources
 
 import com.campspot.TimeTrackingApplication.Companion.MASTER
 import com.campspot.api.Punch
+import com.campspot.jdbi3.InTransaction
 import com.campspot.lib.PunchLib
-import com.campspot.middleware.transactions.InTransaction
 import com.codahale.metrics.annotation.Timed
 import io.dropwizard.jersey.jsr310.ZonedDateTimeParam
 import org.hibernate.validator.valuehandling.UnwrapValidatedValue

src/main/kotlin/com/campspot/lib/PunchLib.kt

@@ -28,4 +28,10 @@
       <column name="end"/>
     </createIndex>
   </changeSet>
+
+  <changeSet id="2" author="Al Scott">
+    <addColumn tableName="Punch">
+      <column name="isPaid" type="boolean"/>
+    </addColumn>
+  </changeSet>
 </databaseChangeLog>

src/main/kotlin/com/campspot/middleware/transactions/DAOManager.kt

@@ -8,7 +8,8 @@ class PunchTest {
     start = ZonedDateTime.parse("2016-10-05T06:45:00Z[UTC]"),
     end = ZonedDateTime.parse("2016-10-05T07:30:00Z[UTC]"),
     category = "Activities",
-    description = "Party rocking"
+    description = "Party rocking",
+    isPaid = true
   )
 
   @Test

src/main/kotlin/com/campspot/middleware/transactions/InTransaction.kt

@@ -18,7 +18,7 @@ class PunchDAOTest : DAOTest() {
       .plusDays(5)
       .withHour(11)
     val end = start.plusMinutes(30)
-    val punch = Punch(start = start, end = end, category = "", description = "")
+    val punch = Punch(start = start, end = end, category = "", description = "", isPaid = true)
 
     punchDAO.create(punch)
 

src/main/kotlin/com/campspot/middleware/transactions/TransactionAspect.kt

@@ -3,9 +3,9 @@ package com.campspot.lib
 import com.campspot.any
 import com.campspot.api.Punch
 import com.campspot.dao.PunchDAO
-import com.campspot.dao.TestDAOManager
 import com.campspot.exceptions.EntityNotFoundException
 import com.campspot.exceptions.PunchCannotOverlapException
+import com.campspot.jdbi3.test.TestDAOManager
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.mockito.Mockito.*
@@ -19,7 +19,7 @@ class PunchLibTest {
 
   val start = ZonedDateTime.now()
   val end = ZonedDateTime.now().plusMinutes(30)
-  val basicPunch = Punch(start = start, end = end, category = "", description = "")
+  val basicPunch = Punch(start = start, end = end, category = "", description = "", isPaid = true)
 
   @Test(expected = PunchCannotOverlapException::class)
   fun create_ThrowsErrorIfPunchOverlaps() {

src/main/kotlin/com/campspot/middleware/transactions/TransactionEventListener.kt

@@ -17,7 +17,7 @@ class PunchResourceTest : IntegrationTest() {
       .withHour(11)
       .withMinute(15)
     val end = start.withMinute(45)
-    val punch = Punch(start = start, end = end, category = "Stuff", description = "Very important, pay me extra")
+    val punch = Punch(start = start, end = end, category = "Stuff", description = "Very important, pay me extra", isPaid = true)
 
     val createdPunch = apiClient!!.createPunch(punch).get()
 
@@ -41,7 +41,7 @@ class PunchResourceTest : IntegrationTest() {
     val end = start.withMinute(45)
     val category = "Stuff"
     val description = "Very important, pay me extra"
-    val punch = Punch(id = id, start = start, end = end, category = category, description = description)
+    val punch = Punch(id = id, start = start, end = end, category = category, description = description, isPaid = false)
 
     val handle = jdbi!!.open()
     handle.execute("INSERT INTO PUNCH (id, start, end, category, description) VALUES (?, ?, ?, ?, ?)", id, start, end, category, description)
@@ -72,7 +72,7 @@ class PunchResourceTest : IntegrationTest() {
       .plusDays(5)
     val rangeEnd = rangeStart.plusDays(5)
 
-    val basePunch = Punch(id = 0, start = rangeStart, end = rangeEnd, category = "", description = "")
+    val basePunch = Punch(id = 0, start = rangeStart, end = rangeEnd, category = "", description = "", isPaid = true)
 
     val beforeStartNoOverlap = basePunch.copy(id = 1, start = rangeStart.minusDays(5), end = rangeStart.minusDays(3))
     val beforeStartTillExactlyStart = basePunch.copy(id = 2, start = rangeStart.minusDays(5), end = rangeStart)

src/main/kotlin/com/campspot/resources/PunchResource.kt

@@ -2,5 +2,6 @@
   "start": "2016-10-05T06:45:00Z",
   "end": "2016-10-05T07:30:00Z",
   "category": "Activities",
-  "description": "Party rocking"
+  "description": "Party rocking",
+  "isPaid": true
 }