EFRS-1341: Changed registration logic. The first user to confirm their email address becomes the owner

VolodymyrBushko · VolodymyrBushko · commit 4d1c2d9c2258 · 2022-11-10T17:27:19.000+02:00
diff --git a/java/admin/src/main/java/com/exadel/frs/service/UserService.java b/java/admin/src/main/java/com/exadel/frs/service/UserService.java
@@ -20,6 +20,7 @@
 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;
@@ -28,7 +29,9 @@
 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;
@@ -68,6 +71,7 @@ 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)
@@ -191,14 +195,18 @@ public void removeExpiredRegistrationTokens() {
         userRepository.deleteByEnabledFalseAndRegTimeBefore(seconds);
     }
 
+    @Transactional
     public void confirmRegistration(final String token) {
         val user = userRepository.findByRegistrationToken(token)
                                  .orElseThrow(RegistrationTokenExpiredException::new);
 
+        lockRepository.lockByName(USER_LOCK);
+        if (!userRepository.isOwnerPresent()) {
+            user.setGlobalRole(OWNER);
+        }
+
         user.setEnabled(true);
         user.setRegistrationToken(null);
-
-        userRepository.save(user);
     }
 
     private void manageOwnedAppsByUserBeingDeleted(final UserDeleteDto userDeleteDto) {
@@ -228,6 +236,7 @@ public User updateDemoUser(UserCreateDto userCreateDto) {
         user.setAllowStatistics(userCreateDto.isAllowStatistics());
 
         if (isMailServerEnabled) {
+            user.setGlobalRole(USER);
             user.setRegistrationToken(generateRegistrationToken());
             sendRegistrationTokenToUser(user);
         }
diff --git a/java/admin/src/main/resources/db/changelog/db.changelog-0.2.6.yaml b/java/admin/src/main/resources/db/changelog/db.changelog-0.2.6.yaml
@@ -0,0 +1,14 @@
+databaseChangeLog:
+  - changeSet:
+      id: insert-user-lock
+      author: Volodymyr Bushko
+      changes:
+        - insert:
+            tableName: table_lock
+            columns:
+              - column:
+                  name: id
+                  value: 00000000-0000-0000-0000-000000000002
+              - column:
+                  name: lock_name
+                  value: USER_LOCK
diff --git a/java/admin/src/main/resources/db/changelog/db.changelog-master.yaml b/java/admin/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -49,3 +49,5 @@ 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
diff --git a/java/admin/src/test/java/com/exadel/frs/DbHelper.java b/java/admin/src/test/java/com/exadel/frs/DbHelper.java
@@ -153,22 +153,32 @@ public Img insertImg() {
     }
 
     public User insertUser(String email) {
-        var user = User.builder()
-                       .email(email)
-                       .firstName("firstName")
-                       .lastName("lastName")
-                       .password(encoder.encode("1234567890"))
-                       .guid(UUID.randomUUID().toString())
-                       .accountNonExpired(true)
-                       .accountNonLocked(true)
-                       .credentialsNonExpired(true)
-                       .enabled(true)
-                       .allowStatistics(false)
-                       .globalRole(USER)
-                       .build();
+        var user = createUser(email);
+        user.setEnabled(true);
         return userRepository.saveAndFlush(user);
     }
 
+    public User insertUnconfirmedUser(String email) {
+        var user = createUser(email);
+        user.setRegistrationToken(UUID.randomUUID().toString());
+        return userRepository.saveAndFlush(user);
+    }
+
+    private User createUser(String email) {
+        return User.builder()
+                   .email(email)
+                   .firstName("firstName")
+                   .lastName("lastName")
+                   .password(encoder.encode("1234567890"))
+                   .guid(UUID.randomUUID().toString())
+                   .accountNonExpired(true)
+                   .accountNonLocked(true)
+                   .credentialsNonExpired(true)
+                   .allowStatistics(false)
+                   .globalRole(USER)
+                   .build();
+    }
+
     public ResetPasswordToken insertResetPasswordToken(User user) {
         var expiresIn = now(UTC).plus(resetPasswordTokenExpires, MILLIS);
         var token = new ResetPasswordToken(expiresIn, user);
diff --git a/java/admin/src/test/java/com/exadel/frs/UserServiceTest.java b/java/admin/src/test/java/com/exadel/frs/UserServiceTest.java
@@ -30,6 +30,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.exadel.frs.commonservice.exception.EmptyRequiredFieldException;
+import com.exadel.frs.commonservice.repository.TableLockRepository;
 import com.exadel.frs.dto.ui.UserCreateDto;
 import com.exadel.frs.dto.ui.UserDeleteDto;
 import com.exadel.frs.dto.ui.UserUpdateDto;
@@ -83,6 +84,9 @@ class UserServiceTest {
     @Mock
     private AppService appService;
 
+    @Mock
+    private TableLockRepository tableLockRepository;
+
     @InjectMocks
     private UserService userService;
 
diff --git a/java/admin/src/test/java/com/exadel/frs/UserServiceTestIT.java b/java/admin/src/test/java/com/exadel/frs/UserServiceTestIT.java
@@ -17,6 +17,7 @@
 package com.exadel.frs;
 
 import com.exadel.frs.commonservice.entity.User;
+import com.exadel.frs.commonservice.enums.GlobalRole;
 import com.exadel.frs.commonservice.repository.UserRepository;
 import com.exadel.frs.dto.ui.UserCreateDto;
 import com.exadel.frs.exception.UserDoesNotExistException;
@@ -36,9 +37,14 @@
 
 import java.util.Optional;
 import java.util.UUID;
+import org.springframework.transaction.annotation.Transactional;
 
+import static com.exadel.frs.commonservice.enums.GlobalRole.OWNER;
+import static com.exadel.frs.commonservice.enums.GlobalRole.USER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(SpringExtension.class)
@@ -60,6 +66,9 @@ class UserServiceTestIT extends EmbeddedPostgreSQLTest {
     @SpyBean
     private UserService userService;
 
+    @Autowired
+    private DbHelper dbHelper;
+
     @Autowired
     private UserRepository userRepository;
 
@@ -147,6 +156,34 @@ void autocompleteReturnsUsers() {
         assertThat(actual).hasSize(2);
     }
 
+    @Test
+    @Transactional
+    void confirmRegistration_ThereAreTwoUnconfirmedUsers_FirstOfThemShouldBecomeAnOwner() {
+        userRepository.deleteAll();
+
+        val user1 = dbHelper.insertUnconfirmedUser(USER_EMAIL);
+        val user2 = dbHelper.insertUnconfirmedUser(USER_EMAIL_2);
+
+        assertFalse(user1.isEnabled());
+        assertFalse(user2.isEnabled());
+        assertThat(user1.getRegistrationToken()).isNotNull();
+        assertThat(user2.getRegistrationToken()).isNotNull();
+        assertThat(user1.getGlobalRole()).isEqualByComparingTo(USER);
+        assertThat(user2.getGlobalRole()).isEqualByComparingTo(USER);
+        assertThat(userRepository.findAll()).containsOnly(user1, user2);
+
+        userService.confirmRegistration(user1.getRegistrationToken());
+        userService.confirmRegistration(user2.getRegistrationToken());
+
+        assertTrue(user1.isEnabled());
+        assertTrue(user2.isEnabled());
+        assertThat(user1.getRegistrationToken()).isNull();
+        assertThat(user2.getRegistrationToken()).isNull();
+        assertThat(user1.getGlobalRole()).isEqualByComparingTo(OWNER);
+        assertThat(user2.getGlobalRole()).isEqualByComparingTo(USER);
+        assertThat(userRepository.findAll()).containsOnly(user1, user2);
+    }
+
     private void createAndEnableUser(final String email) {
         val regToken = UUID.randomUUID().toString();
         when(userService.generateRegistrationToken()).thenReturn(regToken);
diff --git a/java/api/src/test/resources/db/changelog/db.changelog-0.2.6.yaml b/java/api/src/test/resources/db/changelog/db.changelog-0.2.6.yaml
@@ -0,0 +1,14 @@
+databaseChangeLog:
+  - changeSet:
+      id: insert-user-lock
+      author: Volodymyr Bushko
+      changes:
+        - insert:
+            tableName: table_lock
+            columns:
+              - column:
+                  name: id
+                  value: 00000000-0000-0000-0000-000000000002
+              - column:
+                  name: lock_name
+                  value: USER_LOCK
diff --git a/java/api/src/test/resources/db/changelog/db.changelog-master.yaml b/java/api/src/test/resources/db/changelog/db.changelog-master.yaml
@@ -49,3 +49,5 @@ 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
diff --git a/java/common/src/main/java/com/exadel/frs/commonservice/enums/TableLockName.java b/java/common/src/main/java/com/exadel/frs/commonservice/enums/TableLockName.java
@@ -2,5 +2,6 @@
 
 public enum TableLockName {
 
-    MODEL_STATISTIC_LOCK;
+    MODEL_STATISTIC_LOCK,
+    USER_LOCK
 }
diff --git a/java/common/src/main/java/com/exadel/frs/commonservice/repository/UserRepository.java b/java/common/src/main/java/com/exadel/frs/commonservice/repository/UserRepository.java
@@ -43,6 +43,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     User findByGlobalRole(GlobalRole role);
 
+    @Query("select count(u) > 0 from User u where u.globalRole = 'O'")
+    boolean isOwnerPresent();
+
     int deleteByEnabledFalseAndRegTimeBefore(LocalDateTime time);
 
     Optional<User> findByRegistrationToken(String token);

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`
`3`	`3`	`public enum TableLockName {`
`4`	`4`
`5`		`- MODEL_STATISTIC_LOCK;`
	`5`	`+ MODEL_STATISTIC_LOCK,`
	`6`	`+ USER_LOCK`
`6`	`7`	`}`