2 files changed, 22 insertions, 6 deletions
diff --git a/backend/src/main/java/com/blog/web/services/ArticleService.java b/backend/src/main/java/com/blog/web/services/ArticleService.java
index 1bfe38f..1e50df0 100644
--- a/backend/src/main/java/com/blog/web/services/ArticleService.java
+++ b/backend/src/main/java/com/blog/web/services/ArticleService.java
@@ -4,6 +4,7 @@ import com.blog.web.dto.ArticleDto;
 import com.blog.web.dto.ArticlePublicDto;
 import com.blog.web.models.Article;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 
@@ -18,5 +19,9 @@ public interface ArticleService {
 
     boolean delete(Long articleId);
 
-    List<ArticleDto> searchArticles(String search);
+    //List<ArticleDto> searchArticles(String search);
+
+    ArticlePublicDto findArticlePublicById(long articleId);
+
+    HashSet<ArticlePublicDto> searchPublicArticles(String search);
 }
diff --git a/backend/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java b/backend/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java
index 7073073..993d798 100644
--- a/backend/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java
+++ b/backend/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java
@@ -11,14 +11,14 @@ import com.blog.web.services.ArticleService;
 import com.blog.web.services.UserService;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.blog.web.mappers.ArticleMapper;
 
-import static com.blog.web.mappers.ArticleMapper.mapToArticle;
-import static com.blog.web.mappers.ArticleMapper.mapToArticleDto;
+import static com.blog.web.mappers.ArticleMapper.*;
 
 @Service
 public class ArticleServiceImpl implements ArticleService {
@@ -86,9 +86,20 @@ public class ArticleServiceImpl implements ArticleService {
         }
     }
 
+    //@Override
+    //public List<ArticleDto> searchArticles(String search) {
+    //    List<Article> articles = articleRepository.searchArticles(search);
+    //    return articles.stream().map(article -> mapToArticleDto(article)).collect(Collectors.toList());
+    //}
+
+    @Override
+    public ArticlePublicDto findArticlePublicById(long articleId) {
+        return new ArticlePublicDto(articleRepository.findById(articleId).get());
+    }
+
     @Override
-    public List<ArticleDto> searchArticles(String search) {
-        List<Article> articles = articleRepository.searchArticles(search);
-        return articles.stream().map(article -> mapToArticleDto(article)).collect(Collectors.toList());
+    public HashSet<ArticlePublicDto> searchPublicArticles(String search) {
+        HashSet<Article> articles = articleRepository.searchArticles(search);
+        return articles.stream().map(article -> mapToArticlePublicDto(article)).collect(Collectors.toCollection(HashSet::new));
     }
 }