to fix jdbc state update

Author: fupelaqu

jdbc/src/main/scala/app/softnetwork/persistence/jdbc/query/JdbcStateProvider.scala

@@ -72,15 +72,25 @@ trait JdbcStateProvider[T <: Timestamped]
     */
   override final def updateDocument(document: T, upsert: Boolean = true)(implicit
     t: ClassTag[T]
-  ): Boolean = writeToDb(
-    StateWrapper[T](
-      document.uuid,
-      document.lastUpdated,
-      deleted = false,
-      Option(document)
-    ),
-    to_update = true
-  )
+  ): Boolean = {
+    var to_update: Boolean = false
+    if (upsert) {
+      loadDocument(document.uuid) match {
+        case Some(_) =>
+          to_update = true
+        case _ =>
+      }
+    }
+    writeToDb(
+      StateWrapper[T](
+        document.uuid,
+        document.lastUpdated,
+        deleted = false,
+        Option(document)
+      ),
+      to_update = to_update
+    )
+  }
 
   /** Upsert the underlying document referenced by its uuid to the database
     *
@@ -188,8 +198,8 @@ trait JdbcStateProvider[T <: Timestamped]
     (if (!to_update) {
        insert(document.uuid, document.lastUpdated, document.deleted, state)
      } else {
-         alogger.debug(s"Updating document ${document.uuid} with data $state")
-         update(document.uuid, document.lastUpdated, document.deleted, state)
+       alogger.debug(s"Updating document ${document.uuid} with data $state")
+       update(document.uuid, document.lastUpdated, document.deleted, state)
      }) && writeToFile(
       document,
       data

jdbc/testkit/src/main/scala/app/softnetwork/persistence/person/H2PersonTestKit.scala

@@ -1,7 +1,6 @@
 package app.softnetwork.persistence.person
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.persistence.jdbc.query.JdbcOffsetProvider
 import app.softnetwork.persistence.jdbc.scalatest.H2TestKit
 import app.softnetwork.persistence.model.StateWrappertReader
 import app.softnetwork.persistence.person.model.Person
@@ -17,7 +16,7 @@ trait H2PersonTestKit extends JdbcPersonTestKit with H2TestKit with H2Profile {
   override def externalPersistenceProvider: ExternalPersistenceProvider[Person] = this
   override def person2ExternalProcessorStream: ActorSystem[_] => PersonToExternalProcessorStream =
     sys =>
-      new PersonToJdbcProcessorStreamWithJdbcJournal with JdbcOffsetProvider with H2Profile {
+      new PersonToJdbcProcessorStreamWithJdbcJournal with H2Profile {
         override def config: Config = H2PersonTestKit.this.config
 
         override val forTests: Boolean = true

jdbc/testkit/src/main/scala/app/softnetwork/persistence/person/MySQLPersonTestKit.scala

@@ -1,7 +1,6 @@
 package app.softnetwork.persistence.person
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.persistence.jdbc.query.JdbcOffsetProvider
 import app.softnetwork.persistence.jdbc.scalatest.MySQLTestKit
 import app.softnetwork.persistence.model.StateWrappertReader
 import app.softnetwork.persistence.person.model.Person
@@ -17,7 +16,7 @@ trait MySQLPersonTestKit extends JdbcPersonTestKit with MySQLTestKit with MySQLP
   override def externalPersistenceProvider: ExternalPersistenceProvider[Person] = this
   override def person2ExternalProcessorStream: ActorSystem[_] => PersonToExternalProcessorStream =
     sys =>
-      new PersonToJdbcProcessorStreamWithJdbcJournal with JdbcOffsetProvider with MySQLProfile {
+      new PersonToJdbcProcessorStreamWithJdbcJournal with MySQLProfile {
         override def config: Config = MySQLPersonTestKit.this.config
 
         override val forTests: Boolean = true

jdbc/testkit/src/main/scala/app/softnetwork/persistence/person/PostgresPersonTestKit.scala

@@ -1,7 +1,6 @@
 package app.softnetwork.persistence.person
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.persistence.jdbc.query.JdbcOffsetProvider
 import app.softnetwork.persistence.jdbc.scalatest.PostgresTestKit
 import app.softnetwork.persistence.model.StateWrappertReader
 import app.softnetwork.persistence.person.model.Person
@@ -17,7 +16,7 @@ trait PostgresPersonTestKit extends JdbcPersonTestKit with PostgresTestKit with
   override def externalPersistenceProvider: ExternalPersistenceProvider[Person] = this
   override def person2ExternalProcessorStream: ActorSystem[_] => PersonToExternalProcessorStream =
     sys =>
-      new PersonToJdbcProcessorStreamWithJdbcJournal with JdbcOffsetProvider with PostgresProfile {
+      new PersonToJdbcProcessorStreamWithJdbcJournal with PostgresProfile {
         override def config: Config = PostgresPersonTestKit.this.config
 
         override val forTests: Boolean = true