Add unit test for comments

Author: RedCocoon

models/conversations/comment_list.go

@@ -14,29 +14,6 @@ import (
 // CommentList defines a list of comments
 type CommentList []*ConversationComment
 
-// LoadPosters loads posters
-func (comments CommentList) LoadPosters(ctx context.Context) error {
-	if len(comments) == 0 {
-		return nil
-	}
-
-	posterIDs := container.FilterSlice(comments, func(c *ConversationComment) (int64, bool) {
-		return c.PosterID, c.Poster == nil && c.PosterID > 0
-	})
-
-	posterMaps, err := getPostersByIDs(ctx, posterIDs)
-	if err != nil {
-		return err
-	}
-
-	for _, comment := range comments {
-		if comment.Poster == nil {
-			comment.Poster = getPoster(comment.PosterID, posterMaps)
-		}
-	}
-	return nil
-}
-
 // getConversationIDs returns all the conversation ids on this comment list which conversation hasn't been loaded
 func (comments CommentList) getConversationIDs() []int64 {
 	return container.FilterSlice(comments, func(comment *ConversationComment) (int64, bool) {
@@ -181,10 +158,6 @@ func (comments CommentList) LoadAttachments(ctx context.Context) (err error) {
 // LoadAttributes loads attributes of the comments, except for attachments and
 // comments
 func (comments CommentList) LoadAttributes(ctx context.Context) (err error) {
-	if err = comments.LoadPosters(ctx); err != nil {
-		return err
-	}
-
 	if err = comments.LoadAttachments(ctx); err != nil {
 		return err
 	}

models/conversations/comment_test.go

@@ -0,0 +1,80 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package conversations_test
+
+import (
+	"testing"
+	"time"
+
+	conversations_model "code.gitea.io/gitea/models/conversations"
+	"code.gitea.io/gitea/models/db"
+	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/models/unittest"
+	user_model "code.gitea.io/gitea/models/user"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCreateComment(t *testing.T) {
+	assert.NoError(t, unittest.PrepareTestDatabase())
+
+	conversation := unittest.AssertExistsAndLoadBean(t, &conversations_model.Conversation{})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: conversation.RepoID})
+	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+
+	now := time.Now().Unix()
+	comment, err := conversations_model.CreateComment(db.DefaultContext, &conversations_model.CreateCommentOptions{
+		Type:         conversations_model.CommentTypeComment,
+		Doer:         doer,
+		Repo:         repo,
+		Conversation: conversation,
+		Content:      "Hello",
+	})
+	assert.NoError(t, err)
+	then := time.Now().Unix()
+
+	assert.EqualValues(t, conversations_model.CommentTypeComment, comment.Type)
+	assert.EqualValues(t, "Hello", comment.Content)
+	assert.EqualValues(t, conversation.ID, comment.ConversationID)
+	assert.EqualValues(t, doer.ID, comment.PosterID)
+	unittest.AssertInt64InRange(t, now, then, int64(comment.CreatedUnix))
+	unittest.AssertExistsAndLoadBean(t, comment) // assert actually added to DB
+
+	updatedConversation := unittest.AssertExistsAndLoadBean(t, &conversations_model.Conversation{ID: conversation.ID})
+	unittest.AssertInt64InRange(t, now, then, int64(updatedConversation.UpdatedUnix))
+}
+
+func TestAsCommentType(t *testing.T) {
+	assert.Equal(t, conversations_model.CommentType(0), conversations_model.CommentTypeComment)
+	assert.Equal(t, conversations_model.CommentTypeUndefined, conversations_model.AsCommentType(""))
+	assert.Equal(t, conversations_model.CommentTypeUndefined, conversations_model.AsCommentType("nonsense"))
+	assert.Equal(t, conversations_model.CommentTypeComment, conversations_model.AsCommentType("comment"))
+}
+
+func TestMigrate_InsertConversationComments(t *testing.T) {
+	assert.NoError(t, unittest.PrepareTestDatabase())
+	conversation := unittest.AssertExistsAndLoadBean(t, &conversations_model.Conversation{ID: 1})
+	_ = conversation.LoadRepo(db.DefaultContext)
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: conversation.Repo.OwnerID})
+	reaction := &conversations_model.CommentReaction{
+		Type:   "heart",
+		UserID: owner.ID,
+	}
+
+	comment := &conversations_model.ConversationComment{
+		PosterID:       owner.ID,
+		Poster:         owner,
+		ConversationID: conversation.ID,
+		Conversation:   conversation,
+		Reactions:      []*conversations_model.CommentReaction{reaction},
+	}
+
+	err := conversations_model.InsertConversationComments(db.DefaultContext, []*conversations_model.ConversationComment{comment})
+	assert.NoError(t, err)
+
+	conversationModified := unittest.AssertExistsAndLoadBean(t, &conversations_model.Conversation{ID: 1})
+	assert.EqualValues(t, conversation.NumComments+1, conversationModified.NumComments)
+
+	unittest.CheckConsistencyFor(t, &conversations_model.Conversation{})
+}

models/conversations/conversation_test.go

@@ -1,4 +1,4 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package conversations_test

models/conversations/main_test.go

@@ -0,0 +1,30 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package conversations_test
+
+import (
+	"testing"
+
+	conversations_model "code.gitea.io/gitea/models/conversations"
+	"code.gitea.io/gitea/models/unittest"
+
+	_ "code.gitea.io/gitea/models"
+	_ "code.gitea.io/gitea/models/actions"
+	_ "code.gitea.io/gitea/models/activities"
+	_ "code.gitea.io/gitea/models/repo"
+	_ "code.gitea.io/gitea/models/user"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFixturesAreConsistent(t *testing.T) {
+	assert.NoError(t, unittest.PrepareTestDatabase())
+	unittest.CheckConsistencyFor(t,
+		&conversations_model.Conversation{},
+	)
+}
+
+func TestMain(m *testing.M) {
+	unittest.MainTest(m)
+}