From 2e4dfe3891b63a759b49d7c79267f2f27e459e5f Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Sun, 7 Apr 2019 14:05:19 -0500
Subject: [PATCH] move vote setter to service level

---
 backend/app/rest/api/rest.go              | 19 +++++--------------
 backend/app/store/comment.go              |  2 +-
 backend/app/store/service/service.go      |  9 +++++++++
 backend/app/store/service/service_test.go |  4 ++++
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/backend/app/rest/api/rest.go b/backend/app/rest/api/rest.go
index 373329ed..6774e810 100644
--- a/backend/app/rest/api/rest.go
+++ b/backend/app/rest/api/rest.go
@@ -312,28 +312,19 @@ func (s *Rest) alterComments(comments []store.Comment, r *http.Request) (res []s
 	// prepare vote info for client view
 	vote := func(c store.Comment, r *http.Request) store.Comment {
 
-		c.Vote = 0 //default is "none" (not voted)
-
-		user, err := rest.GetUserInfo(r)
+		_, err := rest.GetUserInfo(r)
 		if err != nil {
-			c.Votes = nil // hide voters list }()
+			c.Vote = 0    //default is "none" (not voted) for non-authed user
+			c.Votes = nil // hide voters list
 			return c
 		}
 
-		if v, ok := c.Votes[user.ID]; ok {
-			if v {
-				c.Vote = 1
-			} else {
-				c.Vote = -1
-			}
-		}
-
-		c.Votes = nil // hide voters list }()
+		c.Votes = nil // hide voters list
 		return c
 	}
 
 	for i, c := range res {
-		c = vote(c, r)
+		c = vote(c, r) // hide voters list
 		res[i] = c
 	}
 
diff --git a/backend/app/store/comment.go b/backend/app/store/comment.go
index 4412e7ae..a6241184 100644
--- a/backend/app/store/comment.go
+++ b/backend/app/store/comment.go
@@ -18,7 +18,7 @@ type Comment struct {
 	Locator     Locator         `json:"locator"`
 	Score       int             `json:"score"`
 	Votes       map[string]bool `json:"votes,omitempty"`
-	Vote        int             `json:"vote"` // vote for the current user, -1/1/0. set by rest from Votes
+	Vote        int             `json:"vote"` // vote for the current user, -1/1/0.
 	Controversy float64         `json:"controversy,omitempty"`
 	Timestamp   time.Time       `json:"time" bson:"time"`
 	Edit        *Edit           `json:"edit,omitempty" bson:"edit,omitempty"` // pointer to have empty default in json response
diff --git a/backend/app/store/service/service.go b/backend/app/store/service/service.go
index fe30a28c..43849ee0 100644
--- a/backend/app/store/service/service.go
+++ b/backend/app/store/service/service.go
@@ -206,6 +206,15 @@ func (s *DataStore) Vote(locator store.Locator, commentID string, userID string,
 		comment.Score--
 	}
 
+	comment.Vote = 0
+	if v, ok := comment.Votes[userID]; ok {
+		if v {
+			comment.Vote = 1
+		} else {
+			comment.Vote = -1
+		}
+	}
+
 	comment.Controversy = s.controversy(s.upsAndDowns(comment))
 
 	return comment, s.Put(locator, comment)
diff --git a/backend/app/store/service/service_test.go b/backend/app/store/service/service_test.go
index 42dcedd1..6fbc9401 100644
--- a/backend/app/store/service/service_test.go
+++ b/backend/app/store/service/service_test.go
@@ -179,11 +179,13 @@ func TestService_Vote(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 3, len(res))
 	assert.Equal(t, 0, res[0].Score)
+	assert.Equal(t, 0, res[0].Vote)
 	assert.Equal(t, map[string]bool(nil), res[0].Votes, "no votes initially")
 
 	c, err := b.Vote(store.Locator{URL: "https://radio-t.com", SiteID: "radio-t"}, res[0].ID, "user1", true)
 	assert.Nil(t, err)
 	assert.Equal(t, 1, c.Score)
+	assert.Equal(t, 1, c.Vote)
 	assert.Equal(t, map[string]bool{"user1": true}, c.Votes, "user voted +")
 
 	c, err = b.Vote(store.Locator{URL: "https://radio-t.com", SiteID: "radio-t"}, res[0].ID, "user", true)
@@ -197,6 +199,7 @@ func TestService_Vote(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 3, len(res))
 	assert.Equal(t, 1, res[0].Score)
+	assert.Equal(t, 1, res[0].Vote)
 	assert.Equal(t, 0.0, res[0].Controversy)
 
 	_, err = b.Vote(store.Locator{URL: "https://radio-t.com", SiteID: "radio-t"}, res[0].ID, "user1", false)
@@ -205,6 +208,7 @@ func TestService_Vote(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 3, len(res))
 	assert.Equal(t, 0, res[0].Score)
+	assert.Equal(t, 0, res[0].Vote)
 	assert.Equal(t, map[string]bool(nil), res[0].Votes, "vote reset ok")
 }