improve get recent by filter

err0r500 · Aug 4, 2018 · 74c1722 · 74c1722
1 parent 2a83b05
commit 74c1722
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 27 deletions.
diff --git a/domain/article.go b/domain/article.go
@@ -18,6 +18,29 @@ type Article struct {
 	Comments       []Comment `json:"comments"`
 }
 
+type ArticleFilter func(Article) bool
+
+func Hastag(tag string) func(article Article) bool {
+	return func(article Article) bool {
+		for _, articleTag := range article.TagList {
+			if articleTag == tag {
+				return true
+			}
+		}
+		return false
+	}
+}
+
+func HasAuthor(authorName string) func(article Article) bool {
+	return func(article Article) bool {
+		return article.Author.Name == authorName
+	}
+}
+
+func IsFavorited(article Article) bool {
+	return article.Favorited
+}
+
 type ArticleCollection []Article
 
 func (articles ArticleCollection) ApplyLimitAndOffset(limit, offset int) ArticleCollection {

diff --git a/implem/memory.articleRW/readWriter.go b/implem/memory.articleRW/readWriter.go
@@ -53,10 +53,27 @@ func (rw rw) GetByAuthorsNameOrderedByMostRecentAsc(usernames []string) ([]domai
 	return toReturn, nil
 }
 
-func (rw) GetRecentFiltered(filters uc.Filters) ([]domain.Article, error) {
-	// todo => check if its AND or OR filters
+func (rw rw) GetRecentFiltered(filters []domain.ArticleFilter) ([]domain.Article, error) {
+	var recentArticles []domain.Article
 
-	return nil, nil
+	rw.store.Range(func(key, value interface{}) bool {
+		article, ok := value.(domain.Article)
+		if !ok {
+			// not an article (shouldn't happen) -> skip
+			return true // log this but continue
+		}
+
+		for _, funcToApply := range filters {
+			if !funcToApply(article) { // "AND filter" : if one of the filter is at false, skip the article
+				return true
+			}
+		}
+
+		recentArticles = append(recentArticles, article)
+		return true
+	})
+
+	return recentArticles, nil
 }
 
 func (rw rw) Save(article domain.Article) (*domain.Article, error) {

diff --git a/implem/mock.uc/handler.go b/implem/mock.uc/handler.go
diff --git a/implem/mock.uc/interactor.go b/implem/mock.uc/interactor.go
diff --git a/uc/HANDLER.go b/uc/HANDLER.go
@@ -30,7 +30,7 @@ type UserLogic interface {
 
 type ArticlesLogic interface {
 	ArticlesFeed(username string, limit, offset int) (articles domain.ArticleCollection, totalArticleCount int, err error)
-	GetArticles(limit, offset int, filters Filters) (articles domain.ArticleCollection, totalArticleCount int, err error)
+	GetArticles(limit, offset int, filters []domain.ArticleFilter) (articles domain.ArticleCollection, totalArticleCount int, err error)
 }
 
 type ArticleLogic interface {

diff --git a/uc/INTERACTOR.go b/uc/INTERACTOR.go
@@ -40,7 +40,7 @@ type ArticleRW interface {
 	Save(domain.Article) (*domain.Article, error)
 	GetBySlug(slug string) (*domain.Article, error)
 	GetByAuthorsNameOrderedByMostRecentAsc(usernames []string) ([]domain.Article, error)
-	GetRecentFiltered(filters Filters) ([]domain.Article, error)
+	GetRecentFiltered(filters []domain.ArticleFilter) ([]domain.Article, error)
 	Delete(slug string) error
 }
 
@@ -52,6 +52,7 @@ type CommentRW interface {
 
 type TagsRW interface {
 	GetAll() ([]string, error)
+	Add(newTags []string) error
 }
 
 type Slugger interface {

diff --git a/uc/article.go b/uc/article.go
@@ -29,6 +29,10 @@ func (i interactor) ArticlePost(username string, article domain.Article) (*domai
 		return nil, err
 	}
 
+	if err := i.tagsRW.Add(article.TagList); err != nil {
+		return nil, err
+	}
+
 	return completeArticle, nil
 }
 

diff --git a/uc/article_test.go b/uc/article_test.go
@@ -27,6 +27,7 @@ func TestInteractor_ArticlePost(t *testing.T) {
 	i.Slugger.EXPECT().NewSlug(article.Title).Return(slug).Times(1)
 	i.ArticleRW.EXPECT().GetBySlug(slug).Return(nil, errors.New("not found")).Times(1)
 	i.ArticleValidator.EXPECT().BeforeCreationCheck(gomock.Any()).Return(nil).Times(1)
+	i.TagsRW.EXPECT().Add(gomock.Any())
 	i.ArticleRW.EXPECT().Create(gomock.Any())
 
 	_, err := i.GetUCHandler().ArticlePost(rick.Name, article)

diff --git a/uc/articlesRecent.go b/uc/articlesRecent.go
@@ -1,36 +1,28 @@
 package uc
 
 import (
-	"strconv"
-
 	"github.com/err0r500/go-realworld-clean/domain"
 )
 
-type Filters struct {
-	AuthorFilter    *string
-	TagFilter       *string
-	FavoritedFilter *bool
-}
-
-func NewFilters(author, tag, favorite string) Filters {
-	filters := Filters{}
+func NewFilters(author, tag, favorite string) []domain.ArticleFilter {
+	filters := []domain.ArticleFilter{}
 	if author != "" {
-		filters.AuthorFilter = &author
+		filters = append(filters, domain.HasAuthor(author))
 	}
 	if tag != "" {
-		filters.TagFilter = &tag
+		filters = append(filters, domain.Hastag(tag))
 	}
 
-	fav, err := strconv.ParseBool(favorite)
-	if err != nil {
-		return filters
-	}
-	filters.FavoritedFilter = &fav
+	//fav, err := strconv.ParseBool(favorite)
+	//if err != nil {
+	//	return filters
+	//}
+	//filters.FavoritedFilter = &fav
 
 	return filters
 }
 
-func (i interactor) GetArticles(limit, offset int, filters Filters) (domain.ArticleCollection, int, error) {
+func (i interactor) GetArticles(limit, offset int, filters []domain.ArticleFilter) (domain.ArticleCollection, int, error) {
 	if limit <= 0 {
 		return domain.ArticleCollection{}, 0, nil
 	}