MM-49564: Drafts upsert in the Store vs App layer (#22530)

* MM-49564: Upsert in the Store vs App layer Refactor drafts so that Upserting a draft would happen in the DB and not in the app layer. * Fixes mocks * Fixes tests * Fixes translations * Fixes tests * Update tests * Fixes tests * Addresses review comments - renames Save => Upsert - removes Sleep from tests * Fixes flaky test --------- Co-authored-by: Mattermost Build <build@mattermost.com>
2023-04-01 10:32:40 +03:00
--- a/server/channels/store/storetest/draft_store.go
+++ b/server/channels/store/storetest/draft_store.go
@@ -68,17 +68,21 @@ func testSaveDraft(t *testing.T, ss store.Store) {
 	}

 	t.Run("save drafts", func(t *testing.T) {
-		draftResp, err := ss.Draft().Save(draft1)
+		draftResp, err := ss.Draft().Upsert(draft1)
 		assert.NoError(t, err)

 		assert.Equal(t, draft1.Message, draftResp.Message)
 		assert.Equal(t, draft1.ChannelId, draftResp.ChannelId)

-		draftResp, err = ss.Draft().Save(draft2)
+		draftResp, err = ss.Draft().Upsert(draft2)
 		assert.NoError(t, err)

 		assert.Equal(t, draft2.Message, draftResp.Message)
 		assert.Equal(t, draft2.ChannelId, draftResp.ChannelId)
+
+		drafts, err := ss.Draft().GetDraftsForUser(user.Id, "")
+		assert.NoError(t, err)
+		assert.Len(t, drafts, 2)
 	})
 }

@@ -90,56 +94,52 @@ func testUpdateDraft(t *testing.T, ss store.Store) {
 	channel := &model.Channel{
 		Id: model.NewId(),
 	}
-	channel2 := &model.Channel{
-		Id: model.NewId(),
-	}

-	member1 := &model.ChannelMember{
+	member := &model.ChannelMember{
 		ChannelId:   channel.Id,
 		UserId:      user.Id,
 		NotifyProps: model.GetDefaultChannelNotifyProps(),
 	}

-	member2 := &model.ChannelMember{
-		ChannelId:   channel2.Id,
-		UserId:      user.Id,
-		NotifyProps: model.GetDefaultChannelNotifyProps(),
-	}
-
-	_, err := ss.Channel().SaveMember(member1)
+	_, err := ss.Channel().SaveMember(member)
 	require.NoError(t, err)

-	_, err = ss.Channel().SaveMember(member2)
-	require.NoError(t, err)
-
-	draft1 := &model.Draft{
-		CreateAt:  00001,
-		UpdateAt:  00001,
-		UserId:    user.Id,
-		ChannelId: channel.Id,
-		Message:   "draft1",
-	}
-
-	draft2 := &model.Draft{
-		CreateAt:  00005,
-		UpdateAt:  00005,
-		UserId:    user.Id,
-		ChannelId: channel2.Id,
-		Message:   "draft2",
-	}
-
 	t.Run("update drafts", func(t *testing.T) {
-		draftResp, err := ss.Draft().Update(draft1)
+		draft := &model.Draft{
+			UserId:    user.Id,
+			ChannelId: channel.Id,
+			Message:   "draft",
+		}
+		_, err := ss.Draft().Upsert(draft)
 		assert.NoError(t, err)

-		assert.Equal(t, draft1.Message, draftResp.Message)
-		assert.Equal(t, draft1.ChannelId, draftResp.ChannelId)
+		drafts, err := ss.Draft().GetDraftsForUser(user.Id, "")
+		assert.NoError(t, err)
+		assert.Len(t, drafts, 1)
+		draft1 := drafts[0]

-		draftResp, err = ss.Draft().Update(draft2)
+		assert.Greater(t, draft1.CreateAt, int64(0))
+		assert.Equal(t, draft1.UpdateAt, draft1.CreateAt)
+		assert.Equal(t, channel.Id, draft1.ChannelId)
+		assert.Equal(t, "draft", draft1.Message)
+
+		updatedDraft := &model.Draft{
+			UserId:    user.Id,
+			ChannelId: channel.Id,
+			Message:   "updatedDraft",
+		}
+		_, err = ss.Draft().Upsert(updatedDraft)
 		assert.NoError(t, err)

-		assert.Equal(t, draft2.Message, draftResp.Message)
-		assert.Equal(t, draft2.ChannelId, draftResp.ChannelId)
+		drafts, err = ss.Draft().GetDraftsForUser(user.Id, "")
+		assert.NoError(t, err)
+		assert.Len(t, drafts, 1)
+		draft2 := drafts[0]
+
+		assert.Greater(t, draft2.CreateAt, int64(0))
+		assert.Equal(t, "updatedDraft", draft2.Message)
+		assert.Equal(t, channel.Id, draft2.ChannelId)
+		assert.Equal(t, draft1.CreateAt, draft2.CreateAt)
 	})
 }

@@ -189,10 +189,10 @@ func testDeleteDraft(t *testing.T, ss store.Store) {
 		Message:   "draft2",
 	}

-	_, err = ss.Draft().Save(draft1)
+	_, err = ss.Draft().Upsert(draft1)
 	require.NoError(t, err)

-	_, err = ss.Draft().Save(draft2)
+	_, err = ss.Draft().Upsert(draft2)
 	require.NoError(t, err)

 	t.Run("delete drafts", func(t *testing.T) {
@@ -258,10 +258,10 @@ func testGetDraft(t *testing.T, ss store.Store) {
 		Message:   "draft2",
 	}

-	_, err = ss.Draft().Save(draft1)
+	_, err = ss.Draft().Upsert(draft1)
 	require.NoError(t, err)

-	_, err = ss.Draft().Save(draft2)
+	_, err = ss.Draft().Upsert(draft2)
 	require.NoError(t, err)

 	t.Run("get drafts", func(t *testing.T) {
@@ -326,35 +326,28 @@ func testGetDraftsForUser(t *testing.T, ss store.Store) {
 	require.NoError(t, err)

 	draft1 := &model.Draft{
-		CreateAt:  00001,
-		UpdateAt:  00001,
 		UserId:    user.Id,
 		ChannelId: channel.Id,
 		Message:   "draft1",
 	}

 	draft2 := &model.Draft{
-		CreateAt:  00005,
-		UpdateAt:  00005,
 		UserId:    user.Id,
 		ChannelId: channel2.Id,
 		Message:   "draft2",
 	}

-	_, err = ss.Draft().Save(draft1)
+	_, err = ss.Draft().Upsert(draft1)
 	require.NoError(t, err)

-	_, err = ss.Draft().Save(draft2)
+	_, err = ss.Draft().Upsert(draft2)
 	require.NoError(t, err)

 	t.Run("get drafts", func(t *testing.T) {
 		draftResp, err := ss.Draft().GetDraftsForUser(user.Id, "")
 		assert.NoError(t, err)
+		assert.Len(t, draftResp, 2)

-		assert.Equal(t, draft2.Message, draftResp[0].Message)
-		assert.Equal(t, draft2.ChannelId, draftResp[0].ChannelId)
-
-		assert.Equal(t, draft1.Message, draftResp[1].Message)
-		assert.Equal(t, draft1.ChannelId, draftResp[1].ChannelId)
+		assert.ElementsMatch(t, []*model.Draft{draft1, draft2}, draftResp)
 	})
 }
--- a/server/channels/store/storetest/mocks/DraftStore.go
+++ b/server/channels/store/storetest/mocks/DraftStore.go
@@ -74,31 +74,8 @@ func (_m *DraftStore) GetDraftsForUser(userID string, teamID string) ([]*model.D
 	return r0, r1
 }

-// Save provides a mock function with given fields: d
-func (_m *DraftStore) Save(d *model.Draft) (*model.Draft, error) {
-	ret := _m.Called(d)
-
-	var r0 *model.Draft
-	if rf, ok := ret.Get(0).(func(*model.Draft) *model.Draft); ok {
-		r0 = rf(d)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.Draft)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(*model.Draft) error); ok {
-		r1 = rf(d)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// Update provides a mock function with given fields: d
-func (_m *DraftStore) Update(d *model.Draft) (*model.Draft, error) {
+// Upsert provides a mock function with given fields: d
+func (_m *DraftStore) Upsert(d *model.Draft) (*model.Draft, error) {
 	ret := _m.Called(d)

 	var r0 *model.Draft