From 870d86ae1d035ab8c25145fc2053b2777bd5bff4 Mon Sep 17 00:00:00 2001
From: Shivashis Padhi <shivashispadhi@gmail.com>
Date: Mon, 25 Jul 2022 16:38:46 +0530
Subject: [PATCH] Save users to db in storetests, lint fix

---
 store/sqlstore/post_store.go  |  2 +-
 store/storetest/post_store.go | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go
index cb0faeb0de..7fe22ee1fc 100644
--- a/store/sqlstore/post_store.go
+++ b/store/sqlstore/post_store.go
@@ -3032,7 +3032,7 @@ func postProcessTopDMs(s *SqlPostStore, userID string, topDMs []*model.TopDM) ([
 			if err != nil {
 				return nil, errors.Wrapf(err, "failed to get second participant information for user-id: %s", topDM.SecondParticipant)
 			}
-			if users[0].IsBot == true {
+			if users[0].IsBot {
 				continue
 			}
 		}
diff --git a/store/storetest/post_store.go b/store/storetest/post_store.go
index 84707d599e..b3df516ad7 100644
--- a/store/storetest/post_store.go
+++ b/store/storetest/post_store.go
@@ -3865,11 +3865,17 @@ func testGetNthRecentPostTime(t *testing.T, ss store.Store) {
 
 func testGetTopDMsForUserSince(t *testing.T, ss store.Store, s SqlStore) {
 	// users
-	user := model.User{Id: model.NewId()}
-	u1 := model.User{Id: model.NewId()}
-	u2 := model.User{Id: model.NewId()}
-	u3 := model.User{Id: model.NewId()}
-	u4 := model.User{Id: model.NewId()}
+	user := model.User{Email: MakeEmail(), Username: model.NewId()}
+	u1 := model.User{Email: MakeEmail(), Username: model.NewId()}
+	u2 := model.User{Email: MakeEmail(), Username: model.NewId()}
+	u3 := model.User{Email: MakeEmail(), Username: model.NewId()}
+	u4 := model.User{Email: MakeEmail(), Username: model.NewId()}
+	_, err := ss.User().Save(&user)
+	_, err = ss.User().Save(&u1)
+	_, err = ss.User().Save(&u2)
+	_, err = ss.User().Save(&u3)
+	_, err = ss.User().Save(&u4)
+	require.NoError(t, err)
 	// user direct messages
 	chUser1, nErr := ss.Channel().CreateDirectChannel(&u1, &user)
 	require.NoError(t, nErr)
@@ -3883,7 +3889,7 @@ func testGetTopDMsForUserSince(t *testing.T, ss store.Store, s SqlStore) {
 
 	// sample post data
 	// for u1
-	_, err := ss.Post().Save(&model.Post{
+	_, err = ss.Post().Save(&model.Post{
 		ChannelId: chUser1.Id,
 		UserId:    u1.Id,
 	})
@@ -3935,7 +3941,6 @@ func testGetTopDMsForUserSince(t *testing.T, ss store.Store, s SqlStore) {
 		// len of topDMs.Items should be 3
 		require.Len(t, topDMs.Items, 3)
 		// check order, magnitude of items
-		// fmt.Println(topDMs.Items[0].MessageCount, topDMs.Items[1].MessageCount, topDMs.Items[2].MessageCount)
 		require.Equal(t, topDMs.Items[0].SecondParticipant, u3.Id)
 		require.Equal(t, topDMs.Items[0].MessageCount, int64(3))
 		require.Equal(t, topDMs.Items[1].SecondParticipant, u1.Id)