EFRS-1341: Removed the user table lock, added thread synchronization instead

Author: VolodymyrBushko

java/admin/src/main/java/com/exadel/frs/service/UserService.java

@@ -20,7 +20,6 @@
 import static com.exadel.frs.commonservice.enums.GlobalRole.OWNER;
 import static com.exadel.frs.commonservice.enums.GlobalRole.USER;
 import static com.exadel.frs.commonservice.enums.StatisticsType.USER_CREATE;
-import static com.exadel.frs.commonservice.enums.TableLockName.USER_LOCK;
 import static com.exadel.frs.system.global.Constants.DEMO_GUID;
 import static com.exadel.frs.validation.EmailValidator.isInvalid;
 import static org.apache.commons.lang3.BooleanUtils.isNotTrue;
@@ -29,9 +28,7 @@
 import com.exadel.frs.commonservice.entity.User;
 import com.exadel.frs.commonservice.enums.GlobalRole;
 import com.exadel.frs.commonservice.enums.Replacer;
-import com.exadel.frs.commonservice.enums.TableLockName;
 import com.exadel.frs.commonservice.exception.EmptyRequiredFieldException;
-import com.exadel.frs.commonservice.repository.TableLockRepository;
 import com.exadel.frs.commonservice.repository.UserRepository;
 import com.exadel.frs.dto.ui.UserCreateDto;
 import com.exadel.frs.dto.ui.UserDeleteDto;
@@ -71,7 +68,6 @@ public class UserService {
     private final EmailSender emailSender;
     private final Environment env;
     private final AuthorizationManager authManager;
-    private final TableLockRepository lockRepository;
 
     public User getUser(final Long id) {
         return userRepository.findById(id)
@@ -200,13 +196,16 @@ public void confirmRegistration(final String token) {
         val user = userRepository.findByRegistrationToken(token)
                                  .orElseThrow(RegistrationTokenExpiredException::new);
 
-        lockRepository.lockByName(USER_LOCK);
-        if (!userRepository.isOwnerPresent()) {
-            user.setGlobalRole(OWNER);
-        }
+        synchronized (this) {
+            if (!userRepository.isOwnerPresent()) {
+                user.setGlobalRole(OWNER);
+            }
+
+            user.setEnabled(true);
+            user.setRegistrationToken(null);
 
-        user.setEnabled(true);
-        user.setRegistrationToken(null);
+            userRepository.flush();
+        }
     }
 
     private void manageOwnedAppsByUserBeingDeleted(final UserDeleteDto userDeleteDto) {

java/admin/src/main/resources/db/changelog/db.changelog-0.2.6.yaml

@@ -49,5 +49,3 @@ databaseChangeLog:
       file: db/changelog/db.changelog-0.2.4.yaml
   - include:
       file: db/changelog/db.changelog-0.2.5.yaml
-  - include:
-      file: db/changelog/db.changelog-0.2.6.yaml

java/admin/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -28,23 +28,21 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
-
+import com.exadel.frs.commonservice.entity.User;
+import com.exadel.frs.commonservice.enums.GlobalRole;
+import com.exadel.frs.commonservice.enums.Replacer;
 import com.exadel.frs.commonservice.exception.EmptyRequiredFieldException;
-import com.exadel.frs.commonservice.repository.TableLockRepository;
+import com.exadel.frs.commonservice.exception.IllegalReplacerException;
+import com.exadel.frs.commonservice.repository.UserRepository;
 import com.exadel.frs.dto.ui.UserCreateDto;
 import com.exadel.frs.dto.ui.UserDeleteDto;
 import com.exadel.frs.dto.ui.UserUpdateDto;
-import com.exadel.frs.commonservice.entity.User;
-import com.exadel.frs.commonservice.enums.GlobalRole;
-import com.exadel.frs.commonservice.enums.Replacer;
 import com.exadel.frs.exception.EmailAlreadyRegisteredException;
-import com.exadel.frs.commonservice.exception.IllegalReplacerException;
 import com.exadel.frs.exception.IncorrectUserPasswordException;
 import com.exadel.frs.exception.InvalidEmailException;
 import com.exadel.frs.exception.RegistrationTokenExpiredException;
 import com.exadel.frs.exception.UserDoesNotExistException;
 import com.exadel.frs.helpers.EmailSender;
-import com.exadel.frs.commonservice.repository.UserRepository;
 import com.exadel.frs.service.AppService;
 import com.exadel.frs.service.UserService;
 import com.exadel.frs.system.security.AuthorizationManager;
@@ -84,9 +82,6 @@ class UserServiceTest {
     @Mock
     private AppService appService;
 
-    @Mock
-    private TableLockRepository tableLockRepository;
-
     @InjectMocks
     private UserService userService;
 

java/admin/src/test/java/com/exadel/frs/UserServiceTest.java

@@ -49,5 +49,3 @@ databaseChangeLog:
       file: db/changelog/db.changelog-0.2.4.yaml
   - include:
       file: db/changelog/db.changelog-0.2.5.yaml
-  - include:
-      file: db/changelog/db.changelog-0.2.6.yaml

java/api/src/test/resources/db/changelog/db.changelog-0.2.6.yaml

@@ -2,6 +2,5 @@
 
 public enum TableLockName {
 
-    MODEL_STATISTIC_LOCK,
-    USER_LOCK
+    MODEL_STATISTIC_LOCK
 }