remove profile type

tags & favorite usecases

domain/article.go

@@ -14,18 +14,10 @@ type Article struct {
 	UpdatedAt      time.Time `json:"updatedAt"`
 	Favorited      bool      `json:"favorited"`
 	FavoritesCount int       `json:"favoritesCount"`
-	Author         Profile   `json:"author"`
+	Author         User      `json:"author"`
 	Comments       []Comment `json:"comments"`
 }
 
-type Comment struct {
-	ID        int       `json:"id"`
-	CreatedAt time.Time `json:"createdAt"`
-	UpdatedAt time.Time `json:"updatedAt"`
-	Body      string    `json:"body"`
-	Author    Profile   `json:"author"`
-}
-
 type ArticleCollection []Article
 
 func (articles ArticleCollection) ApplyLimitAndOffset(limit, offset int) ArticleCollection {

domain/comment.go

@@ -0,0 +1,11 @@
+package domain
+
+import "time"
+
+type Comment struct {
+	ID        int       `json:"id"`
+	CreatedAt time.Time `json:"createdAt"`
+	UpdatedAt time.Time `json:"updatedAt"`
+	Body      string    `json:"body"`
+	Author    User      `json:"author"`
+}

domain/user.go

@@ -72,10 +72,10 @@ func SetUserPassword(input *string) func(fields *User) {
 }
 
 // Profile represents a user account with follow property if his followed by the user
-type Profile struct {
-	User
-	Following bool
-}
+//type Profile struct {
+//	User
+//	Following bool
+//}
 
 func (user User) Follows(userName string) bool {
 	if user.FollowIDs == nil {

implem/gin.server/profileFollowDelete.go

@@ -3,7 +3,6 @@ package server
 import (
 	"net/http"
 
-	"github.com/err0r500/go-realworld-clean/domain"
 	"github.com/err0r500/go-realworld-clean/implem/json.formatter"
 	"github.com/gin-gonic/gin"
 )
@@ -18,5 +17,5 @@ func (rH RouterHandler) profileFollowDelete(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, gin.H{"profile": formatter.NewProfileFromDomain(domain.Profile{User: *user, Following: false})})
+	c.JSON(http.StatusOK, gin.H{"profile": formatter.NewProfileFromDomain(*user, false)})
 }

implem/gin.server/profileFollowPost.go

@@ -3,7 +3,6 @@ package server
 import (
 	"net/http"
 
-	"github.com/err0r500/go-realworld-clean/domain"
 	"github.com/err0r500/go-realworld-clean/implem/json.formatter"
 	"github.com/gin-gonic/gin"
 )
@@ -18,5 +17,5 @@ func (rH RouterHandler) profileFollowPost(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, gin.H{"profile": formatter.NewProfileFromDomain(domain.Profile{User: *user, Following: true})})
+	c.JSON(http.StatusOK, gin.H{"profile": formatter.NewProfileFromDomain(*user, false)})
 }

implem/gin.server/profileGet.go

@@ -9,13 +9,17 @@ import (
 
 func (rH RouterHandler) profileGet(c *gin.Context) {
 	log := rH.log(rH.MethodAndPath(c))
+	requestingUserName := ""
+	if userName, err := rH.authHandler.GetUserName(c.GetHeader("Authorization")); err == nil {
+		requestingUserName = userName
+	}
 
-	profile, err := rH.ucHandler.ProfileGet(c.Param("username"))
+	user, follows, err := rH.ucHandler.ProfileGet(requestingUserName, c.Param("username"))
 	if err != nil {
 		log(err)
 		c.Status(http.StatusUnprocessableEntity)
 		return
 	}
 
-	c.JSON(http.StatusOK, gin.H{"profile": formatter.NewProfileFromDomain(*profile)})
+	c.JSON(http.StatusOK, gin.H{"profile": formatter.NewProfileFromDomain(*user, follows)})
 }

implem/gin.server/profileGet_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/err0r500/go-realworld-clean/testData"
 	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
 	"gopkg.in/h2non/baloo.v3"
 )
 
@@ -19,11 +20,11 @@ func TestProfileGet_happyCase(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	janeFollowingRick := testData.Profile("janeFollowingRick")
+	jane := testData.User("jane")
 	ucHandler := uc.NewMockHandler(mockCtrl)
 	ucHandler.EXPECT().
-		ProfileGet(testData.User("rick").Name).
-		Return(&janeFollowingRick, nil).
+		ProfileGet("", testData.User("rick").Name).
+		Return(&jane, true, nil).
 		Times(1)
 
 	gE := gin.Default()
@@ -39,3 +40,32 @@ func TestProfileGet_happyCase(t *testing.T) {
 		JSONSchema(testData.ProfileRespDefinition).
 		Done()
 }
+
+func TestProfileGet_happyCaseAuthenticated(t *testing.T) {
+	mockCtrl := gomock.NewController(t)
+	defer mockCtrl.Finish()
+
+	jane := testData.User("jane")
+	ucHandler := uc.NewMockHandler(mockCtrl)
+	ucHandler.EXPECT().
+		ProfileGet(jane.Name, testData.User("rick").Name).
+		Return(&jane, true, nil).
+		Times(1)
+
+	jwtHandler := jwt.NewTokenHandler("mySalt")
+	gE := gin.Default()
+	server.NewRouter(ucHandler, jwtHandler).SetRoutes(gE)
+	authToken, err := jwtHandler.GenUserToken(testData.User("jane").Name)
+	assert.NoError(t, err)
+
+	ts := httptest.NewServer(gE)
+	defer ts.Close()
+
+	baloo.New(ts.URL).
+		Get(profileGetPath).
+		AddHeader("Authorization", authToken).
+		Expect(t).
+		Status(200).
+		JSONSchema(testData.ProfileRespDefinition).
+		Done()
+}

implem/json.formatter/article.go

@@ -25,7 +25,7 @@ func NewArticleFromDomain(article domain.Article) Article {
 		Body:           article.Body,
 		CreatedAt:      article.CreatedAt.UTC().Format(dateFormat),
 		UpdatedAt:      article.UpdatedAt.UTC().Format(dateFormat),
-		Author:         NewProfileFromDomain(article.Author),
+		Author:         NewProfileFromDomain(article.Author, false), //fixme : check this !
 		Tags:           article.TagList,
 		Favorite:       article.Favorited,
 		FavoritesCount: article.FavoritesCount,

implem/json.formatter/comment.go

@@ -27,6 +27,6 @@ func NewCommentFromDomain(comment domain.Comment) Comment {
 		CreatedAt: comment.CreatedAt.UTC().Format(dateFormat),
 		UpdatedAt: comment.UpdatedAt.UTC().Format(dateFormat),
 		Body:      comment.Body,
-		Author:    NewProfileFromDomain(comment.Author),
+		Author:    NewProfileFromDomain(comment.Author, false), //fixme check this
 	}
 }

implem/json.formatter/profile.go

@@ -11,7 +11,7 @@ type Profile struct {
 	Following bool   `json:"following"`
 }
 
-func NewProfileFromDomain(user domain.Profile) Profile {
+func NewProfileFromDomain(user domain.User, following bool) Profile {
 	var bio, image string
 	if user.Bio != nil {
 		bio = *user.Bio
@@ -24,6 +24,6 @@ func NewProfileFromDomain(user domain.Profile) Profile {
 		Username:  user.Name,
 		Bio:       bio,
 		Picture:   image,
-		Following: user.Following,
+		Following: following,
 	}
 }

implem/mock.uc/builder.go

@@ -18,6 +18,7 @@ type MockedInteractor struct {
 	AuthHandler      *MockAuthHandler
 	Slugger          *MockSlugger
 	ArticleValidator *MockArticleValidator
+	TagsRW           *MockTagsRW
 }
 
 type SimpleLogger struct{}
@@ -36,6 +37,7 @@ func NewMockedInteractor(mockCtrl *gomock.Controller) MockedInteractor {
 		AuthHandler:      NewMockAuthHandler(mockCtrl),
 		Slugger:          NewMockSlugger(mockCtrl),
 		ArticleValidator: NewMockArticleValidator(mockCtrl),
+		TagsRW:           NewMockTagsRW(mockCtrl),
 	}
 }
 
@@ -49,5 +51,6 @@ func (i MockedInteractor) GetUCHandler() uc.Handler {
 		AuthHandler:      i.AuthHandler,
 		Slugger:          i.Slugger,
 		ArticleValidator: i.ArticleValidator,
+		TagsRW:           i.TagsRW,
 	}.New()
 }

testData/example.go

@@ -42,19 +42,19 @@ var jane = domain.User{
 	Password:  "janePassword",
 }
 
-func Profile(name string) domain.Profile {
-	switch name {
-	case "janeFollowingRick":
-		return janeFollowingRick
-	default:
-		return janeFollowingRick
-	}
-}
+//func Profile(name string) domain.Profile {
+//	switch name {
+//	case "janeFollowingRick":
+//		return janeFollowingRick
+//	default:
+//		return janeFollowingRick
+//	}
+//}
 
-var janeFollowingRick = domain.Profile{
-	User:      rick,
-	Following: true,
-}
+//var janeFollowingRick = domain.Profile{
+//	User:      rick,
+//	Following: true,
+//}
 
 var janeArticle = domain.Article{
 	Slug:           "articleSlug",
@@ -66,13 +66,13 @@ var janeArticle = domain.Article{
 	UpdatedAt:      time.Now(),
 	Favorited:      true,
 	FavoritesCount: 123,
-	Author:         domain.Profile{User: jane, Following: false},
+	Author:         jane,
 	Comments: []domain.Comment{
 		{ID: 123,
 			CreatedAt: time.Now(),
 			UpdatedAt: time.Now(),
 			Body:      "commentBody",
-			Author:    domain.Profile{User: rick, Following: false},
+			Author:    rick,
 		},
 	},
 }

uc/HANDLER.go

@@ -17,7 +17,7 @@ type Handler interface {
 }
 
 type ProfileLogic interface {
-	ProfileGet(userName string) (profile *domain.Profile, err error)
+	ProfileGet(requestingUserName, userName string) (profile *domain.User, follows bool, err error)
 	ProfileUpdateFollow(loggedInUsername, username string, follow bool) (user *domain.User, err error)
 }
 
@@ -62,6 +62,7 @@ type HandlerConstructor struct {
 	AuthHandler      AuthHandler
 	Slugger          Slugger
 	ArticleValidator ArticleValidator
+	TagsRW           TagsRW
 }
 
 func (c HandlerConstructor) New() Handler {
@@ -86,6 +87,9 @@ func (c HandlerConstructor) New() Handler {
 	if c.ArticleValidator == nil {
 		log.Fatal("missing ArticleValidator")
 	}
+	if c.TagsRW == nil {
+		log.Fatal("missing TagsRW")
+	}
 
 	return interactor{
 		logger:           c.Logger,
@@ -95,5 +99,6 @@ func (c HandlerConstructor) New() Handler {
 		authHandler:      c.AuthHandler,
 		slugger:          c.Slugger,
 		articleValidator: c.ArticleValidator,
+		tagsRW:           c.TagsRW,
 	}
 }

uc/article.go

@@ -18,7 +18,7 @@ func (i interactor) ArticlePost(username string, article domain.Article) (*domai
 	}
 
 	article.Slug = slug
-	article.Author = domain.Profile{User: *user, Following: false}
+	article.Author = *user
 
 	if err := i.articleValidator.BeforeCreationCheck(&article); err != nil {
 		return nil, err