Merge pull request #17 from pme123/#15-rest-services

#15 rest services

Author: pme123

client/src/main/scala/pme123/adapters/client/HttpServices.scala

@@ -3,7 +3,7 @@ package pme123.adapters.client
 import com.thoughtworks.binding.{Binding, FutureBinding, dom}
 import org.scalajs.dom.ext.{Ajax, AjaxException}
 import org.scalajs.dom.raw.{HTMLElement, XMLHttpRequest}
-import play.api.libs.json.{JsError, JsResult, JsValue, Json}
+import play.api.libs.json._
 import pme123.adapters.shared.Logger
 
 import scala.concurrent.Future
@@ -13,13 +13,16 @@ import scala.util.{Failure, Success}
 trait HttpServices
   extends Logger {
 
-  def httpGet(apiPath: String, toEntity: JsValue => JsResult[Unit]): Binding[HTMLElement] =
-    callService(apiPath, Ajax.get(apiPath), toEntity)
+  def httpGet[A](apiPath: String
+                  , storeChange: A => Unit)
+                 (implicit reads: Reads[A]): Binding[HTMLElement] =
+    callService[A](apiPath, Ajax.get(apiPath), storeChange)
 
   @dom
-  def callService(apiPath: String
-                  , ajaxCall: Future[XMLHttpRequest]
-                  , toEntity: JsValue => JsResult[Unit]): Binding[HTMLElement] = {
+  def callService[A](apiPath: String
+                      , ajaxCall: Future[XMLHttpRequest]
+                      , storeChange: A => Unit)
+                     (implicit reads: Reads[A]): Binding[HTMLElement] = {
     FutureBinding(ajaxCall)
       .bind match {
       case None =>
@@ -30,7 +33,8 @@ trait HttpServices
         val json: JsValue = Json.parse(response.responseText)
         info(s"Json received from $apiPath: ${json.toString().take(20)}")
         <div>
-          {toEntity(json)
+          {json.validate[A]
+          .map(storeChange)
           .map(_ => "")
           .recover { case JsError(errors) =>
             error(s"errors: $errors")

client/src/main/scala/pme123/adapters/client/ServerServices.scala

@@ -2,7 +2,6 @@ package pme123.adapters.client
 
 import com.thoughtworks.binding.Binding
 import org.scalajs.dom.raw.HTMLElement
-import play.api.libs.json.JsValue
 import pme123.adapters.shared.{ClientConfig, JobConfig}
 
 /**
@@ -14,21 +13,13 @@ object ServerServices
   def jobConfigs(): Binding[HTMLElement] = {
     val apiPath = s"${UIStore.uiState.webContext.value}/jobConfigs"
 
-    def toObj(jsValue: JsValue) =
-      jsValue.validate[Seq[JobConfig]]
-        .map(results => UIStore.changeJobConfigs(results))
-
-    httpGet(apiPath, toObj)
+    httpGet(apiPath, (results: Seq[JobConfig]) => UIStore.changeJobConfigs(results))
   }
 
   def clientConfigs(): Binding[HTMLElement] = {
     val apiPath = s"${UIStore.uiState.webContext.value}/clientConfigs"
 
-    def toObj(jsValue: JsValue) =
-      jsValue.validate[Seq[ClientConfig]]
-        .map(results => UIStore.replaceAllClients(results))
-
-    httpGet(apiPath, toObj)
+    httpGet(apiPath, (results: Seq[ClientConfig]) => UIStore.replaceAllClients(results))
   }
 
 

server/app/pme123/adapters/server/control/JobActorSchedulers.scala

@@ -57,7 +57,7 @@ class JobActorSchedulers @Inject()()
 
       def init(execDateTime: Instant): Instant = {
         if (execDateTime isBefore Instant.now) {
-          init(execDateTime.plusSeconds(jobSchedule.intervalInMin * 60))
+          init(execDateTime.plusSeconds((jobSchedule.intervalInMin * 60).asInstanceOf[Long]))
         } else {
           execDateTime
         }

server/app/pme123/adapters/server/entity/JobConfigCreator.scala

@@ -36,7 +36,7 @@ case class ScheduleConfigCreator(config: Config, timezone: ZoneId) {
     if (config.hasPath(firstTimeProp)) config.getString(firstTimeProp) else defaultFirstTime
 
   private val intervalInMin =
-    if (config.hasPath(intervalInMinProp)) config.getInt(intervalInMinProp) else defaultIntervalInMin
+    if (config.hasPath(intervalInMinProp)) config.getDouble(intervalInMinProp) else defaultIntervalInMin
 
   private val firstWeekday =
     if (config.hasPath(firstWeekdayProp)) Some(config.getString(firstWeekdayProp)) else defaultFirstWeekday

server/app/pme123/adapters/server/entity/JobSchedules.scala

@@ -24,9 +24,8 @@ object JobSchedules {
 
 case class JobSchedule(jobIdent: JobIdent, scheduleConfig: ScheduleConfig) {
 
-  private val minIntervalInMin = 1
-  val intervalInMin: Long = Math.max(minIntervalInMin, scheduleConfig.intervalInMin).asInstanceOf[Long]
-
+  private val minIntervalInMin = 1.0/60 // min 1 second
+  val intervalInMin: Double = Math.max(minIntervalInMin, scheduleConfig.intervalInMin)
   val intervalDuration: FiniteDuration = intervalInMin.minutes
 
   // parameters for testing

server/conf/reference.conf

@@ -138,7 +138,7 @@ pme123.adapters {
       // Default is one day (1440 minutes) - be aware 1 minute is the smallest period possible
       // - and it must be greater than the time the import takes!
       // make also sure that the period is so that the import is at always the same time of day.
-     // interval.minutes = 2
+     // interval.minutes = 2.5
     }
   }, {
     ident = "demoJobWithDefaultScheduler"

shared/src/main/scala/pme123/adapters/shared/AdaptersContextProp.scala

@@ -31,7 +31,7 @@ object AdaptersContextProp {
 case class SchedulerInfo(jobIdent: JobIdent
                          , nextExecution: Instant
                          , firstWeekday: String
-                         , periodInMin: Long)
+                         , periodInMin: Double)
 
 object SchedulerInfo extends InstantHelper {
   implicit val jsonFormat: OFormat[SchedulerInfo] = derived.oformat[SchedulerInfo]()

shared/src/main/scala/pme123/adapters/shared/JobConfigs.scala

@@ -19,7 +19,7 @@ object JobConfig {
 
 }
 
-case class ScheduleConfig(firstTime: String, intervalInMin: Int, firstWeekDay: Option[String] = None)
+case class ScheduleConfig(firstTime: String, intervalInMin: Double, firstWeekDay: Option[String] = None)
 
 object ScheduleConfig {
   implicit val jsonFormat: OFormat[ScheduleConfig] = derived.oformat[ScheduleConfig]()