use laziness for session test kits to support cases where configuration needs to be loaded dynamically (e.g. if dependent on dynamic ports for containers)

Author: fupelaqu

build.sbt

@@ -8,7 +8,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "generic-persistence-api"
 
-ThisBuild / version := "0.7.2"
+ThisBuild / version := "0.7.3"
 
 ThisBuild / scalaVersion := "2.12.18"
 

core/src/main/scala/app/softnetwork/persistence/query/JsonProvider.scala

@@ -167,25 +167,46 @@ trait JsonProvider[T <: Timestamped] extends ExternalPersistenceProvider[T] {
         } match {
           case Success(value) if value.uuid != uuid => // do nothing
           case Success(value) if value.uuid == uuid && value.state.isDefined || value.deleted =>
-            lastMatchingLine = value.state // return the state
+            if(value.deleted){
+              lastMatchingLine = None
+            }
+            else{
+              lastMatchingLine = value.state // return the state
+            }
           case _ =>
-            serialization.read[Map[String, Any]](line).get("state") match {
-              case Some(updated: Map[String, Any]) =>
-                lastMatchingLine match {
-                  case Some(l)
-                      if updated
-                        .get("lastUpdated")
-                        .map(lu => Instant.parse(lu.toString))
-                        .getOrElse(Instant.MIN)
-                        .isAfter(l.lastUpdated) => // update the state
-                    Try(updateCaseClass(l, updated)) match {
-                      case Success(updated: T) =>
-                        lastMatchingLine = Some(updated)
+            val parsed = serialization.read[Map[String, Any]](line)
+            val _uuid = parsed.get("uuid") match {
+              case Some(u: String) => u
+              case _               => ""
+            }
+            if (uuid == _uuid) {
+              val deleted = parsed.get("deleted") match {
+                case Some(d) => d.toString.toBoolean
+                case _       => false
+              }
+              if(deleted){
+                lastMatchingLine = None
+              }
+              else{
+                parsed.get("state") match {
+                  case Some(updated: Map[String, Any]) =>
+                    lastMatchingLine match {
+                      case Some(l)
+                        if updated
+                          .get("lastUpdated")
+                          .map(lu => Instant.parse(lu.toString))
+                          .getOrElse(Instant.MIN)
+                          .isAfter(l.lastUpdated) => // update the state
+                        Try(updateCaseClass(l, updated)) match {
+                          case Success(updated: T) =>
+                            lastMatchingLine = Some(updated)
+                          case _ =>
+                        }
                       case _ =>
                     }
                   case _ =>
                 }
-              case _ =>
+              }
             }
         }
       }

project/Versions.scala

@@ -50,5 +50,5 @@ object Versions {
 
   val akkaPersistenceCassandra = "1.0.6"
 
-  val testContainers = "1.18.0"
+  val testContainers = "1.20.6"
 }

session/testkit/src/main/scala/app/softnetwork/session/scalatest/CookieSessionTestKit.scala

@@ -12,6 +12,6 @@ trait CookieSessionTestKit[T <: SessionData with SessionDataDecorator[T]]
 
   def cookieConfig: CookieConfig
 
-  final override val sessionHeaderName: String = cookieConfig.name
+  final override lazy val sessionHeaderName: String = cookieConfig.name
 
 }

session/testkit/src/main/scala/app/softnetwork/session/scalatest/HeaderSessionTestKit.scala

@@ -13,7 +13,7 @@ trait HeaderSessionTestKit[T <: SessionData with SessionDataDecorator[T]]
 
   def headerConfig: HeaderConfig
 
-  final override val sessionHeaderName: String = headerConfig.sendToClientHeaderName
+  final override lazy val sessionHeaderName: String = headerConfig.sendToClientHeaderName
 
   final override def mapRawHeader: RawHeader => Option[RawHeader] = raw =>
     if (raw.name == manager.config.sessionHeaderConfig.sendToClientHeaderName)

session/testkit/src/main/scala/app/softnetwork/session/scalatest/OneOffCookieSessionTestKit.scala

@@ -12,7 +12,7 @@ trait OneOffCookieSessionTestKit[T <: SessionData with SessionDataDecorator[T]]
     with OneOffSessionTestKit[T] {
   _: Suite with ApiRoutes with SessionMaterials[T] =>
 
-  override def cookieConfig: CookieConfig = manager.config.sessionCookieConfig
+  override lazy val cookieConfig: CookieConfig = manager.config.sessionCookieConfig
 
   override protected val sessionType: Session.SessionType = Session.SessionType.OneOffCookie
 

session/testkit/src/main/scala/app/softnetwork/session/scalatest/OneOffHeaderSessionTestKit.scala

@@ -12,7 +12,7 @@ trait OneOffHeaderSessionTestKit[T <: SessionData with SessionDataDecorator[T]]
     with OneOffSessionTestKit[T] {
   _: Suite with ApiRoutes with SessionMaterials[T] =>
 
-  override def headerConfig: HeaderConfig = manager.config.sessionHeaderConfig
+  override lazy val headerConfig: HeaderConfig = manager.config.sessionHeaderConfig
 
   override protected val sessionType: Session.SessionType = Session.SessionType.OneOffHeader
 

session/testkit/src/main/scala/app/softnetwork/session/scalatest/RefreshableCookieSessionTestKit.scala

@@ -12,7 +12,7 @@ trait RefreshableCookieSessionTestKit[T <: SessionData with SessionDataDecorator
     with RefreshableSessionTestKit[T] {
   _: Suite with ApiRoutes with SessionMaterials[T] =>
 
-  override def cookieConfig: CookieConfig = manager.config.refreshTokenCookieConfig
+  override lazy val cookieConfig: CookieConfig = manager.config.refreshTokenCookieConfig
 
   override protected val sessionType: Session.SessionType = Session.SessionType.RefreshableCookie
 

session/testkit/src/main/scala/app/softnetwork/session/scalatest/RefreshableHeaderSessionTestKit.scala

@@ -12,7 +12,7 @@ trait RefreshableHeaderSessionTestKit[T <: SessionData with SessionDataDecorator
     with RefreshableSessionTestKit[T] {
   _: Suite with ApiRoutes with SessionMaterials[T] =>
 
-  override def headerConfig: HeaderConfig = manager.config.refreshTokenHeaderConfig
+  override lazy val headerConfig: HeaderConfig = manager.config.refreshTokenHeaderConfig
 
   override protected val sessionType: Session.SessionType = Session.SessionType.RefreshableHeader
 

session/testkit/src/main/scala/app/softnetwork/session/scalatest/SessionEndpointsRoutes.scala

@@ -13,7 +13,7 @@ trait SessionEndpointsRoutes[T <: SessionData with SessionDataDecorator[T]] exte
   self: SessionTestKit[T] with SessionMaterials[T] =>
   def sessionServiceEndpoints: ActorSystem[_] => SessionEndpointsRoute[T] = sys =>
     new SessionEndpointsRoute[T] with SessionMaterials[T] {
-      override implicit def sessionConfig: SessionConfig = self.sessionConfig
+      override implicit lazy val sessionConfig: SessionConfig = self.sessionConfig
       override implicit def manager(implicit
         sessionConfig: SessionConfig,
         companion: SessionDataCompanion[T]