10 files changed, 19 insertions, 12 deletions
diff --git a/pkg/app/handler/cvetool/comments.go b/pkg/app/handler/cvetool/comments.go
index d36122a..37649a1 100644
--- a/pkg/app/handler/cvetool/comments.go
+++ b/pkg/app/handler/cvetool/comments.go
@@ -7,6 +7,7 @@ import (
 	"glsamaker/pkg/logger"
 	"glsamaker/pkg/models/cve"
 	"encoding/json"
+	"glsamaker/pkg/models/users"
 	"net/http"
 	"time"
 )
@@ -23,7 +24,7 @@ func AddComment(w http.ResponseWriter, r *http.Request) {
 
 	id, comment, err := getParams(r)
 
-	newComment, err := addNewCommment(id, user.Id, comment)
+	newComment, err := addNewCommment(id, user, comment)
 
 	if err != nil {
 		logger.Info.Println("Err")
@@ -38,7 +39,7 @@ func AddComment(w http.ResponseWriter, r *http.Request) {
 
 }
 
-func addNewCommment(id string, userID int64, comment string) (cve.Comment, error) {
+func addNewCommment(id string, user *users.User, comment string) (cve.Comment, error) {
 
 	cveItem := &cve.DefCveItem{Id: id}
 	err := connection.DB.Select(cveItem)
@@ -49,7 +50,8 @@ func addNewCommment(id string, userID int64, comment string) (cve.Comment, error
 
 	newComment := cve.Comment{
 		CVEId:   id,
-		User:    userID,
+		UserId:  user.Id,
+		User:    user,
 		Message: comment,
 		Date:    time.Now(),
 	}
diff --git a/pkg/app/handler/cvetool/index.go b/pkg/app/handler/cvetool/index.go
index 9c54a01..bf70536 100644
--- a/pkg/app/handler/cvetool/index.go
+++ b/pkg/app/handler/cvetool/index.go
@@ -98,7 +98,7 @@ func CveData(w http.ResponseWriter, r *http.Request) {
 		q = q.WhereOr("description LIKE " + "'%" + search_value + "%'").
 			WhereOr("id LIKE " + "'%" + search_value + "%'")
 		return q, nil
-	}).Relation("Bugs").Relation("Comments").Select()
+	}).Relation("Bugs").Relation("Comments").Relation("Comments.User").Select()
 
 	if err != nil || len(cves) == 0 {
 		logger.Info.Println("Error finding cves:")
diff --git a/pkg/app/handler/cvetool/state.go b/pkg/app/handler/cvetool/state.go
index 608691c..8ff46cb 100644
--- a/pkg/app/handler/cvetool/state.go
+++ b/pkg/app/handler/cvetool/state.go
@@ -48,7 +48,7 @@ func ChangeState(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	newComment, err := addNewCommment(id, user.Id, "Changed status to "+newState+": "+reason)
+	newComment, err := addNewCommment(id, user, "Changed status to "+newState+": "+reason)
 
 	if err != nil {
 		logger.Error.Println("Err")
diff --git a/pkg/app/handler/dashboard/index.go b/pkg/app/handler/dashboard/index.go
index 82fd858..8d9966e 100644
--- a/pkg/app/handler/dashboard/index.go
+++ b/pkg/app/handler/dashboard/index.go
@@ -29,7 +29,7 @@ func Show(w http.ResponseWriter, r *http.Request) {
 	connection.DB.Model(&cves).Order("last_modified_date DESC").Limit(5).Select()
 
 	var comments []*cve.Comment
-	connection.DB.Model(&comments).Order("date DESC").Limit(5).Select()
+	connection.DB.Model(&comments).Relation("User").Order("date DESC").Limit(5).Select()
 
 	requests, _ := connection.DB.Model((*models.Glsa)(nil)).Where("type = ?", "request").Count()
 	drafts, _ := connection.DB.Model((*models.Glsa)(nil)).Where("type = ?", "draft").Count()
diff --git a/pkg/app/handler/glsa/comments.go b/pkg/app/handler/glsa/comments.go
index 9412b62..a3afe0b 100644
--- a/pkg/app/handler/glsa/comments.go
+++ b/pkg/app/handler/glsa/comments.go
@@ -82,7 +82,8 @@ func AddNewCommment(id string, user *users.User, comment string, commentType str
 
 	newComment := cve.Comment{
 		GlsaId:    glsaID,
-		User:      user.Id,
+		UserId:    user.Id,
+		User:      user,
 		UserBadge: user.Badge,
 		Type:      commentType,
 		Message:   comment,
diff --git a/pkg/app/handler/glsa/edit.go b/pkg/app/handler/glsa/edit.go
index 04e67b3..c89e68f 100644
--- a/pkg/app/handler/glsa/edit.go
+++ b/pkg/app/handler/glsa/edit.go
@@ -45,6 +45,7 @@ func Edit(w http.ResponseWriter, r *http.Request) {
 		Relation("Bugs").
 		Relation("Creator").
 		Relation("Comments").
+		Relation("Comments.User").
 		WherePK()).
 		Select()
 
diff --git a/pkg/app/handler/glsa/view.go b/pkg/app/handler/glsa/view.go
index d84273c..945af2d 100644
--- a/pkg/app/handler/glsa/view.go
+++ b/pkg/app/handler/glsa/view.go
@@ -26,7 +26,8 @@ func View(w http.ResponseWriter, r *http.Request) {
 	err := user.CanAccess(connection.DB.Model(glsa).
 		Relation("Bugs").
 		Relation("Creator").
-		Relation("Comments").WherePK()).
+		Relation("Comments").
+		Relation("Comments.User").WherePK()).
 		Select()
 
 	if err != nil {
diff --git a/pkg/app/handler/requests/index.go b/pkg/app/handler/requests/index.go
index fddbd86..d57ecc5 100644
--- a/pkg/app/handler/requests/index.go
+++ b/pkg/app/handler/requests/index.go
@@ -26,7 +26,8 @@ func Show(w http.ResponseWriter, r *http.Request) {
 		Where("type = ?", "request").
 		Relation("Bugs").
 		Relation("Creator").
-		Relation("Comments")).
+		Relation("Comments").
+		Relation("Comments.User")).
 		Select()
 
 	if err != nil {
diff --git a/pkg/models/cve/feed.go b/pkg/models/cve/feed.go
index 527f233..598c3ab 100644
--- a/pkg/models/cve/feed.go
+++ b/pkg/models/cve/feed.go
@@ -73,7 +73,8 @@ type Comment struct {
 	Id        int64 `pg:",pk,unique"`
 	GlsaId    int64
 	CVEId     string
-	User      int64
+	UserId    int64
+	User      *users.User
 	UserBadge users.Badge
 	Type      string
 	Message   string
diff --git a/pkg/models/glsa.go b/pkg/models/glsa.go
index 9f8c3ec..1a6cddc 100644
--- a/pkg/models/glsa.go
+++ b/pkg/models/glsa.go
@@ -86,7 +86,7 @@ func (glsa *Glsa) ComputeStatus(user *users.User) {
 		status.WorkflowStatus = "approved"
 	} else {
 		for _, comment := range glsa.Comments {
-			if comment.User == user.Id {
+			if comment.UserId == user.Id {
 				status.WorkflowStatus = "commented"
 				break
 			}
@@ -99,7 +99,7 @@ func (glsa *Glsa) ComputeStatus(user *users.User) {
 func (glsa *Glsa) ComputeCommentBadges() {
 	for _, comment := range glsa.Comments {
 		user := new(users.User)
-		connection.DB.Model(user).Where("id = ?", comment.User).Select()
+		connection.DB.Model(user).Where("id = ?", comment.UserId).Select()
 
 		comment.UserBadge = user.Badge
 	}