Move to play 3 / pekko

MAIF · Oct 4, 2024 · 3651af3 · 3651af3
1 parent b69d515
commit 3651af3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/nio-server/app/controllers/OrganisationOfferController.scala b/nio-server/app/controllers/OrganisationOfferController.scala
@@ -15,7 +15,7 @@ import messaging.KafkaMessageBroker
 import models._
 
 import java.time.{Clock, LocalDateTime}
-import utils.NioLogger
+import utils.{DateUtils, NioLogger}
 import play.api.http.HttpEntity
 import play.api.libs.json.Reads._
 import play.api.libs.json.{JsValue, Json}
@@ -207,7 +207,7 @@ class OrganisationOfferController(
                               )
                           )
                       )
-                    val date                = LocalDateTime.parse(value.date, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                    val date                = LocalDateTime.parse(value.date, DateUtils.utcDateFormatter)
                     offers.filter(off => off.key != offerKey) ++ Seq(offer.copy(lastUpdate = date))
                 }
             }

diff --git a/nio-server/app/libs/xml/XmlParser.scala b/nio-server/app/libs/xml/XmlParser.scala
@@ -2,6 +2,7 @@ package libs.xml
 
 import cats.data.Validated
 import libs.xml.syntax.XmlResult
+import utils.DateUtils
 import utils.Result.AppErrors
 
 import java.time.LocalDateTime
@@ -100,7 +101,7 @@ object implicits {
         .getOrElse(buildError(path).invalid)
 
   implicit def defaultReadDateTime: XMLRead[LocalDateTime] =
-    readDateTime(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    readDateTime(DateUtils.utcDateFormatter)
 
   def readDateTime(dateTimeFormatter: DateTimeFormatter): XMLRead[LocalDateTime] =
     (xml: NodeSeq, path: Option[String]) =>

diff --git a/nio-server/app/models/ConsentFact.scala b/nio-server/app/models/ConsentFact.scala
@@ -127,7 +127,7 @@ case class ConsentOffer(
       {version}
     </version>
     <lastUpdate>
-      {lastUpdate.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)}
+      {lastUpdate.format(DateUtils.utcDateFormatter)}
     </lastUpdate>
     <groups>
       {groups.map(_.asXml())}

diff --git a/nio-server/app/utils/DateUtils.scala b/nio-server/app/utils/DateUtils.scala
@@ -7,7 +7,7 @@ import java.time.format.DateTimeFormatter
 import scala.util.{Failure, Success, Try}
 
 object DateUtils {
-  val utcDateFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME //forPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
+  val utcDateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
 
   val utcDateTimeReads = new Reads[LocalDateTime] {
     def reads(json: JsValue) = json match {
@@ -22,7 +22,7 @@ object DateUtils {
 
   val utcDateTimeWrites = new Writes[LocalDateTime] {
     override def writes(o: LocalDateTime): JsValue =
-      JsString(o.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME))
+      JsString(o.format(DateUtils.utcDateFormatter))
   }
 
   val utcDateTimeFormats: Format[LocalDateTime] =