Removed duplicate search results

removed duplicate search results creating method searchresult which uses the new method remove duplicates
creates one search result that returns a list with no duplicate images

- changed name from searchImageByTags to findAllByTags for continuity

src/main/java/NTNU/IDATT1002/repository/ImageRepository.java

@@ -49,11 +49,12 @@ public class ImageRepository extends GenericRepository<Image, Long> {
                 .getResultList();
     }
 
-    public List<Image> searchImageByTags(String tag){
+    public List<Image> findAllByTags(String tag){
         return entityManager.createNamedQuery(IMAGE_FIND_BY_TAG, Image.class)
                 .setParameter("name",tag)
                 .getResultList();
     }
+
 }
 
 

src/main/java/NTNU/IDATT1002/service/ImageService.java

@@ -125,7 +125,29 @@ public class ImageService {
                 .collect(Collectors.toList());
     }
 
-    public List<Image> searchImageWithTags(String query){
-        return imageRepository.searchImageByTags(query);
+    /**
+     * Searches images by tags and username, and merges the two list into one with all images
+     * uses removeDuplicates list to return a list with no duplicate images
+     * @param query
+     * @return a list with no duplicate images
+     */
+
+    public List<Image> searchResult(String query){
+        List<Image> allFound = new ArrayList<>();
+        List<Image> byTags = imageRepository.findAllByTags(query);
+        List<Image> byUsername = imageRepository.findAllByUsername(query);
+        allFound.addAll(byTags);
+        allFound.addAll(byUsername);
+        return removeDuplicates(allFound);
+    }
+
+    /**
+     * takes a list and removes all duplicate elements
+     * @param images
+     * @return list without duplicates
+     */
+
+    public List<Image> removeDuplicates(List<Image> images){
+        return images.stream().distinct().collect(Collectors.toList());
     }
 }