diff --git a/server/src/main/scala/com/lbs/server/BootConfig.scala b/server/src/main/scala/com/lbs/server/BootConfig.scala index 8e0df87..efe7045 100644 --- a/server/src/main/scala/com/lbs/server/BootConfig.scala +++ b/server/src/main/scala/com/lbs/server/BootConfig.scala @@ -136,7 +136,6 @@ class BootConfig { def monitoringsPagerActorFactory: (UserId, ActorRef) => ActorRef = (userId, originator) => actorSystem.actorOf(Pagers(userId, bot, localization).monitoringsPagerProps(originator)) - @Bean def router: ActorRef = actorSystem.actorOf(Router.props(authActorFactory)) diff --git a/server/src/main/scala/com/lbs/server/service/MonitoringService.scala b/server/src/main/scala/com/lbs/server/service/MonitoringService.scala index 77b202e..00d5521 100644 --- a/server/src/main/scala/com/lbs/server/service/MonitoringService.scala +++ b/server/src/main/scala/com/lbs/server/service/MonitoringService.scala @@ -94,7 +94,7 @@ class MonitoringService extends Logger { termsEither match { case Right(terms) => if (terms.nonEmpty) { - LOG.debug(s"Found ${terms.length} terms by monitoring [${monitoring.recordId}]") + LOG.debug(s"Found ${terms.length} terms by monitoring [#${monitoring.recordId}]") if (monitoring.autobook) { val term = terms.head bookAppointment(term, monitoring) @@ -209,8 +209,8 @@ class MonitoringService extends Logger { dataService.saveMonitoring(monitoring) } - def getActiveMonitorings(chatId: Long): Seq[Monitoring] = { - dataService.getActiveMonitorings(chatId) + def getActiveMonitorings(userId: Long): Seq[Monitoring] = { + dataService.getActiveMonitorings(userId) } def bookAppointmentByScheduleId(userId: Long, monitoringId: Long, scheduleId: Long, time: Long): Unit = { @@ -245,7 +245,7 @@ class MonitoringService extends Logger { } - private def lang(chatId: Long) = localization.lang(chatId) + private def lang(userId: Long) = localization.lang(userId) @PostConstruct private def initialize(): Unit = { diff --git a/server/src/main/scala/com/lbs/server/service/SessionSupport.scala b/server/src/main/scala/com/lbs/server/service/SessionSupport.scala index 6ce3077..9919350 100644 --- a/server/src/main/scala/com/lbs/server/service/SessionSupport.scala +++ b/server/src/main/scala/com/lbs/server/service/SessionSupport.scala @@ -74,7 +74,7 @@ trait SessionSupport { case Right(s) => fn(s) match { case Left(ex) if ex.getMessage.contains("session has expired") => - Log.debug(s"The session for user with user [#$userId] has expired. Try to relogin") + Log.debug(s"The session for user [#$userId] has expired. Try to relogin") sessions.remove(userId) session.flatMap(fn) case another =>