Aggiunta delete views e alerts disabilitati al cambio ente di un utente

apirest/src/main/java/com/redroundrobin/thirema/apirest/repository/postgres/ViewRepository.java

@@ -2,12 +2,20 @@
 
 import com.redroundrobin.thirema.apirest.models.postgres.User;
 import com.redroundrobin.thirema.apirest.models.postgres.View;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Repository
 public interface ViewRepository extends CrudRepository<View, Integer> {
   Iterable<View> findAllByUser(User user);
 
   View findByViewIdAndUser(int viewId, User user);
+
+  @Transactional
+  @Modifying
+  @Query(value = "DELETE FROM View V WHERE V.user.userId = :id")
+  void deleteAllByUserId(int id);
 }

apirest/src/main/java/com/redroundrobin/thirema/apirest/service/postgres/UserService.java

@@ -1,12 +1,14 @@
 package com.redroundrobin.thirema.apirest.service.postgres;
 
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import com.google.gson.JsonObject;
 import com.redroundrobin.thirema.apirest.models.postgres.Alert;
 import com.redroundrobin.thirema.apirest.models.postgres.Entity;
 import com.redroundrobin.thirema.apirest.models.postgres.User;
 import com.redroundrobin.thirema.apirest.repository.postgres.AlertRepository;
 import com.redroundrobin.thirema.apirest.repository.postgres.EntityRepository;
 import com.redroundrobin.thirema.apirest.repository.postgres.UserRepository;
+import com.redroundrobin.thirema.apirest.repository.postgres.ViewRepository;
 import com.redroundrobin.thirema.apirest.utils.exception.ConflictException;
 import com.redroundrobin.thirema.apirest.utils.exception.InvalidFieldsValuesException;
 import com.redroundrobin.thirema.apirest.utils.exception.MissingFieldsException;
@@ -38,12 +40,15 @@ public class UserService implements UserDetailsService {
 
   private final EntityRepository entityRepo;
 
+  private final ViewRepository viewRepo;
+
   @Autowired
   public UserService(UserRepository userRepository, AlertRepository alertRepository,
-                     EntityRepository entityRepository) {
+                     EntityRepository entityRepository, ViewRepository viewRepository) {
     this.userRepo = userRepository;
     this.alertRepo = alertRepository;
     this.entityRepo = entityRepository;
+    this.viewRepo = viewRepository;
   }
 
   private boolean checkCreatableFields(Set<String> keys)
@@ -129,6 +134,7 @@ private boolean checkEditableFields(User.Role role, boolean itself, Set<String>
 
   private User editAndSave(User userToEdit, Map<String, Object> fieldsToEdit)
       throws ConflictException, InvalidFieldsValuesException {
+
     if (fieldsToEdit.containsKey("tfa")
         && (boolean)fieldsToEdit.get("tfa")
         && (fieldsToEdit.containsKey("telegramName")
@@ -178,7 +184,12 @@ private User editAndSave(User userToEdit, Map<String, Object> fieldsToEdit)
           }
           break;
         case "entityId":
-          userToEdit.setEntity(entityRepo.findById((int)fieldsToEdit.get("entityId")).orElse(null));
+          if (userToEdit.getEntity().getId() != (int)fieldsToEdit.get("entityId")) {
+            userToEdit.setDisabledAlerts(Collections.emptySet());
+            viewRepo.deleteAllByUserId(userToEdit.getId());
+            userToEdit.setEntity(entityRepo.findById((int) fieldsToEdit.get("entityId"))
+                .orElse(null));
+          }
           break;
         case "deleted":
           userToEdit.setDeleted((boolean) value);

apirest/src/test/java/com/redroundrobin/thirema/apirest/service/postgres/UserServiceTest.java

@@ -6,6 +6,7 @@
 import com.redroundrobin.thirema.apirest.repository.postgres.AlertRepository;
 import com.redroundrobin.thirema.apirest.repository.postgres.EntityRepository;
 import com.redroundrobin.thirema.apirest.repository.postgres.UserRepository;
+import com.redroundrobin.thirema.apirest.repository.postgres.ViewRepository;
 import com.redroundrobin.thirema.apirest.utils.exception.*;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,6 +39,9 @@ public class UserServiceTest {
   @MockBean
   private UserRepository userRepo;
 
+  @MockBean
+  private ViewRepository viewRepo;
+
   private User admin1;
   private User admin2;
   private User mod1;
@@ -52,7 +56,7 @@ public class UserServiceTest {
   @Before
   public void setUp() {
 
-    userService = new UserService(userRepo, alertRepo, entityRepo);
+    userService = new UserService(userRepo, alertRepo, entityRepo, viewRepo);
 
     // ----------------------------------------- Set Users ---------------------------------------
     admin1 = new User(1, "admin1", "admin1", "admin1", "pass", User.Role.ADMIN);