fix: resolve im backend issue list regressions
This commit is contained in:
+13
-9
@@ -1090,7 +1090,7 @@ func (s *testProfilesStore) GetPrivacy(_ types.TenantID, uid types.Uid) (*types.
|
||||
now := time.Now().UTC().Round(time.Millisecond)
|
||||
s.privacy = &types.UserPrivacySettings{
|
||||
UserID: uid, AddMeMethods: map[string]bool{"account": true, "phone": true, "qr": true, "group": true},
|
||||
ProfileVisibility: "friends", LastSeenVisibility: "friends", ReadReceipts: true, GroupInviteVerification: false, Version: 1, CreatedAt: now, UpdatedAt: now,
|
||||
ProfileVisibility: "friends", LastSeenVisibility: "friends", ReadReceipts: true, FriendRequestVerification: true, GroupInviteVerification: false, Version: 1, CreatedAt: now, UpdatedAt: now,
|
||||
}
|
||||
}
|
||||
return s.privacy, nil
|
||||
@@ -1110,6 +1110,9 @@ func (s *testProfilesStore) UpdatePrivacy(_ types.TenantID, uid types.Uid, patch
|
||||
if patch.ReadReceipts != nil {
|
||||
privacy.ReadReceipts = *patch.ReadReceipts
|
||||
}
|
||||
if patch.FriendRequestVerification != nil {
|
||||
privacy.FriendRequestVerification = *patch.FriendRequestVerification
|
||||
}
|
||||
if patch.GroupInviteVerification != nil {
|
||||
privacy.GroupInviteVerification = *patch.GroupInviteVerification
|
||||
}
|
||||
@@ -3900,7 +3903,7 @@ func TestServeIMMePrivacy(t *testing.T) {
|
||||
store.Profiles = profiles
|
||||
defer func() { store.Profiles = oldProfiles }()
|
||||
|
||||
req := httptest.NewRequest(http.MethodPatch, "/v1/im/me/privacy", strings.NewReader(`{"add_me_methods":{"account":true,"phone":false,"qr":true,"group":true},"read_receipts":false,"group_invite_verification":true,"version":1}`))
|
||||
req := httptest.NewRequest(http.MethodPatch, "/v1/im/me/privacy", strings.NewReader(`{"add_me_methods":{"account":true,"phone":false,"qr":true,"group":true},"read_receipts":false,"friend_request_verification":false,"group_invite_verification":true,"version":1}`))
|
||||
req.Header.Set("Authorization", "Bearer token-1")
|
||||
rec := httptest.NewRecorder()
|
||||
serveIMMePrivacy(rec, req)
|
||||
@@ -3911,8 +3914,8 @@ func TestServeIMMePrivacy(t *testing.T) {
|
||||
data := decodeIMHTTPResponse(t, rec).Data.(map[string]any)
|
||||
methods := data["add_me_methods"].(map[string]any)
|
||||
editable := data["editable"].(map[string]any)
|
||||
if methods["phone"] != false || data["read_receipts"] != false || data["group_invite_verification"] != true ||
|
||||
editable["group_invite_verification"] != true || data["version"].(float64) != 2 {
|
||||
if methods["phone"] != false || data["read_receipts"] != false || data["friend_request_verification"] != false || data["group_invite_verification"] != true ||
|
||||
editable["friend_request_verification"] != true || editable["group_invite_verification"] != true || data["version"].(float64) != 2 {
|
||||
t.Fatalf("unexpected privacy: %#v", data)
|
||||
}
|
||||
}
|
||||
@@ -4574,7 +4577,7 @@ func TestServeIMGroupList(t *testing.T) {
|
||||
}
|
||||
data := decodeIMHTTPResponse(t, rec).Data.(map[string]any)
|
||||
items := data["items"].([]any)
|
||||
if len(items) != 1 || items[0].(map[string]any)["name"] != "Alpha" || items[0].(map[string]any)["member_count"].(float64) != 3 || items[0].(map[string]any)["my_role"] != "owner" {
|
||||
if len(items) != 1 || items[0].(map[string]any)["name"] != "Alpha" || items[0].(map[string]any)["member_count"].(float64) != 0 || items[0].(map[string]any)["my_role"] != "owner" {
|
||||
t.Fatalf("unexpected group list response: %#v", data)
|
||||
}
|
||||
}
|
||||
@@ -6785,7 +6788,7 @@ func TestServeIMMessageForwardKafkaAssignsSeqAndBroadcasts(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestServeIMMessageForwardKafkaPublishUnknownReturnsPending(t *testing.T) {
|
||||
func TestServeIMMessageForwardKafkaPublishUnknownReturnsUncertain(t *testing.T) {
|
||||
ctrl := gomock.NewController(t)
|
||||
defer ctrl.Finish()
|
||||
mockStore := expectIMBearer(t, ctrl, "token-1", 7, 42)
|
||||
@@ -6864,8 +6867,9 @@ func TestServeIMMessageForwardKafkaPublishUnknownReturnsPending(t *testing.T) {
|
||||
t.Fatalf("unexpected forward response: %#v", data)
|
||||
}
|
||||
got := items[0].(map[string]any)
|
||||
if got["status"] != "pending" || got["reason"] != "MESSAGE_PERSIST_PENDING" || got["seq"].(float64) != 41 {
|
||||
t.Fatalf("unexpected pending item: %#v", got)
|
||||
if got["status"] != "uncertain" || got["reason"] != "MESSAGE_PERSIST_RESULT_UNKNOWN" ||
|
||||
got["safe_to_retry"] != false || got["seq"].(float64) != 41 {
|
||||
t.Fatalf("unexpected uncertain item: %#v", got)
|
||||
}
|
||||
if got["client_mid"] != "fwd_"+stableIMEventID("forward", "idem-forward-1", "separate", targetTopic, "grpSource", int64(14)) {
|
||||
t.Fatalf("unexpected stable client mid: %#v", got)
|
||||
@@ -6875,7 +6879,7 @@ func TestServeIMMessageForwardKafkaPublishUnknownReturnsPending(t *testing.T) {
|
||||
}
|
||||
select {
|
||||
case delivered := <-globals.hub.routeSrv:
|
||||
t.Fatalf("pending forward should not broadcast immediately: %#v", delivered)
|
||||
t.Fatalf("uncertain forward should not broadcast immediately: %#v", delivered)
|
||||
default:
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user