Merge pull request #2638 from Abyss777/improve_notifications

Use model instead of attributes to store Notification options

3 files changed, 40 insertions, 6 deletions

diff --git a/src/org/traccar/api/resource/NotificationResource.java b/src/org/traccar/api/resource/NotificationResource.java
index 6c9725f37..03f7e4ba0 100644
--- a/src/org/traccar/api/resource/NotificationResource.java
+++ b/src/org/traccar/api/resource/NotificationResource.java
@@ -49,7 +49,7 @@ public class NotificationResource extends BaseResource {
             userId = getUserId();
         }
         Context.getPermissionsManager().checkUser(getUserId(), userId);
-        return Context.getNotificationManager().getUserNotifications(userId);
+        return Context.getNotificationManager().getAllUserNotifications(userId);
     }
 
     @POST
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index 7e79e289f..ee804f5cd 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -59,10 +59,10 @@ public class NotificationManager {
                     && Context.getGeofenceManager().checkGeofence(userId, event.getGeofenceId())) {
                 Notification notification = getUserNotificationByType(userId, event.getType());
                 if (notification != null) {
-                    if (notification.getAttributes().containsKey("web")) {
+                    if (notification.getWeb()) {
                         Context.getConnectionManager().updateEvent(userId, event, position);
                     }
-                    if (notification.getAttributes().containsKey("mail")) {
+                    if (notification.getMail()) {
                         NotificationMail.sendMailAsync(userId, event, position);
                     }
                 }
@@ -130,8 +130,9 @@ public class NotificationManager {
     public void updateNotification(Notification notification) {
         Notification cachedNotification = getUserNotificationByType(notification.getUserId(), notification.getType());
         if (cachedNotification != null) {
-            if (!cachedNotification.getAttributes().equals(notification.getAttributes())) {
-                if (notification.getAttributes().isEmpty()) {
+            if (cachedNotification.getWeb() != notification.getWeb()
+                    || cachedNotification.getMail() != notification.getMail()) {
+                if (!notification.getWeb() && !notification.getMail()) {
                     try {
                         dataManager.removeNotification(cachedNotification);
                     } catch (SQLException error) {
@@ -146,6 +147,8 @@ public class NotificationManager {
                 } else {
                     notificationsLock.writeLock().lock();
                     try {
+                        cachedNotification.setWeb(notification.getWeb());
+                        cachedNotification.setMail(notification.getMail());
                         cachedNotification.setAttributes(notification.getAttributes());
                     } finally {
                         notificationsLock.writeLock().unlock();
@@ -159,7 +162,7 @@ public class NotificationManager {
             } else {
                 notification.setId(cachedNotification.getId());
             }
-        } else if (!notification.getAttributes().isEmpty()) {
+        } else if (notification.getWeb() || notification.getMail()) {
             try {
                 dataManager.addNotification(notification);
             } catch (SQLException error) {
@@ -193,4 +196,16 @@ public class NotificationManager {
         return notifications;
     }
 
+    public Collection<Notification> getAllUserNotifications(long userId) {
+        Map<String, Notification> notifications = new HashMap<>();
+        for (Notification notification : getAllNotifications()) {
+            notification.setUserId(userId);
+            notifications.put(notification.getType(), notification);
+        }
+        for (Notification notification : getUserNotifications(userId)) {
+            notifications.put(notification.getType(), notification);
+        }
+        return notifications.values();
+    }
+
 }
diff --git a/src/org/traccar/model/Notification.java b/src/org/traccar/model/Notification.java
index 64e1ac60c..dd5f66f15 100644
--- a/src/org/traccar/model/Notification.java
+++ b/src/org/traccar/model/Notification.java
@@ -37,4 +37,23 @@ public class Notification extends Extensible {
         this.type = type;
     }
 
+    private boolean web;
+
+    public boolean getWeb() {
+        return web;
+    }
+
+    public void setWeb(boolean web) {
+        this.web = web;
+    }
+
+    private boolean mail;
+
+    public boolean getMail() {
+        return mail;
+    }
+
+    public void setMail(boolean mail) {
+        this.mail = mail;
+    }
 }