Merge branch 'hotfix-1.4.10'

Author: arteymix

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>ubc.pavlab</groupId>
     <artifactId>rdp</artifactId>
-    <version>1.4.9</version>
+    <version>1.4.10</version>
 
     <developers>
         <developer>

src/main/java/ubc/pavlab/rdp/repositories/UserRepository.java

@@ -22,7 +22,6 @@ public interface UserRepository extends JpaRepository<User, Integer> {
     @Query("select user from User user left join fetch user.userTerms")
     Collection<User> findAllWithUserTerms();
 
-    @SuppressWarnings("SpringCacheAnnotationsOnInterfaceInspection")
     @Override
     long count();
 
@@ -49,8 +48,7 @@ public interface UserRepository extends JpaRepository<User, Integer> {
     Collection<User> findByProfileNameContainingIgnoreCaseOrProfileLastNameContainingIgnoreCase( String nameLike,
                                                                                                  String lastNameLike );
 
-    @SuppressWarnings("SpringDataRepositoryMethodParametersInspection")
     @QueryHints(@QueryHint(name = "org.hibernate.cacheable", value = "true"))
-    Collection<User> findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase(
+    Collection<User> findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase(
             String descriptionLike, String taxonDescriptionLike );
 }

src/main/java/ubc/pavlab/rdp/services/UserServiceImpl.java

@@ -368,7 +368,7 @@ public List<User> findByStartsName( String startsName, Set<ResearcherPosition> r
     @PostFilter("hasPermission(filterObject, 'read')")
     public List<User> findByDescription( String descriptionLike, Set<ResearcherPosition> researcherPositions, Collection<ResearcherCategory> researcherTypes, Collection<OrganInfo> organs ) {
         final Set<String> organUberonIds = organUberonIdsFromOrgans( organs );
-        return userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( descriptionLike, descriptionLike ).stream()
+        return userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( descriptionLike, descriptionLike ).stream()
                 .filter( u -> researcherPositions == null || researcherPositions.contains( u.getProfile().getResearcherPosition() ) )
                 .filter( u -> researcherTypes == null || containsAny( researcherTypes, u.getProfile().getResearcherCategories() ) )
                 .filter( u -> organUberonIds == null || containsAny( organUberonIds, u.getUserOrgans().values().stream().map( UserOrgan::getUberonId ).collect( Collectors.toSet() ) ) )

src/test/java/ubc/pavlab/rdp/repositories/UserRepositoryTest.java

@@ -285,7 +285,7 @@ public void findByDescriptionLike_whenNoMatch_thenReturnEmptyCollection() {
 
         // when
         String search = "xyz";
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).isEmpty();
@@ -304,7 +304,7 @@ public void findByDescriptionLike_whenMultipleMatchInSameUser_thenReturnSingleUs
 
         // when
         String search = "Description";
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 1 );
@@ -322,7 +322,7 @@ public void findByDescriptionLike_whenCaseInsensitiveMatch_thenReturnUser() {
 
         // when
         String search = user.getProfile().getDescription().toUpperCase();
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 1 );
@@ -340,7 +340,7 @@ public void findByDescriptionLike_whenDescriptionStartsWithMatch_thenReturnUser(
 
         // when
         String search = user.getProfile().getDescription().substring( 0, 3 );
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 1 );
@@ -358,7 +358,7 @@ public void findByDescriptionLike_whenDescriptionEndsWithMatch_thenReturnUser()
 
         // when
         String search = user.getProfile().getDescription().substring( 3 );
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 1 );
@@ -376,7 +376,7 @@ public void findByDescriptionLike_whenDescriptionContainsMatch_thenReturnUser()
 
         // when
         String search = user.getProfile().getDescription().substring( 1, 3 );
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 1 );
@@ -395,7 +395,7 @@ public void findByDescriptionLike_whenTaxonDescriptionStartsWithMatch_thenReturn
 
         // when
         String search = user.getTaxonDescriptions().get( taxon ).substring( 0, 3 );
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 1 );
@@ -414,7 +414,7 @@ public void findByDescriptionLike_whenTaxonDescriptionEndsWithMatch_thenReturnUs
 
         // when
         String search = user.getTaxonDescriptions().get( taxon ).substring( 3 );
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 1 );
@@ -433,7 +433,7 @@ public void findByDescriptionLike_whenTaxonDescriptionContainsMatch_thenReturnUs
 
         // when
         String search = user.getTaxonDescriptions().get( taxon ).substring( 1, 3 );
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 1 );
@@ -454,13 +454,37 @@ public void findByDescriptionLike_whenMultipleMatches_thenReturnMultipleUsers()
 
         // when
         String search = user.getProfile().getDescription();
-        Collection<User> found = userRepository.findByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
 
         // then
         assertThat( found ).hasSize( 2 );
         assertThat( found ).containsExactly( user, user2 );
     }
 
+    @Test
+    public void findByDescriptionLike_whenMultipleMatchInMultipleTaxa_thenReturnSingleUser() {
+        // given
+        User user = createUnpersistedUser();
+        user.getProfile().setDescription( "Test Description" );
+
+        Taxon taxon = entityManager.persist( createTaxon( 1 ) );
+        user.getTaxonDescriptions().put( taxon, "Taxon Description" );
+
+        Taxon taxon2 = entityManager.persist( createTaxon( 2 ) );
+        user.getTaxonDescriptions().put( taxon2, "Taxon Description" );
+
+        entityManager.persist( user );
+        entityManager.flush();
+
+        // when
+        String search = "Description";
+        Collection<User> found = userRepository.findDistinctByProfileDescriptionContainingIgnoreCaseOrTaxonDescriptionsContainingIgnoreCase( search, search );
+
+        // then
+        assertThat( found ).hasSize( 1 );
+        assertThat( found.iterator().next() ).isEqualTo( user );
+    }
+
     @Test
     public void save_whenUserWithCompleteProfile_thenSucceed() {
         User user = createUnpersistedUser();