Storing speaker and talk updates

Author: anders88

src/main/kotlin/no/java/moresleep/Setup.kt

@@ -20,6 +20,8 @@ enum class SetupValue(val defaultValue:String) {
     ALLACCESS_USER(""),
     READ_USER(""),
     DO_FLYWAY_MIGRATION("true"),
+    STORE_UPDATES("true"),
+
 }
 
 object Setup {

src/main/kotlin/no/java/moresleep/talk/CreateNewSession.kt

@@ -35,7 +35,7 @@ class CreateNewSession(val data: Map<String,DataValue>?=null,val postedBy:String
         }
 
 
-        val dataObject = toDataObject(data)
+        val dataObject:JsonObject = toDataObject(data)
 
         val sessionId:String = id?:UUID.randomUUID().toString()
 
@@ -58,14 +58,19 @@ class CreateNewSession(val data: Map<String,DataValue>?=null,val postedBy:String
             if (!speaker.id.isNullOrEmpty() && systemUser.userType != UserType.SUPERACCESS) {
                 throw ForbiddenRequest("No id allowed on speaker")
             }
-            createdSpeakers.add(speaker.addToDb(sessionId,conferenceId,if (speaker.id.isNullOrEmpty()) null else speaker.id))
+            createdSpeakers.add(speaker.addToDb(sessionId,conferenceId,systemUser,if (speaker.id.isNullOrEmpty()) null else speaker.id))
         }
 
         if (id != null && SessionStatus.publcStatuses.contains(sessionStatus)) {
             PublishTalk.doPublish(id,sessionStatus)
         }
 
-        TalkRepo.registerTalkUpdate(sessionId,conf.id,systemUser.systemId)
+        TalkRepo.registerTalkUpdate(
+            talkid = sessionId,
+            conferenceid = conf.id,
+            systemId = systemUser.systemId,
+            payload = if (Setup.readBoolValue(SetupValue.STORE_UPDATES)) dataObject else null
+        )
 
         return ReadOneTalk().execute(systemUser, mapOf(Pair("id",sessionId)))
 

src/main/kotlin/no/java/moresleep/talk/SpeakerRepo.kt

@@ -1,10 +1,9 @@
 package no.java.moresleep.talk
 
-import no.java.moresleep.ServiceExecutor
-import no.java.moresleep.allFromQuery
-import no.java.moresleep.requiredString
+import no.java.moresleep.*
 import org.jsonbuddy.JsonObject
 import java.sql.ResultSet
+import java.time.*
 import java.util.*
 
 class SpeakerInDb(val id:String,val talkId: String,val name:String,val email: String,val data: JsonObject) {
@@ -53,6 +52,24 @@ object SpeakerRepo {
         }
     }
 
+
+    fun registerSpeakerUpdate(id:String,talkId:String,conferenceid:String,name:String,email:String,data:JsonObject,systemId: SystemId) {
+        ServiceExecutor.connection().preparedStatement("insert into speakerupdate(id,talkid,conferenceid,name,email,data,updatedby,updatedat) values (?,?,?,?,?,?,?,?)") {
+            it.setString(1,id)
+            it.setString(2,talkId)
+            it.setString(3,conferenceid)
+            it.setString(4,name)
+            it.setString(5,email)
+            it.setString(6,data.toJson())
+            it.setString(7,systemId.name)
+            it.setTimestamp(8, LocalDateTime.now())
+            it.executeUpdate()
+        }
+    }
+
+
+
+
     fun deleteSpeaker(speakerid: String) {
         ServiceExecutor.connection().preparedStatement("delete from speaker where id = ?") {
             it.setString(1,speakerid)

src/main/kotlin/no/java/moresleep/talk/SpeakerUpdate.kt

@@ -1,6 +1,6 @@
 package no.java.moresleep.talk
 
-import no.java.moresleep.BadRequest
+import no.java.moresleep.*
 import java.util.*
 
 
@@ -9,15 +9,19 @@ class SpeakerUpdate(val id:String?=null,val name:String?=null,val email:String?=
 
     }
 
-    fun addToDb(sessionId:String,conferenceId:String,givenId:String?=null):Speaker {
+    fun addToDb(sessionId:String,conferenceId:String,systemUser: SystemUser,givenId:String?=null):Speaker {
         if (this.name.isNullOrEmpty()) {
             throw BadRequest("Missing name in speaker")
         }
         if (this.email.isNullOrEmpty()) {
             throw BadRequest("Missing email in speaker")
         }
         val speakerid = givenId?:UUID.randomUUID().toString()
-        SpeakerRepo.addSpeaker(speakerid,sessionId,conferenceId,this.name,this.email, toDataObject(this.data))
+        val dataObject = toDataObject(this.data)
+        SpeakerRepo.addSpeaker(speakerid,sessionId,conferenceId,this.name,this.email, dataObject)
+        if (Setup.readBoolValue(SetupValue.STORE_UPDATES)) {
+            SpeakerRepo.registerSpeakerUpdate(speakerid,sessionId,conferenceId,this.name,this.email,dataObject,systemUser.systemId)
+        }
         return Speaker(
                         id = speakerid,
                         name = this.name,

src/main/kotlin/no/java/moresleep/talk/TalkRepo.kt

@@ -139,12 +139,13 @@ object TalkRepo {
         }
     }
 
-    fun registerTalkUpdate(talkid: String,conferenceid: String,systemId: SystemId) {
-        ServiceExecutor.connection().preparedStatement("insert into talkupdate(talkid,conferenceid, updatedby, updatedat) values (?,?,?,?)") { statement ->
+    fun registerTalkUpdate(talkid: String,conferenceid: String,systemId: SystemId,payload:JsonObject?) {
+        ServiceExecutor.connection().preparedStatement("insert into talkupdate(talkid,conferenceid, updatedby, updatedat,payload) values (?,?,?,?,?)") { statement ->
             statement.setString(1,talkid)
             statement.setString(2,conferenceid)
             statement.setString(3,systemId.name)
             statement.setTimestamp(4,LocalDateTime.now())
+            statement.setString(5,payload?.toJson())
             statement.executeUpdate()
         }
     }

src/main/kotlin/no/java/moresleep/talk/UpdateSession.kt

@@ -28,8 +28,11 @@ class UpdateSession(val data: Map<String,DataValue>?=null,val speakers:List<Spea
                     val newData:JsonObject = exsisting.data
                     updateDataObject(speaker.data,newData)
                     SpeakerRepo.updateSpeaker(speaker.id,newName,newEmail,newData)
+                    if (Setup.readBoolValue(SetupValue.STORE_UPDATES)) {
+                        SpeakerRepo.registerSpeakerUpdate(speaker.id,talkInDb.id,talkInDb.conferenceid,newName,newEmail,newData,systemUser.systemId)
+                    }
                 } else {
-                    createdSpeakers.add(speaker.addToDb(talkInDb.id,talkInDb.conferenceid,null))
+                    createdSpeakers.add(speaker.addToDb(talkInDb.id,talkInDb.conferenceid,systemUser,null))
                 }
             }
             for (exsisting in exsistingSpeakers) {
@@ -51,7 +54,12 @@ class UpdateSession(val data: Map<String,DataValue>?=null,val speakers:List<Spea
             PublishTalk.doPublish(talkInDb.id,status)
         }
 
-        TalkRepo.registerTalkUpdate(talkInDb.id,talkInDb.conferenceid,systemUser.systemId)
+        TalkRepo.registerTalkUpdate(
+            talkid = talkInDb.id,
+            conferenceid = talkInDb.conferenceid,
+            systemId = systemUser.systemId,
+            payload = if (Setup.readBoolValue(SetupValue.STORE_UPDATES)) talkInDb.data else null
+        )
 
         return ReadOneSession().execute(systemUser,parameters)
     }

src/main/resources/db/migration/V7__UpdateStore.sql

@@ -0,0 +1,16 @@
+alter table talkupdate add payload text null;
+
+create table speakerupdate(
+    id text,
+    talkid text,
+    conferenceid text,
+    name text,
+    email text,
+    data text,
+    updatedby text,
+    updatedat timestamp
+);
+
+insert into speakerupdate(id,talkid,conferenceid,name,email,data,updatedby,updatedat)
+select s.id,t.id,t.conferenceid,s.email,s.email,s. data,'UNKNOWN',t.lastupdated
+from speaker s,talk t where s.talkid  = t.id;