From 9b3e6fa412e3a0c50f4db4e9b6bc83e87393b70a Mon Sep 17 00:00:00 2001 From: Eugene Zadyra Date: Tue, 12 Nov 2019 17:58:24 +0100 Subject: [PATCH] create multiple monitorings for the same service --- server/src/main/scala/com/lbs/server/lang/En.scala | 2 -- server/src/main/scala/com/lbs/server/lang/Lang.scala | 2 -- server/src/main/scala/com/lbs/server/lang/Ua.scala | 2 -- .../src/main/scala/com/lbs/server/service/DataService.scala | 4 ---- .../main/scala/com/lbs/server/service/MonitoringService.scala | 2 -- 5 files changed, 12 deletions(-) diff --git a/server/src/main/scala/com/lbs/server/lang/En.scala b/server/src/main/scala/com/lbs/server/lang/En.scala index 1f10371..bdb57ca 100644 --- a/server/src/main/scala/com/lbs/server/lang/En.scala +++ b/server/src/main/scala/com/lbs/server/lang/En.scala @@ -289,8 +289,6 @@ object En extends Lang { override def maximumMonitoringsLimitExceeded: String = "Maximum monitorings per user is 10" - override def monitoringOfTheSameTypeExists: String = "You already have active monitoring for the same service and doctor /monitorings" - override def termIsOutdated: String = s"""❗️ Looks like the term is already booked by someone else | diff --git a/server/src/main/scala/com/lbs/server/lang/Lang.scala b/server/src/main/scala/com/lbs/server/lang/Lang.scala index ebb2f21..26cd5c3 100644 --- a/server/src/main/scala/com/lbs/server/lang/Lang.scala +++ b/server/src/main/scala/com/lbs/server/lang/Lang.scala @@ -189,8 +189,6 @@ trait Lang { def maximumMonitoringsLimitExceeded: String - def monitoringOfTheSameTypeExists: String - def termIsOutdated: String def loginHasChangedOrWrong: String diff --git a/server/src/main/scala/com/lbs/server/lang/Ua.scala b/server/src/main/scala/com/lbs/server/lang/Ua.scala index db6c9b3..ca1f68d 100644 --- a/server/src/main/scala/com/lbs/server/lang/Ua.scala +++ b/server/src/main/scala/com/lbs/server/lang/Ua.scala @@ -288,8 +288,6 @@ object Ua extends Lang { override def maximumMonitoringsLimitExceeded: String = "Максимальна кількість моніторінгів 10" - override def monitoringOfTheSameTypeExists: String = "У вас вже є активний моніторинг на таку ж саму послугу i лiкаря /monitorings" - override def termIsOutdated: String = s"""❗️ Схоже, що термін вже не є доступним | diff --git a/server/src/main/scala/com/lbs/server/service/DataService.scala b/server/src/main/scala/com/lbs/server/service/DataService.scala index 888c634..3ba29bc 100644 --- a/server/src/main/scala/com/lbs/server/service/DataService.scala +++ b/server/src/main/scala/com/lbs/server/service/DataService.scala @@ -65,10 +65,6 @@ class DataService { dataRepository.getActiveMonitorings(accountId) } - def findActiveMonitoring(accountId: Long, cityId: Long, serviceId: Long, doctorId: Long): Option[Monitoring] = { - dataRepository.findActiveMonitoring(accountId, cityId, serviceId, doctorId) - } - def getActiveMonitoringsSince(since: ZonedDateTime): Seq[Monitoring] = { dataRepository.getActiveMonitoringsSince(since) } 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 0289196..1ba6a31 100644 --- a/server/src/main/scala/com/lbs/server/service/MonitoringService.scala +++ b/server/src/main/scala/com/lbs/server/service/MonitoringService.scala @@ -183,8 +183,6 @@ class MonitoringService extends Logger { def createMonitoring(monitoring: Monitoring): Monitoring = { val userMonitoringsCount = dataService.getActiveMonitoringsCount(monitoring.accountId) require(userMonitoringsCount + 1 <= 10, lang(monitoring.userId).maximumMonitoringsLimitExceeded) - val activeMonitoring = dataService.findActiveMonitoring(monitoring.accountId, monitoring.cityId, monitoring.serviceId, monitoring.doctorId) - require(activeMonitoring.isEmpty, lang(monitoring.userId).monitoringOfTheSameTypeExists) dataService.saveMonitoring(monitoring) }