mirrors/luxmed-bot
1
0
Fork 0
mirror of https://github.com/dyrkin/luxmed-bot.git synced 2025-12-24 14:31:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue when server tries to relogin twice when session expired

Browse Source
This commit is contained in:
Eugene Zadyra
2018-05-31 18:38:41 +02:00
parent 205811337a
commit 68921b5e68
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
server/src/main/scala/com/lbs/server/service/ApiService.scala
View File

@@ -1,26 +1,26 @@
/** /**
* MIT License * MIT License
* *
* Copyright (c) 2018 Yevhen Zadyra * Copyright (c) 2018 Yevhen Zadyra
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in all * The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software. * copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
package com.lbs.server.service package com.lbs.server.service
import java.time.ZonedDateTime import java.time.ZonedDateTime
@@ -75,13 +75,14 @@ class ApiService extends SessionSupport {
def getAvailableTerms(userId: Long, cityId: Long, clinicId: Option[Long], serviceId: Long, doctorId: Option[Long], def getAvailableTerms(userId: Long, cityId: Long, clinicId: Option[Long], serviceId: Long, doctorId: Option[Long],
fromDate: ZonedDateTime = ZonedDateTime.now(), toDate: Option[ZonedDateTime] = None, timeOfDay: Int = 0, fromDate: ZonedDateTime = ZonedDateTime.now(), toDate: Option[ZonedDateTime] = None, timeOfDay: Int = 0,
languageId: Long = 10, findFirstFreeTerm: Boolean = false): Either[Throwable, List[AvailableVisitsTermPresentation]] = languageId: Long = 10, findFirstFreeTerm: Boolean = false): Either[Throwable, List[AvailableVisitsTermPresentation]] =
withSession(userId) { session => getDefaultPayer(userId, cityId, clinicId, serviceId).flatMap { case Some(payerId) =>
getDefaultPayer(userId, cityId, clinicId, serviceId).flatMap { case Some(payerId) => withSession(userId) { session =>
LuxmedApi.availableTerms(session.accessToken, session.tokenType, payerId.id, cityId, clinicId, serviceId, doctorId, LuxmedApi.availableTerms(session.accessToken, session.tokenType, payerId.id, cityId, clinicId, serviceId, doctorId,
fromDate, toDate, timeOfDay, languageId, findFirstFreeTerm).map(_.availableVisitsTermPresentation) fromDate, toDate, timeOfDay, languageId, findFirstFreeTerm).map(_.availableVisitsTermPresentation)
} }
} }
def temporaryReservation(userId: Long, temporaryReservationRequest: TemporaryReservationRequest, valuationsRequest: ValuationsRequest): Either[Throwable, (TemporaryReservationResponse, ValuationsResponse)] = def temporaryReservation(userId: Long, temporaryReservationRequest: TemporaryReservationRequest, valuationsRequest: ValuationsRequest): Either[Throwable, (TemporaryReservationResponse, ValuationsResponse)] =
withSession(userId) { session => withSession(userId) { session =>
LuxmedApi.temporaryReservation(session.accessToken, session.tokenType, temporaryReservationRequest) match { LuxmedApi.temporaryReservation(session.accessToken, session.tokenType, temporaryReservationRequest) match {

2
server/src/main/scala/com/lbs/server/service/SessionSupport.scala
View File

@@ -74,7 +74,7 @@ trait SessionSupport {
case Right(s) => case Right(s) =>
fn(s) match { fn(s) match {
case Left(ex) if ex.getMessage.contains("session has expired") => case Left(ex) if ex.getMessage.contains("session has expired") =>
Log.debug(s"The session for user with chat id: $userId has expired. Try to relogin") Log.debug(s"The session for user with user [#$userId] has expired. Try to relogin")
sessions.remove(userId) sessions.remove(userId)
session.flatMap(fn) session.flatMap(fn)
case another => case another =>