create multiple monitorings for the same service

This commit is contained in:
Eugene Zadyra
2019-11-12 17:58:24 +01:00
parent 14bd33e4f9
commit 9b3e6fa412
5 changed files with 0 additions and 12 deletions

View File

@@ -289,8 +289,6 @@ object En extends Lang {
override def maximumMonitoringsLimitExceeded: String = "Maximum monitorings per user is 10" 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 = override def termIsOutdated: String =
s"""❗️ Looks like the term is already booked by someone else s"""❗️ Looks like the term is already booked by someone else
| |

View File

@@ -189,8 +189,6 @@ trait Lang {
def maximumMonitoringsLimitExceeded: String def maximumMonitoringsLimitExceeded: String
def monitoringOfTheSameTypeExists: String
def termIsOutdated: String def termIsOutdated: String
def loginHasChangedOrWrong: String def loginHasChangedOrWrong: String

View File

@@ -288,8 +288,6 @@ object Ua extends Lang {
override def maximumMonitoringsLimitExceeded: String = "Максимальна кількість моніторінгів 10" override def maximumMonitoringsLimitExceeded: String = "Максимальна кількість моніторінгів 10"
override def monitoringOfTheSameTypeExists: String = "У вас вже є активний моніторинг на таку ж саму послугу i лiкаря /monitorings"
override def termIsOutdated: String = override def termIsOutdated: String =
s"""❗️ Схоже, що термін вже не є доступним s"""❗️ Схоже, що термін вже не є доступним
| |

View File

@@ -65,10 +65,6 @@ class DataService {
dataRepository.getActiveMonitorings(accountId) 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] = { def getActiveMonitoringsSince(since: ZonedDateTime): Seq[Monitoring] = {
dataRepository.getActiveMonitoringsSince(since) dataRepository.getActiveMonitoringsSince(since)
} }

View File

@@ -183,8 +183,6 @@ class MonitoringService extends Logger {
def createMonitoring(monitoring: Monitoring): Monitoring = { def createMonitoring(monitoring: Monitoring): Monitoring = {
val userMonitoringsCount = dataService.getActiveMonitoringsCount(monitoring.accountId) val userMonitoringsCount = dataService.getActiveMonitoringsCount(monitoring.accountId)
require(userMonitoringsCount + 1 <= 10, lang(monitoring.userId).maximumMonitoringsLimitExceeded) 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) dataService.saveMonitoring(monitoring)
} }