mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

MM-60124-emit and read create scheduled post WS event (#28844)

Просмотр исходного кода 
* MM-60124-emit and read create scheduled post WS event

* fix unit test; reorder get team id logic; use userid for ws events

* MM-60145 - ws events on update scheduled posts (#28871)

* MM-60145 - ws events on update scheduled posts

* MM-60147 - ws events on delete scheduled posts (#28872)

* MM-60147 - ws events on delete scheduled posts

* remove unnecessary channelID

* remove unnecesary memoization
Этот коммит содержится в:
Pablo Vélez
2024-11-05 14:24:50 +01:00
коммит произвёл GitHub
родитель 87cc13c590
Коммит fbee99e870
9 изменённых файлов: 130 добавлений и 37 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

52
server/channels/app/scheduled_post_test.go
Просмотреть файл

@@ -14,6 +14,7 @@ import (
func TestSaveScheduledPost(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
user1ConnID := model.NewId()
t.Run("base case", func(t *testing.T) {
userId := model.NewId()
@@ -48,7 +49,7 @@ func TestSaveScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)
})
@@ -57,7 +58,7 @@ func TestSaveScheduledPost(t *testing.T) {
scheduledPost := &model.ScheduledPost{
// a completely empty scheduled post
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.NotNil(t, appErr)
require.Nil(t, createdScheduledPost)
})
@@ -74,7 +75,7 @@ func TestSaveScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() - 100000, // 100 seconds in the past
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.NotNil(t, appErr)
require.Nil(t, createdScheduledPost)
})
@@ -93,7 +94,7 @@ func TestSaveScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.NotNil(t, appErr)
require.Nil(t, createdScheduledPost)
})
@@ -134,7 +135,7 @@ func TestSaveScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.NotNil(t, appErr)
require.Nil(t, createdScheduledPost)
})
@@ -172,13 +173,13 @@ func TestSaveScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)
scheduledPost.Message = "this is a second scheduled post"
scheduledPost.Id = model.NewId()
createdScheduledPost, appErr = th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr = th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)
})
@@ -215,7 +216,7 @@ func TestSaveScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.NotNil(t, appErr)
require.Nil(t, createdScheduledPost)
})
@@ -224,6 +225,7 @@ func TestSaveScheduledPost(t *testing.T) {
func TestGetUserTeamScheduledPosts(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
user1ConnID := model.NewId()
t.Run("should get created scheduled posts", func(t *testing.T) {
t.Skip("https://mattermost.atlassian.net/browse/MM-61523")
@@ -236,7 +238,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost1, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost1)
createdScheduledPost1, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost1, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost1)
@@ -249,7 +251,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost2, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost2)
createdScheduledPost2, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost2, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost2)
@@ -282,7 +284,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost1, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost1)
createdScheduledPost1, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost1, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost1)
@@ -295,7 +297,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost2, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost2)
createdScheduledPost2, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost2, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost2)
@@ -335,7 +337,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost1, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost1)
createdScheduledPost1, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost1, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost1)
@@ -348,7 +350,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost2, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost2)
createdScheduledPost2, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost2, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost2)
@@ -383,7 +385,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost1, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost1)
createdScheduledPost1, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost1, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost1)
@@ -396,7 +398,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost2, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost2)
createdScheduledPost2, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost2, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost2)
@@ -417,6 +419,7 @@ func TestGetUserTeamScheduledPosts(t *testing.T) {
func TestUpdateScheduledPost(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
user1ConnID := model.NewId()
t.Run("base case", func(t *testing.T) {
// first we'll create a scheduled post
@@ -452,7 +455,7 @@ func TestUpdateScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)
@@ -461,7 +464,7 @@ func TestUpdateScheduledPost(t *testing.T) {
createdScheduledPost.ScheduledAt = newScheduledAtTime
createdScheduledPost.Message = "Updated Message!!!"
updatedScheduledPost, appErr := th.App.UpdateScheduledPost(th.Context, userId, createdScheduledPost)
updatedScheduledPost, appErr := th.App.UpdateScheduledPost(th.Context, userId, createdScheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, updatedScheduledPost)
@@ -503,7 +506,7 @@ func TestUpdateScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)
@@ -512,7 +515,7 @@ func TestUpdateScheduledPost(t *testing.T) {
createdScheduledPost.ScheduledAt = newScheduledAtTime
createdScheduledPost.Message = "Updated Message!!!"
updatedScheduledPost, appErr := th.App.UpdateScheduledPost(th.Context, th.BasicUser2.Id, createdScheduledPost)
updatedScheduledPost, appErr := th.App.UpdateScheduledPost(th.Context, th.BasicUser2.Id, createdScheduledPost, user1ConnID)
require.NotNil(t, appErr)
require.Equal(t, http.StatusForbidden, appErr.StatusCode)
require.Nil(t, updatedScheduledPost)
@@ -552,7 +555,7 @@ func TestUpdateScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)
@@ -567,7 +570,7 @@ func TestUpdateScheduledPost(t *testing.T) {
createdScheduledPost.FileIds = []string{model.NewId(), model.NewId()}
createdScheduledPost.ErrorCode = model.ScheduledPostErrorUnknownError
updatedScheduledPost, appErr := th.App.UpdateScheduledPost(th.Context, userId, createdScheduledPost)
updatedScheduledPost, appErr := th.App.UpdateScheduledPost(th.Context, userId, createdScheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)
@@ -583,6 +586,7 @@ func TestUpdateScheduledPost(t *testing.T) {
func TestDeleteScheduledPost(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
user1ConnID := model.NewId()
t.Run("base case", func(t *testing.T) {
// first we'll create a scheduled post
@@ -595,7 +599,7 @@ func TestDeleteScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)
@@ -631,7 +635,7 @@ func TestDeleteScheduledPost(t *testing.T) {
},
ScheduledAt: model.GetMillis() + 100000, // 100 seconds in the future
}
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost)
createdScheduledPost, appErr := th.App.SaveScheduledPost(th.Context, scheduledPost, user1ConnID)
require.Nil(t, appErr)
require.NotNil(t, createdScheduledPost)