Merge pull request #1044 from oncokb/fix-check-duplicate-users

Fix check duplicate users
oncokb · Nov 2, 2023 · 3e4ad5e · 3e4ad5e
2 parents 19ce8dc + 877266e
commit 3e4ad5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/org/mskcc/cbio/oncokb/service/UserService.java b/src/main/java/org/mskcc/cbio/oncokb/service/UserService.java
@@ -678,7 +678,7 @@ public List<UserDTO> searchAccountsForPotentialDuplicateUser(UserDTO user, List<
         List<UserDTO> potentialDuplicateUsers = new ArrayList<>();
         for (UserDTO potentialDuplicate : allUsers) {
             String potentialDuplicateFullName = StringUtil.getFullName(potentialDuplicate.getFirstName(), potentialDuplicate.getLastName());
-            if (user.getId() != potentialDuplicate.getId() && jw.apply(userFullName, potentialDuplicateFullName) > .7) {
+            if (!user.getId().equals(potentialDuplicate.getId()) && jw.apply(userFullName, potentialDuplicateFullName) > .85) {
                 potentialDuplicateUsers.add(potentialDuplicate);
             }
         }

diff --git a/src/test/java/org/mskcc/cbio/oncokb/service/UserServiceIT.java b/src/test/java/org/mskcc/cbio/oncokb/service/UserServiceIT.java
@@ -12,7 +12,6 @@
 import org.mskcc.cbio.oncokb.service.mapper.UserMapper;
 
 import io.github.jhipster.security.RandomUtil;
-
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -381,7 +380,7 @@ public void assertThatUserTokenStatusIsExpected() {
     //UNIT TESTS
     @Test
     public void assertThatDuplicateUsersAreCaught() {
-        long id = -1;
+        Long id = 6000L;
 
         UserDTO user = new UserDTO();
         user.setFirstName("Jon");
@@ -427,6 +426,12 @@ public void assertThatDuplicateUsersAreCaught() {
 
             allUsers.add(newUser);
         }
+
+        UserDTO testSameIdUser = new UserDTO(); //need this to ensure comparison of IDs is done correctly, Longs are compared by reference
+        testSameIdUser.setFirstName(user.getFirstName());
+        testSameIdUser.setLastName(user.getLastName());
+        testSameIdUser.setId(new Long(user.getId()));
+        allUsers.add(testSameIdUser);
 
         List<UserDTO> duplicateUsers = userService.searchAccountsForPotentialDuplicateUser(user, allUsers);
         assertThat(duplicateUsers).containsExactlyInAnyOrder(similarUsers.toArray(new UserDTO[similarUsers.size()]));