refactoring after upgrading server dependencies

SOFTNETWORK-APP · Jul 28, 2023 · b60598a · b60598a
1 parent e434984
commit b60598a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "account"
 
-ThisBuild / version := "0.3.2.1"
+ThisBuild / version := "0.3.3"
 
 ThisBuild / scalaVersion := "2.12.15"
 

diff --git a/core/src/main/scala/app/softnetwork/account/launch/AccountRoutes.scala b/core/src/main/scala/app/softnetwork/account/launch/AccountRoutes.scala
@@ -2,7 +2,7 @@ package app.softnetwork.account.launch
 
 import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.server.Route
-import app.softnetwork.api.server.ApiRoutes
+import app.softnetwork.api.server.{ApiRoute, ApiRoutes}
 import app.softnetwork.account.model.{
   Account,
   AccountDecorator,
@@ -33,6 +33,7 @@ trait AccountRoutes[
 
   def accountService: ActorSystem[_] => AccountService[PV, DV, AV]
 
-  override def apiRoutes(system: ActorSystem[_]): Route = accountService(system).route
+  override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
+    system => List(accountService(system))
 
 }
diff --git a/core/src/main/scala/app/softnetwork/account/service/AccountService.scala b/core/src/main/scala/app/softnetwork/account/service/AccountService.scala
@@ -32,7 +32,8 @@ trait AccountService[PV <: ProfileView, DV <: AccountDetailsView, AV <: AccountV
     with Directives
     with DefaultComplete
     with Json4sSupport
-    with StrictLogging { _: CommandTypeKey[AccountCommand] with ManifestWrapper[AV] =>
+    with StrictLogging
+    with ApiRoute { _: CommandTypeKey[AccountCommand] with ManifestWrapper[AV] =>
 
   type SU
 

diff --git a/project/src/main/scala/app/softnetwork/sbt/build/Versions.scala b/project/src/main/scala/app/softnetwork/sbt/build/Versions.scala
@@ -2,11 +2,11 @@ package app.softnetwork.sbt.build
 
 object Versions {
 
-  val genericPersistence = "0.3.4"
+  val genericPersistence = "0.3.5"
 
-  val notification = "0.3.4"
+  val notification = "0.3.5"
 
-  val scheduler = "0.3.4"
+  val scheduler = "0.3.5"
 
   val scalatest = "3.1.1"
 }