For #551 - delete notification template associated with user-specific…

… notification settings when user is being deleted, added test
vitalidze · Apr 23, 2016 · b1dacbd · b1dacbd
1 parent b749de6
commit b1dacbd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/main/java/org/traccar/web/server/model/DataServiceImpl.java b/src/main/java/org/traccar/web/server/model/DataServiceImpl.java
@@ -346,6 +346,14 @@ public User removeUser(User user) throws AccessDeniedException {
             throw new AccessDeniedException();
         }
         entityManager.createQuery("DELETE FROM UIStateEntry s WHERE s.user=:user").setParameter("user", user).executeUpdate();
+        for (NotificationSettings settings : entityManager
+                .createQuery("SELECT S FROM " + NotificationSettings.class.getName() + " S WHERE S.user = :user", NotificationSettings.class)
+                .setParameter("user", user)
+                .getResultList()) {
+            entityManager.createQuery("DELETE FROM NotificationTemplate T WHERE T.settings = :settings")
+                    .setParameter("settings", settings)
+                    .executeUpdate();
+        }
         entityManager.createQuery("DELETE FROM NotificationSettings s WHERE s.user=:user").setParameter("user", user).executeUpdate();
         entityManager.createQuery("UPDATE Device d SET d.owner=null WHERE d.owner=:user").setParameter("user", user).executeUpdate();
         for (Device device : user.getDevices()) {

diff --git a/src/test/java/org/traccar/web/server/model/DataServiceTest.java b/src/test/java/org/traccar/web/server/model/DataServiceTest.java
@@ -41,6 +41,7 @@
 import javax.persistence.EntityManager;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -152,6 +153,28 @@ public void testDeleteUserWithNotificationSettings() throws TraccarException {
         assertEquals(originalUserId.longValue(), dataService.getUsers().get(0).getId());
     }
 
+    @Test
+    public void testDeleteUserWithNotificationSettingsAndTemplate() throws TraccarException {
+        Long originalUserId = injector.getProvider(User.class).get().getId();
+
+        User user = new User("test", "test");
+        user.setManager(true);
+        user = dataService.addUser(user);
+
+        NotificationService notificationService = injector.getInstance(NotificationService.class);
+        currentUserId = user.getId();
+        NotificationSettings settings = new NotificationSettings();
+        settings.setTransferTemplates(new HashMap<DeviceEventType, NotificationTemplate>());
+        settings.getTransferTemplates().put(DeviceEventType.OFFLINE, new NotificationTemplate());
+        notificationService.saveSettings(settings);
+
+        currentUserId = originalUserId;
+        dataService.removeUser(user);
+
+        assertEquals(1, dataService.getUsers().size());
+        assertEquals(originalUserId.longValue(), dataService.getUsers().get(0).getId());
+    }
+
     @Test
     public void testResetPasswordByAdmin() throws TraccarException {
         User user = new User("test", "test");