update notification api adding support for session for web sockets

Author: fupelaqu

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsApi.scala

@@ -1,8 +1,8 @@
 package app.softnetwork.notification.api
 
 import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.ApiRoutes
 import app.softnetwork.notification.handlers.AllNotificationsHandler
-import app.softnetwork.notification.launch.{NotificationApplication, NotificationRoutes}
 import app.softnetwork.notification.model.Notification
 import app.softnetwork.notification.persistence.query.{
   NotificationCommandProcessorStream,
@@ -15,11 +15,11 @@ import app.softnetwork.notification.persistence.typed.{
 import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcOffsetProvider}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.config.SchedulerSettings
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 import com.typesafe.config.Config
 
-trait AllNotificationsApi
-    extends NotificationApplication[Notification]
-    with NotificationRoutes[Notification] { _: SchemaProvider =>
+trait AllNotificationsApi[SD <: SessionData with SessionDataDecorator[SD]]
+    extends NotificationApi[SD, Notification] { _: ApiRoutes with SchemaProvider =>
 
   override def notificationBehaviors: ActorSystem[_] => Seq[NotificationBehavior[Notification]] =
     _ => Seq(AllNotificationsBehavior)

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsRoutesApi.scala

@@ -0,0 +1,9 @@
+package app.softnetwork.notification.api
+
+import app.softnetwork.notification.model.Notification
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
+
+trait AllNotificationsRoutesApi[SD <: SessionData with SessionDataDecorator[SD]]
+    extends AllNotificationsApi[SD]
+    with NotificationRoutesApi[SD, Notification] { _: SchemaProvider => }

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsPostgresLauncher.scala renamed to api/src/main/scala/app/softnetwork/notification/api/AllNotificationsRoutesPostgresLauncher.scala

@@ -1,12 +1,15 @@
 package app.softnetwork.notification.api
 
-import akka.actor.typed.ActorSystem
-import app.softnetwork.api.server.ApiRoute
 import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
 import app.softnetwork.persistence.schema.SchemaType
+import app.softnetwork.session.api.SessionApi
 import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.Session
 
-object AllNotificationsPostgresLauncher extends AllNotificationsApi with JdbcSchemaProvider {
+object AllNotificationsRoutesPostgresLauncher
+    extends AllNotificationsRoutesApi[Session]
+    with SessionApi
+    with JdbcSchemaProvider {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerEndpointsApi.scala

@@ -1,9 +1,12 @@
 package app.softnetwork.notification.api
 
+import app.softnetwork.notification.model.Notification
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.api.SchedulerEndpointsApi
 import app.softnetwork.session.CsrfCheck
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 
-trait AllNotificationsWithSchedulerEndpointsApi
-    extends AllNotificationsWithSchedulerApi
+trait AllNotificationsWithSchedulerEndpointsApi[SD <: SessionData with SessionDataDecorator[SD]]
+    extends AllNotificationsApi[SD]
+    with NotificationWithSchedulerApi[SD, Notification]
     with SchedulerEndpointsApi { _: SchemaProvider with CsrfCheck => }

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerEndpointsPostgresLauncher.scala

@@ -3,10 +3,13 @@ package app.softnetwork.notification.api
 import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
 import app.softnetwork.persistence.schema.SchemaType
 import app.softnetwork.session.CsrfCheckHeader
+import app.softnetwork.session.api.SessionApi
 import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.Session
 
 object AllNotificationsWithSchedulerEndpointsPostgresLauncher
-    extends AllNotificationsWithSchedulerEndpointsApi
+    extends AllNotificationsWithSchedulerEndpointsApi[Session]
+    with SessionApi
     with JdbcSchemaProvider
     with CsrfCheckHeader {
 

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerRoutesApi.scala

@@ -1,8 +1,9 @@
 package app.softnetwork.notification.api
 
+import app.softnetwork.notification.model.Notification
 import app.softnetwork.persistence.schema.SchemaProvider
-import app.softnetwork.scheduler.api.SchedulerRoutesApi
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 
-trait AllNotificationsWithSchedulerRoutesApi
-    extends AllNotificationsWithSchedulerApi
-    with SchedulerRoutesApi { _: SchemaProvider => }
+trait AllNotificationsWithSchedulerRoutesApi[SD <: SessionData with SessionDataDecorator[SD]]
+    extends AllNotificationsApi[SD]
+    with NotificationWithSchedulerRoutesApi[SD, Notification] { _: SchemaProvider => }

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerRoutesPostgresLauncher.scala

@@ -2,10 +2,13 @@ package app.softnetwork.notification.api
 
 import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
 import app.softnetwork.persistence.schema.SchemaType
+import app.softnetwork.session.api.SessionApi
 import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.Session
 
 object AllNotificationsWithSchedulerRoutesPostgresLauncher
-    extends AllNotificationsWithSchedulerRoutesApi
+    extends AllNotificationsWithSchedulerRoutesApi[Session]
+    with SessionApi
     with JdbcSchemaProvider {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName

api/src/main/scala/app/softnetwork/notification/api/NotificationApi.scala

@@ -0,0 +1,13 @@
+package app.softnetwork.notification.api
+
+import app.softnetwork.api.server.ApiRoutes
+import app.softnetwork.notification.launch.{NotificationApiRoutes, NotificationApplication}
+import app.softnetwork.notification.model.Notification
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.session.api.SessionDataApi
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
+
+trait NotificationApi[SD <: SessionData with SessionDataDecorator[SD], T <: Notification]
+    extends NotificationApplication[T]
+    with SessionDataApi[SD]
+    with NotificationApiRoutes[SD, T] { _: ApiRoutes with SchemaProvider => }

api/src/main/scala/app/softnetwork/notification/api/NotificationRoutesApi.scala

@@ -0,0 +1,40 @@
+package app.softnetwork.notification.api
+
+import akka.actor.typed.ActorSystem
+import app.softnetwork.notification.launch.NotificationRoutes
+import app.softnetwork.notification.model.Notification
+import app.softnetwork.notification.service.NotificationService
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.session.CsrfCheckHeader
+import app.softnetwork.session.model.{SessionData, SessionDataCompanion, SessionDataDecorator}
+import app.softnetwork.session.service.SessionMaterials
+import com.softwaremill.session.{RefreshTokenStorage, SessionConfig, SessionManager}
+import org.softnetwork.session.model.Session
+
+import scala.concurrent.ExecutionContext
+
+trait NotificationRoutesApi[SD <: SessionData with SessionDataDecorator[SD], T <: Notification]
+    extends NotificationRoutes[SD, T]
+    with CsrfCheckHeader {
+  self: NotificationApi[SD, T] with SchemaProvider =>
+  override def notificationService: ActorSystem[_] => NotificationService[SD] = sys =>
+    new NotificationService[SD] with SessionMaterials[SD] {
+      override implicit def manager(implicit
+        sessionConfig: SessionConfig,
+        companion: SessionDataCompanion[SD]
+      ): SessionManager[SD] = self.manager
+
+      override protected def sessionType: Session.SessionType = self.sessionType
+
+      override implicit def sessionConfig: SessionConfig = self.sessionConfig
+
+      override implicit def system: ActorSystem[_] = sys
+
+      override lazy val ec: ExecutionContext = sys.executionContext
+
+      override implicit def refreshTokenStorage: RefreshTokenStorage[SD] =
+        self.refreshTokenStorage(sys)
+
+      override implicit def companion: SessionDataCompanion[SD] = self.companion
+    }
+}

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerApi.scala renamed to api/src/main/scala/app/softnetwork/notification/api/NotificationWithSchedulerApi.scala

@@ -1,17 +1,23 @@
 package app.softnetwork.notification.api
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.api.server.GrpcService
+import app.softnetwork.api.server.{ApiRoutes, GrpcService}
+import app.softnetwork.notification.model.Notification
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.query.EventProcessorStream
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.api.SchedulerApi
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 
-trait AllNotificationsWithSchedulerApi extends AllNotificationsApi with SchedulerApi {
-  _: SchemaProvider =>
+trait NotificationWithSchedulerApi[SD <: SessionData with SessionDataDecorator[
+  SD
+], T <: Notification]
+    extends NotificationApi[SD, T]
+    with SchedulerApi {
+  _: ApiRoutes with SchemaProvider =>
 
   override def entities: ActorSystem[_] => Seq[PersistentEntity[_, _, _, _]] = sys =>
-    schedulerEntities(sys) ++ notificationEntities(sys)
+    schedulerEntities(sys) ++ sessionEntities(sys) ++ notificationEntities(sys)
 
   override def eventProcessorStreams: ActorSystem[_] => Seq[EventProcessorStream[_]] = sys =>
     schedulerEventProcessorStreams(sys) ++