Skip to content

Commit ef33723

Browse files
jakub-grzesiowskijakub-grzesiowski
committed
implemented channel creation + associated required memberships logic
1 parent 12c19b5 commit ef33723

18 files changed

+603
-148
lines changed

‎c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChannelTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,17 @@ public async Task TestLeaveChannel()
9696

9797
await Task.Delay(3000);
9898

99-
var memberships = await channel.GetMemberships();
99+
var memberships = await channel.OLD_GetMemberships();
100100

101-
Assert.True(memberships.Memberships.Any(x => x.UserId == currentChatUser.Id), "Join failed, current user not found in channel memberships");
101+
Assert.True(memberships.Memberships.Any(x => x.OLD_UserId == currentChatUser.Id), "Join failed, current user not found in channel memberships");
102102

103103
channel.Leave();
104104

105105
await Task.Delay(3000);
106106

107-
memberships = await channel.GetMemberships();
107+
memberships = await channel.OLD_GetMemberships();
108108

109-
Assert.False(memberships.Memberships.Any(x => x.UserId == currentChatUser.Id), "Leave failed, current user found in channel memberships");
109+
Assert.False(memberships.Memberships.Any(x => x.OLD_UserId == currentChatUser.Id), "Leave failed, current user found in channel memberships");
110110
}
111111

112112
[Test]
@@ -118,7 +118,7 @@ public async Task TestGetUserSuggestions()
118118
await Task.Delay(5000);
119119

120120
var suggestions = await channel.GetUserSuggestions("@Test");
121-
Assert.True(suggestions.Any(x => x.UserId == user.Id));
121+
Assert.True(suggestions.Any(x => x.OLD_UserId == user.Id));
122122
}
123123

124124
[Test]
@@ -127,7 +127,7 @@ public async Task TestGetMemberships()
127127
var channel = await chat.OLD_CreatePublicConversation("get_members_test_channel");
128128
channel.Join();
129129
await Task.Delay(3500);
130-
var memberships = await channel.GetMemberships();
130+
var memberships = await channel.OLD_GetMemberships();
131131
Assert.That(memberships.Memberships.Count, Is.GreaterThanOrEqualTo(1));
132132
}
133133

‎c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChatTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public async Task TestGetCurrentUser()
6565
[Test]
6666
public async Task TestGetEventHistory()
6767
{
68-
await chat.EmitEvent(PubnubChatEventType.Custom, channel.Id, "{\"test\":\"some_nonsense\"}");
68+
await chat.OLD_EmitEvent(PubnubChatEventType.Custom, channel.Id, "{\"test\":\"some_nonsense\"}");
6969

7070
await Task.Delay(5000);
7171

@@ -95,9 +95,9 @@ public async Task TestCreateDirectConversation()
9595
var directConversation =
9696
await chat.OLD_CreateDirectConversation(convoUser, "direct_conversation_test");
9797
Assert.True(directConversation.CreatedChannel is { Id: "direct_conversation_test" });
98-
Assert.True(directConversation.HostMembership != null && directConversation.HostMembership.UserId == currentUser.Id);
98+
Assert.True(directConversation.HostMembership != null && directConversation.HostMembership.OLD_UserId == currentUser.Id);
9999
Assert.True(directConversation.InviteesMemberships != null &&
100-
directConversation.InviteesMemberships.First().UserId == convoUser.Id);
100+
directConversation.InviteesMemberships.First().OLD_UserId == convoUser.Id);
101101
}
102102

103103
[Test]
@@ -109,10 +109,10 @@ public async Task TestCreateGroupConversation()
109109
var groupConversation = await
110110
chat.OLD_CreateGroupConversation([convoUser1, convoUser2, convoUser3], "group_conversation_test");
111111
Assert.True(groupConversation.CreatedChannel is { Id: "group_conversation_test" });
112-
Assert.True(groupConversation.HostMembership != null && groupConversation.HostMembership.UserId == currentUser.Id);
112+
Assert.True(groupConversation.HostMembership != null && groupConversation.HostMembership.OLD_UserId == currentUser.Id);
113113
Assert.True(groupConversation.InviteesMemberships is { Count: 3 });
114114
Assert.True(groupConversation.InviteesMemberships.Any(x =>
115-
x.UserId == convoUser1.Id && x.ChannelId == "group_conversation_test"));
115+
x.OLD_UserId == convoUser1.Id && x.OLD_ChannelId == "group_conversation_test"));
116116
}
117117

118118
[Test]
@@ -148,7 +148,7 @@ public async Task TestEmitEvent()
148148
};
149149
channel.SetListeningForCustomEvents(true);
150150
await Task.Delay(2500);
151-
await chat.EmitEvent(PubnubChatEventType.Custom, channel.Id, "{\"test\":\"some_nonsense\"}");
151+
await chat.OLD_EmitEvent(PubnubChatEventType.Custom, channel.Id, "{\"test\":\"some_nonsense\"}");
152152

153153
var eventReceived = reportManualEvent.WaitOne(8000);
154154
Assert.True(eventReceived);

‎c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/MembershipTests.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public async Task CleanUp()
4242
public async Task TestGetMemberships()
4343
{
4444
var memberships = await user.GetMemberships();
45-
Assert.True(memberships.Memberships.Any(x => x.ChannelId == channel.Id && x.UserId == user.Id));
45+
Assert.True(memberships.Memberships.Any(x => x.OLD_ChannelId == channel.Id && x.OLD_UserId == user.Id));
4646
}
4747

4848
[Test]
@@ -58,22 +58,22 @@ public async Task TestUpdateMemberships()
5858

5959
var updateData = new ChatMembershipData()
6060
{
61-
CustomDataJson = "{\"key\":\"" + Guid.NewGuid() + "\"}"
61+
OLD_CustomDataJson = "{\"key\":\"" + Guid.NewGuid() + "\"}"
6262
};
6363

6464
var manualUpdatedEvent = new ManualResetEvent(false);
6565
testMembership.OnMembershipUpdated += membership =>
6666
{
6767
Assert.True(membership.Id == testMembership.Id);
68-
var updatedData = membership.MembershipData.CustomDataJson;
69-
Assert.True(updatedData == updateData.CustomDataJson, $"{updatedData} != {updateData.CustomDataJson}");
68+
var updatedData = membership.OLD_MembershipData.OLD_CustomDataJson;
69+
Assert.True(updatedData == updateData.OLD_CustomDataJson, $"{updatedData} != {updateData.OLD_CustomDataJson}");
7070
manualUpdatedEvent.Set();
7171
};
7272
testMembership.SetListeningForUpdates(true);
7373

7474
await Task.Delay(4000);
7575

76-
await testMembership.Update(updateData);
76+
await testMembership.OLD_Update(updateData);
7777
var updated = manualUpdatedEvent.WaitOne(8000);
7878
Assert.IsTrue(updated);
7979
}
@@ -83,8 +83,8 @@ public async Task TestInvite()
8383
{
8484
var testChannel = (await chat.OLD_CreateGroupConversation([user], "test_invite_group_channel")).CreatedChannel;
8585
var testUser = await chat.GetOrCreateUser("test_invite_user");
86-
var returnedMembership = await testChannel.Invite(testUser);
87-
Assert.True(returnedMembership.ChannelId == testChannel.Id && returnedMembership.UserId == testUser.Id);
86+
var returnedMembership = await testChannel.OLD_Invite(testUser);
87+
Assert.True(returnedMembership.OLD_ChannelId == testChannel.Id && returnedMembership.OLD_UserId == testUser.Id);
8888
}
8989

9090
[Test]
@@ -94,14 +94,14 @@ public async Task TestInviteMultiple()
9494
.CreatedChannel;
9595
var secondUser = await chat.GetOrCreateUser("second_invite_user");
9696
var thirdUser = await chat.GetOrCreateUser("third_invite_user");
97-
var returnedMemberships = await testChannel.InviteMultiple([
97+
var returnedMemberships = await testChannel.OLD_InviteMultiple([
9898
secondUser,
9999
thirdUser
100100
]);
101101
Assert.True(
102102
returnedMemberships.Count == 2 &&
103-
returnedMemberships.Any(x => x.UserId == secondUser.Id && x.ChannelId == testChannel.Id) &&
104-
returnedMemberships.Any(x => x.UserId == thirdUser.Id && x.ChannelId == testChannel.Id));
103+
returnedMemberships.Any(x => x.OLD_UserId == secondUser.Id && x.OLD_ChannelId == testChannel.Id) &&
104+
returnedMemberships.Any(x => x.OLD_UserId == thirdUser.Id && x.OLD_ChannelId == testChannel.Id));
105105
}
106106

107107
[Test]
@@ -113,7 +113,7 @@ public async Task TestLastRead()
113113
await Task.Delay(4000);
114114

115115
var membership = (await user.GetMemberships(limit: 20)).Memberships
116-
.FirstOrDefault(x => x.ChannelId == testChannel.Id);
116+
.FirstOrDefault(x => x.OLD_ChannelId == testChannel.Id);
117117
if (membership == null)
118118
{
119119
Assert.Fail();
@@ -128,13 +128,13 @@ public async Task TestLastRead()
128128

129129
await Task.Delay(7000);
130130

131-
var lastTimeToken = membership.GetLastReadMessageTimeToken();
131+
var lastTimeToken = membership.OLD_GetLastReadMessageTimeToken();
132132
Assert.True(lastTimeToken == message.TimeToken);
133-
await membership.SetLastReadMessageTimeToken("99999999999999999");
133+
await membership.OLD_SetLastReadMessageTimeToken("99999999999999999");
134134

135135
await Task.Delay(3000);
136136

137-
Assert.True(membership.GetLastReadMessageTimeToken() == "99999999999999999");
137+
Assert.True(membership.OLD_GetLastReadMessageTimeToken() == "99999999999999999");
138138
messageReceivedManual.Set();
139139
};
140140
await testChannel.SendText("some_message");
@@ -157,8 +157,8 @@ public async Task TestUnreadMessagesCount()
157157

158158
await Task.Delay(8000);
159159

160-
var membership = (await unreadChannel.GetMemberships())
161-
.Memberships.FirstOrDefault(x => x.UserId == user.Id);
160+
var membership = (await unreadChannel.OLD_GetMemberships())
161+
.Memberships.FirstOrDefault(x => x.OLD_UserId == user.Id);
162162
var unreadCount = membership == null ? -1 : await membership.GetUnreadMessagesCount();
163163
Assert.True(unreadCount >= 3, $"Expected >=3 unread but got: {unreadCount}");
164164
}
@@ -170,7 +170,7 @@ public async Task TestUnreadCountAfterFetchHistory()
170170
{
171171
await channel.SendText("some_text");
172172
var membership = (await user.GetMemberships())
173-
.Memberships.FirstOrDefault(x => x.ChannelId == channel.Id);
173+
.Memberships.FirstOrDefault(x => x.OLD_ChannelId == channel.Id);
174174
if (membership == null)
175175
{
176176
Assert.Fail("Couldn't find membership");

‎c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/UserTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public async Task TestUserUpdate()
8080
await testUser.OLD_Update(new ChatUserData()
8181
{
8282
Username = newRandomUserName,
83-
CustomDataJson = "{\"some_key\":\"some_value\"}",
83+
OLD_CustomDataJson = "{\"some_key\":\"some_value\"}",
8484
Email = "[email protected]",
8585
ExternalId = "xxx_some_guy_420_xxx",
8686
ProfileUrl = "www.some.guy",

0 commit comments

Comments
 (0)