diff --git a/api/src/main/scala/com/lbs/api/LuxmedApi.scala b/api/src/main/scala/com/lbs/api/LuxmedApi.scala index e740c02..53ad6ca 100644 --- a/api/src/main/scala/com/lbs/api/LuxmedApi.scala +++ b/api/src/main/scala/com/lbs/api/LuxmedApi.scala @@ -8,8 +8,8 @@ import com.lbs.api.json.JsonSerializer.extensions._ import com.lbs.api.json.model.{EventsResponse, TermsIndexResponse, _} import scalaj.http.{HttpRequest, HttpResponse} -import java.time.LocalDateTime import java.time.format.DateTimeFormatter +import java.time.{LocalDateTime, ZonedDateTime} import scala.language.higherKinds class LuxmedApi[F[_] : ThrowableMonad] extends ApiBase { @@ -39,8 +39,8 @@ class LuxmedApi[F[_] : ThrowableMonad] extends ApiBase { get[ForgeryTokenResponse](request) } - def events(session: Session, fromDate: LocalDateTime = LocalDateTime.now().minusYears(1), - toDate: LocalDateTime = LocalDateTime.now()): F[EventsResponse] = { + def events(session: Session, fromDate: ZonedDateTime = ZonedDateTime.now().minusYears(1), + toDate: ZonedDateTime = ZonedDateTime.now()): F[EventsResponse] = { val request = http("Events", session). header(`Content-Type`, "application/json"). param("filter.filterDateFrom", dateFormatEvents.format(fromDate)). diff --git a/server/src/main/scala/com/lbs/server/service/ApiService.scala b/server/src/main/scala/com/lbs/server/service/ApiService.scala index f28b45a..8797464 100644 --- a/server/src/main/scala/com/lbs/server/service/ApiService.scala +++ b/server/src/main/scala/com/lbs/server/service/ApiService.scala @@ -6,6 +6,7 @@ import com.lbs.api.LuxmedApi import com.lbs.api.http.Session import com.lbs.api.json.model._ import com.lbs.server.ThrowableOr +import com.lbs.server.util.DateTimeUtil import org.jasypt.util.text.TextEncryptor import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -88,13 +89,13 @@ class ApiService extends SessionSupport { def history(accountId: Long, fromDate: LocalDateTime = LocalDateTime.now().minusYears(1), toDate: LocalDateTime = LocalDateTime.now()): ThrowableOr[List[Event]] = withSession(accountId) { session => - luxmedApi.events(session, fromDate, toDate).map(_.events.filter(_.status == "Realized")) + luxmedApi.events(session, fromDate.atZone(DateTimeUtil.Zone), toDate.atZone(DateTimeUtil.Zone)).map(_.events.filter(_.status == "Realized")) } def reserved(accountId: Long, fromDate: LocalDateTime = LocalDateTime.now(), toDate: LocalDateTime = LocalDateTime.now().plusMonths(3)): ThrowableOr[List[Event]] = withSession(accountId) { session => - luxmedApi.events(session, fromDate, toDate).map(_.events.filter(_.status == "Reserved")) + luxmedApi.events(session, fromDate.atZone(DateTimeUtil.Zone), toDate.atZone(DateTimeUtil.Zone)).map(_.events.filter(_.status == "Reserved")) } def deleteReservation(accountId: Long, reservationId: Long): ThrowableOr[HttpResponse[String]] =