handle not logged users in article usecases

err0r500 · Aug 5, 2018 · e3cbcb8 · e3cbcb8
1 parent 3a4daff
commit e3cbcb8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/implem/gin.server/article.go b/implem/gin.server/article.go
@@ -68,7 +68,7 @@ func (rH RouterHandler) articlePut(c *gin.Context) {
 func (rH RouterHandler) articleGet(c *gin.Context) {
 	log := rH.log(rH.MethodAndPath(c))
 
-	user, article, err := rH.ucHandler.ArticleGet(rH.getUserName(c), c.Param("slug")) // todo add requesting username here
+	user, article, err := rH.ucHandler.ArticleGet(rH.getUserName(c), c.Param("slug"))
 	if err != nil {
 		log(err)
 		c.Status(http.StatusUnprocessableEntity)

diff --git a/uc/article.go b/uc/article.go
@@ -66,9 +66,13 @@ func (i interactor) ArticlePut(username string, slug string, reqArticle domain.A
 }
 
 func (i interactor) ArticleGet(username, slug string) (*domain.User, *domain.Article, error) {
-	user, err := i.userRW.GetByName(username)
-	if err != nil {
-		return nil, nil, err
+	var user *domain.User
+	if username != "" {
+		var errGet error
+		user, errGet = i.userRW.GetByName(username)
+		if errGet != nil {
+			return nil, nil, errGet
+		}
 	}
 
 	article, err := i.articleRW.GetBySlug(slug)

diff --git a/uc/articlesFeed.go b/uc/articlesFeed.go
@@ -9,9 +9,13 @@ func (i interactor) ArticlesFeed(username string, limit, offset int) (*domain.Us
 		return nil, domain.ArticleCollection{}, 0, nil
 	}
 
-	user, err := i.userRW.GetByName(username)
-	if err != nil {
-		return nil, nil, 0, err
+	var user *domain.User
+	if username != "" {
+		var errGet error
+		user, errGet = i.userRW.GetByName(username)
+		if errGet != nil {
+			return nil, nil, 0, errGet
+		}
 	}
 	articles, err := i.articleRW.GetByAuthorsNameOrderedByMostRecentAsc(user.FollowIDs)
 	if err != nil {

diff --git a/uc/articlesRecent.go b/uc/articlesRecent.go
@@ -29,9 +29,13 @@ func (i interactor) GetArticles(username string, limit, offset int, filters []do
 		return nil, nil, 0, err
 	}
 
-	user, err := i.userRW.GetByName(username)
-	if err != nil {
-		return nil, nil, 0, err
+	var user *domain.User
+	if username != "" {
+		var errGet error
+		user, errGet = i.userRW.GetByName(username)
+		if errGet != nil {
+			return nil, nil, 0, errGet
+		}
 	}
 
 	return user, domain.ArticleCollection(articles).ApplyLimitAndOffset(limit, offset), len(articles), nil