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

Merge pull request #20690 from plant99/MM-45118_my_top_dms

Просмотр исходного кода 
[MM-45118] Add insights endpoint for top dms
Этот коммит содержится в:
Shivashis Padhi
2022-08-19 19:33:44 +05:30
коммит произвёл GitHub
родитель 6305b79475 e87a2bbe19
Коммит 7643a28263
17 изменённых файлов: 745 добавлений и 37 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
app/app_iface.go
Просмотреть файл

@@ -793,6 +793,7 @@ type AppIface interface {
GetTokenById(token string) (*model.Token, *model.AppError)
GetTopChannelsForTeamSince(c request.CTX, teamID, userID string, opts *model.InsightsOpts) (*model.TopChannelList, *model.AppError)
GetTopChannelsForUserSince(c request.CTX, userID, teamID string, opts *model.InsightsOpts) (*model.TopChannelList, *model.AppError)
GetTopDMsForUserSince(userID string, opts *model.InsightsOpts) (*model.TopDMList, *model.AppError)
GetTopReactionsForTeamSince(teamID string, userID string, opts *model.InsightsOpts) (*model.TopReactionList, *model.AppError)
GetTopReactionsForUserSince(userID string, teamID string, opts *model.InsightsOpts) (*model.TopReactionList, *model.AppError)
GetTopThreadsForTeamSince(c request.CTX, teamID, userID string, opts *model.InsightsOpts) (*model.TopThreadList, *model.AppError)

22
app/opentracing/opentracing_layer.go
Просмотреть файл

@@ -9955,6 +9955,28 @@ func (a *OpenTracingAppLayer) GetTopChannelsForUserSince(c request.CTX, userID s
return resultVar0, resultVar1
}
func (a *OpenTracingAppLayer) GetTopDMsForUserSince(userID string, opts *model.InsightsOpts) (*model.TopDMList, *model.AppError) {
origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetTopDMsForUserSince")
a.ctx = newCtx
a.app.Srv().Store.SetContext(newCtx)
defer func() {
a.app.Srv().Store.SetContext(origCtx)
a.ctx = origCtx
}()
defer span.Finish()
resultVar0, resultVar1 := a.app.GetTopDMsForUserSince(userID, opts)
if resultVar1 != nil {
span.LogFields(spanlog.Error(resultVar1))
ext.Error.Set(span, true)
}
return resultVar0, resultVar1
}
func (a *OpenTracingAppLayer) GetTopReactionsForTeamSince(teamID string, userID string, opts *model.InsightsOpts) (*model.TopReactionList, *model.AppError) {
origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetTopReactionsForTeamSince")

11
app/post.go
Просмотреть файл

@@ -1939,6 +1939,17 @@ func (a *App) GetTopThreadsForUserSince(c request.CTX, teamID, userID string, op
return topThreadsWithEmbedAndImage, nil
}
func (a *App) GetTopDMsForUserSince(userID string, opts *model.InsightsOpts) (*model.TopDMList, *model.AppError) {
if !a.Config().FeatureFlags.InsightsEnabled {
return nil, model.NewAppError("GetTopDMsForUserSince", "app.insights.feature_disabled", nil, "", http.StatusNotImplemented)
}
topDMs, err := a.Srv().Store.Post().GetTopDMsForUserSince(userID, opts.StartUnixMilli, opts.Page*opts.PerPage, opts.PerPage)
if err != nil {
return nil, model.NewAppError("GetTopDMsForUserSince", "app.post.get_top_dms_for_user_since.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return topDMs, nil
}
func (a *App) SetPostReminder(postID, userID string, targetTime int64) *model.AppError {
// Store the reminder in the DB
reminder := &model.PostReminder{

100
app/post_test.go
Просмотреть файл

@@ -3062,3 +3062,103 @@ func TestGetTopThreadsForUserSince(t *testing.T) {
require.Nil(t, appErr)
require.Len(t, topUser2ThreadsAfterPrivateReplyDelete.Items, 0)
}
func TestGetTopDMsForUserSince(t *testing.T) {
th := Setup(t).InitBasic()
defer th.TearDown()
th.App.UpdateConfig(func(cfg *model.Config) { cfg.FeatureFlags.InsightsEnabled = true })
// users
user := th.CreateUser()
u1 := th.CreateUser()
u2 := th.CreateUser()
u3 := th.CreateUser()
u4 := th.CreateUser()
// user direct messages
chUser1, nErr := th.App.createDirectChannel(th.Context, u1.Id, user.Id)
fmt.Println(chUser1, nErr)
require.Nil(t, nErr)
chUser2, nErr := th.App.createDirectChannel(th.Context, u2.Id, user.Id)
require.Nil(t, nErr)
chUser3, nErr := th.App.createDirectChannel(th.Context, u3.Id, user.Id)
require.Nil(t, nErr)
// other user direct message
chUser3User4, nErr := th.App.createDirectChannel(th.Context, u3.Id, u4.Id)
require.Nil(t, nErr)
// sample post data
// for u1
_, err := th.App.CreatePostAsUser(th.Context, &model.Post{
ChannelId: chUser1.Id,
UserId: u1.Id,
}, "", false)
require.Nil(t, err)
_, err = th.App.CreatePostAsUser(th.Context, &model.Post{
ChannelId: chUser1.Id,
UserId: user.Id,
}, "", false)
require.Nil(t, err)
// for u2: 1 post
_, err = th.App.CreatePostAsUser(th.Context, &model.Post{
ChannelId: chUser2.Id,
UserId: u2.Id,
}, "", false)
require.Nil(t, err)
// for user-u3: 3 posts
for i := 0; i < 3; i++ {
_, err = th.App.CreatePostAsUser(th.Context, &model.Post{
ChannelId: chUser3.Id,
UserId: user.Id,
}, "", false)
require.Nil(t, err)
}
// for u4-u3: 4 posts
_, err = th.App.CreatePostAsUser(th.Context, &model.Post{
ChannelId: chUser3User4.Id,
UserId: u3.Id,
}, "", false)
require.Nil(t, err)
_, err = th.App.CreatePostAsUser(th.Context, &model.Post{
ChannelId: chUser3User4.Id,
UserId: u4.Id,
}, "", false)
require.Nil(t, err)
_, err = th.App.CreatePostAsUser(th.Context, &model.Post{
ChannelId: chUser3User4.Id,
UserId: u3.Id,
}, "", false)
require.Nil(t, err)
_, err = th.App.CreatePostAsUser(th.Context, &model.Post{
ChannelId: chUser3User4.Id,
UserId: u4.Id,
}, "", false)
require.Nil(t, err)
t.Run("should return topDMs when userid is specified ", func(t *testing.T) {
topDMs, err := th.App.GetTopDMsForUserSince(user.Id, &model.InsightsOpts{StartUnixMilli: 100, Page: 0, PerPage: 100})
require.Nil(t, err)
// 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.Id, u3.Id)
require.Equal(t, topDMs.Items[0].MessageCount, int64(3))
require.Equal(t, topDMs.Items[1].SecondParticipant.Id, u1.Id)
require.Equal(t, topDMs.Items[1].MessageCount, int64(2))
require.Equal(t, topDMs.Items[2].SecondParticipant.Id, u2.Id)
require.Equal(t, topDMs.Items[2].MessageCount, int64(1))
// this also ensures that u3-u4 conversation doesn't show up in others' top DMs.
})
t.Run("topDMs should only consider user's DM channels ", func(t *testing.T) {
// u4 only takes part in one conversation
topDMs, err := th.App.GetTopDMsForUserSince(u4.Id, &model.InsightsOpts{StartUnixMilli: 100, Page: 0, PerPage: 100})
require.Nil(t, err)
// len of topDMs.Items should be 3
require.Len(t, topDMs.Items, 1)
// check order, magnitude of items
require.Equal(t, topDMs.Items[0].SecondParticipant.Id, u3.Id)
require.Equal(t, topDMs.Items[0].MessageCount, int64(4))
})
}