update generic server api

Author: fupelaqu

README.md

@@ -2,9 +2,8 @@
 This file is auto-generate by a github hook please modify r.md if you don't want to loose your work
 -->
 ![Build Status](https://github.com/SOFTNETWORK-APP/generic-notification-api/workflows/Build/badge.svg)
-[![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
 [![codecov](https://codecov.io/gh/SOFTNETWORK-APP/generic-notification-api/branch/main/graph/badge.svg)](https://codecov.io/gh/SOFTNETWORK-APP/generic-notification-api/)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/122252a6bdfb41c3af16d31f8cefaecc)](https://www.codacy.com/gh/SOFTNETWORK-APP/generic-notification-api/dashboard?utm_source=github.com&utm_medium=referral&utm_content=SOFTNETWORK-APP/generic-notification-api&utm_campaign=Badge_Grade)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-# generic-notification-api
+# generic-notification-api

build.sbt

@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "notification"
 
-ThisBuild / version := "0.1.5"
+ThisBuild / version := "0.1.6"
 
 ThisBuild / scalaVersion := "2.12.15"
 

common/build.sbt

@@ -10,7 +10,7 @@ libraryDependencies ++= Seq(
   "app.softnetwork.persistence" %% "persistence-kv" % Versions.genericPersistence,
   "app.softnetwork.scheduler" %% "scheduler-common" % Versions.scheduler,
   "app.softnetwork.scheduler" %% "scheduler-common" % Versions.scheduler % "protobuf",
-  "app.softnetwork.api" %% "generic-server-api" % Versions.genericPersistence,
+  "app.softnetwork.api" %% "generic-server-api" % Versions.server,
   "app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.5",
   "org.apache.commons" % "commons-email" % "1.5",
   "com.google.auth" % "google-auth-library-oauth2-http" % "0.20.0" excludeAll guavaExclusion,

common/src/main/scala/app/softnetwork/notification/api/GrpcClient.scala

@@ -2,6 +2,7 @@ package app.softnetwork.notification.api
 
 import akka.actor.typed.ActorSystem
 import akka.grpc.GrpcClientSettings
+import app.softnetwork.api.server.client.{GrpcClient, GrpcClientFactory}
 import org.softnetwork.notification.model.{Mail, NotificationStatusResult, Push, SMS}
 
 import scala.concurrent.Future

common/src/main/scala/app/softnetwork/notification/api/NotificationClient.scala

@@ -4,7 +4,9 @@ object Versions {
 
   val genericPersistence = "0.2.5.15"
 
-  val scheduler = "0.1.2"
+  val scheduler = "0.1.3"
+
+  val server = "0.2.6.2"
 
   val scalatest = "3.1.1"
 }

project/src/main/scala/app/softnetwork/sbt/build/Versions.scala

@@ -8,6 +8,7 @@ name := "notification-testkit"
 
 libraryDependencies ++= Seq(
   "app.softnetwork.scheduler" %% "scheduler-testkit" % Versions.scheduler,
+  "app.softnetwork.api" %% "generic-server-api-testkit" % Versions.server,
   "app.softnetwork.persistence" %% "persistence-session-testkit" % Versions.genericPersistence,
   "com.github.kirviq" % "dumbster" % "1.7.1",
   "org.rapidoid" % "rapidoid-http-server" % "5.5.5"

testkit/build.sbt

@@ -2,20 +2,15 @@ package app.softnetwork.notification.api
 
 import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
-import app.softnetwork.api.server.GrpcServices
+import app.softnetwork.api.server.scalatest.ServerTestKit
 import app.softnetwork.notification.launch.NotificationGuardian
 import app.softnetwork.notification.model.Notification
-import app.softnetwork.schedule.api.SchedulerServiceApiHandler
 import app.softnetwork.scheduler.api.SchedulerGrpcServices
 
 import scala.concurrent.Future
 
 trait NotificationGrpcServices[T <: Notification] extends SchedulerGrpcServices {
-  _: NotificationGuardian[T] =>
-
-  def interface: String
-
-  def port: Int
+  _: NotificationGuardian[T] with ServerTestKit =>
 
   override def grpcServices
     : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] = system =>

testkit/src/main/scala/app/softnetwork/notification/api/NotificationGrpcServices.scala

@@ -50,7 +50,7 @@ trait AllNotificationsTestKit
         override def serverPort: Int = apnsPort
 
         override lazy val config: Config = internalConfig
-      }.initMockServer()
+      }.init()
     )
     assert(
       new SMSMockServer with InternalConfig {
@@ -59,7 +59,7 @@ trait AllNotificationsTestKit
         override def serverPort: Int = smsPort
 
         override def config: Config = internalConfig
-      }.initMockServer()
+      }.init()
     )
     assert(
       new SmtpMockServer with InternalConfig {
@@ -68,7 +68,7 @@ trait AllNotificationsTestKit
         override def serverPort: Int = smtpPort
 
         override lazy val config: Config = internalConfig
-      }.initMockServer()
+      }.init()
     )
   }
 

testkit/src/main/scala/app/softnetwork/notification/scalatest/AllNotificationsTestKit.scala

@@ -1,6 +1,7 @@
 package app.softnetwork.notification.scalatest
 
 import akka.Done
+import app.softnetwork.api.server.scalatest.MockServer
 import app.softnetwork.notification.config.{ApnsConfig, InternalConfig, PushSettings}
 import com.eatthepath.pushy.apns.server.{
   AcceptAllPushNotificationHandlerFactory,
@@ -13,7 +14,7 @@ import scala.compat.java8.FutureConverters.toScala
 import scala.concurrent.Future
 import scala.util.{Failure, Success, Try}
 
-trait ApnsMockServer extends PushSettings with NotificationMockServer {
+trait ApnsMockServer extends PushSettings with MockServer {
   _: InternalConfig =>
 
   override val name: String = "apns"