MM-62751: [Shared Channels] Allow remote users to be discoverable in the create DM/GM modal (#30918)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
476b46d1d7
Коммит
c46ed6c681
@@ -210,6 +210,24 @@ func (_m *RemoteClusterStore) Update(rc *model.RemoteCluster) (*model.RemoteClus
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// UpdateLastGlobalUserSyncAt provides a mock function with given fields: remoteID, syncAt
|
||||
func (_m *RemoteClusterStore) UpdateLastGlobalUserSyncAt(remoteID string, syncAt int64) error {
|
||||
ret := _m.Called(remoteID, syncAt)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for UpdateLastGlobalUserSyncAt")
|
||||
}
|
||||
|
||||
var r0 error
|
||||
if rf, ok := ret.Get(0).(func(string, int64) error); ok {
|
||||
r0 = rf(remoteID, syncAt)
|
||||
} else {
|
||||
r0 = ret.Error(0)
|
||||
}
|
||||
|
||||
return r0
|
||||
}
|
||||
|
||||
// UpdateTopics provides a mock function with given fields: remoteClusterID, topics
|
||||
func (_m *RemoteClusterStore) UpdateTopics(remoteClusterID string, topics string) (*model.RemoteCluster, error) {
|
||||
ret := _m.Called(remoteClusterID, topics)
|
||||
|
||||
@@ -32,6 +32,7 @@ func TestSharedChannelStore(t *testing.T, rctx request.CTX, ss store.Store, s Sq
|
||||
t.Run("HasRemote", func(t *testing.T) { testHasRemote(t, rctx, ss) })
|
||||
t.Run("GetRemoteForUser", func(t *testing.T) { testGetRemoteForUser(t, rctx, ss) })
|
||||
t.Run("UpdateSharedChannelRemoteNextSyncAt", func(t *testing.T) { testUpdateSharedChannelRemoteCursor(t, rctx, ss) })
|
||||
t.Run("UpdateGlobalUserSyncCursor", func(t *testing.T) { testUpdateGlobalUserSyncCursor(t, rctx, ss) })
|
||||
t.Run("DeleteSharedChannelRemote", func(t *testing.T) { testDeleteSharedChannelRemote(t, rctx, ss) })
|
||||
|
||||
t.Run("SaveSharedChannelUser", func(t *testing.T) { testSaveSharedChannelUser(t, rctx, ss) })
|
||||
@@ -932,6 +933,38 @@ func testUpdateSharedChannelRemoteCursor(t *testing.T, rctx request.CTX, ss stor
|
||||
})
|
||||
}
|
||||
|
||||
func testUpdateGlobalUserSyncCursor(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
// Create a remote cluster first
|
||||
rc := &model.RemoteCluster{
|
||||
RemoteId: model.NewId(),
|
||||
SiteURL: "http://example.com",
|
||||
CreatorId: model.NewId(),
|
||||
Name: "test",
|
||||
}
|
||||
rcSaved, err := ss.RemoteCluster().Save(rc)
|
||||
require.NoError(t, err, "couldn't save remote cluster", err)
|
||||
|
||||
futureTimestamp := model.GetMillis() + 3600000 // 1 hour in the future
|
||||
|
||||
t.Run("Update global user sync cursor for remote", func(t *testing.T) {
|
||||
err := ss.RemoteCluster().UpdateLastGlobalUserSyncAt(rcSaved.RemoteId, futureTimestamp)
|
||||
require.NoError(t, err, "update global user sync cursor should not error", err)
|
||||
|
||||
// Verify that the LastGlobalUserSyncAt field was updated in the RemoteCluster table
|
||||
// Small sleep to ensure the transaction is committed
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
updatedRC, err := ss.RemoteCluster().Get(rcSaved.RemoteId, false)
|
||||
require.NoError(t, err)
|
||||
require.NotZero(t, updatedRC.LastGlobalUserSyncAt, "LastGlobalUserSyncAt should not be zero")
|
||||
require.Equal(t, futureTimestamp, updatedRC.LastGlobalUserSyncAt)
|
||||
})
|
||||
|
||||
t.Run("Update global user sync cursor for non-existent remote", func(t *testing.T) {
|
||||
err := ss.RemoteCluster().UpdateLastGlobalUserSyncAt(model.NewId(), futureTimestamp)
|
||||
require.Error(t, err, "update non-existent remote should error", err)
|
||||
})
|
||||
}
|
||||
|
||||
func testDeleteSharedChannelRemote(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
channel, err := createTestChannel(ss, rctx, "test_remote_delete")
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -610,6 +610,32 @@ func testUserStoreGetAllProfiles(t *testing.T, rctx request.CTX, ss store.Store)
|
||||
}, actual)
|
||||
})
|
||||
|
||||
t.Run("filter by UpdatedAfter", func(t *testing.T) {
|
||||
// Update a user to ensure we have a recent update time
|
||||
updateTime := model.GetMillis()
|
||||
u2.FirstName = "Updated"
|
||||
_, updateErr := ss.User().Update(rctx, u2, false)
|
||||
require.NoError(t, updateErr)
|
||||
|
||||
// Query with the UpdatedAfter filter
|
||||
actual, userErr := ss.User().GetAllProfiles(&model.UserGetOptions{
|
||||
Page: 0,
|
||||
PerPage: 10,
|
||||
UpdatedAfter: updateTime - 1, // Subtract 1 to ensure we capture the update
|
||||
})
|
||||
require.NoError(t, userErr)
|
||||
require.Contains(t, actual, sanitized(u2), "User updated after the specified time should be in the results")
|
||||
|
||||
// Query with a future time, should return no results
|
||||
actual, userErr = ss.User().GetAllProfiles(&model.UserGetOptions{
|
||||
Page: 0,
|
||||
PerPage: 10,
|
||||
UpdatedAfter: updateTime + 10000, // Future time
|
||||
})
|
||||
require.NoError(t, userErr)
|
||||
require.NotContains(t, actual, sanitized(u2), "Users updated before the specified future time should not be in the results")
|
||||
})
|
||||
|
||||
u8, err := ss.User().Save(rctx, &model.User{
|
||||
Email: MakeEmail(),
|
||||
Username: "u8" + model.NewId(),
|
||||
|
||||
Ссылка в новой задаче
Block a user