Merge pull request #96 from sendbird/v4.2.3

Add 4.2.3.

Author: sf-tyler-jeong

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v4.2.3 (Mar 4, 2024)
+
+### Improvements
+- Fixed the bug where `query` in `GroupChannelCollection` does not work when reconnected
+
 ## v4.2.2 (Fed 15, 2024)
 
 ### Improvements

README.md

@@ -48,7 +48,7 @@ Before installing Sendbird Chat SDK, you need to create a Sendbird application o
 
 ```yaml
 dependencies:
-  sendbird_chat_sdk: ^4.2.2
+  sendbird_chat_sdk: ^4.2.3
 ```
 
 - Run `flutter pub get` command in your project directory.

lib/src/internal/db/db.dart

@@ -247,6 +247,11 @@ class DB {
     return await CGroupChannel.getChannels(_chat, _isar, query, offset);
   }
 
+  Future<bool> canAddChannel(
+      GroupChannelListQuery query, String channelUrl) async {
+    return await CGroupChannel.canAddChannel(_chat, _isar, query, channelUrl);
+  }
+
   Future<void> deleteGroupChannel(String channelUrl) async {
     await CGroupChannel.delete(_chat, _isar, channelUrl);
   }

lib/src/internal/db/schema/channel/c_group_channel.dart

@@ -211,22 +211,61 @@ class CGroupChannel extends CBaseChannel {
     return await cGroupChannel?.toGroupChannel(chat, isar);
   }
 
+  static Future<bool> canAddChannel(
+    Chat chat,
+    Isar isar,
+    GroupChannelListQuery query,
+    String channelUrl,
+  ) async {
+    final groupChannels = await _getChannels(
+      chat: chat,
+      isar: isar,
+      query: query,
+      channelUrl: channelUrl,
+    );
+    return groupChannels.isNotEmpty;
+  }
+
   static Future<List<GroupChannel>> getChannels(
     Chat chat,
     Isar isar,
     GroupChannelListQuery query,
     int? offset,
   ) async {
+    return _getChannels(
+      chat: chat,
+      isar: isar,
+      query: query,
+      offset: offset,
+    );
+  }
+
+  static Future<List<GroupChannel>> _getChannels({
+    required Chat chat,
+    required Isar isar,
+    required GroupChannelListQuery query,
+    int? offset,
+    String? channelUrl,
+  }) async {
     // [includeMetaData]
     // When calling API, this value have to be `true` to make chunk.
     // But we must always call API for GroupChannel, because we must always get `hasNext` value from API.
     // So we do not need the chunk for GroupChannel.
 
-    final cGroupChannels = await isar.cGroupChannels
-        .where()
-        .channelTypeEqualToAnyChannelUrl(ChannelType.group) // Check
-        .filter()
+    QueryBuilder<CGroupChannel, CGroupChannel, QFilterCondition> queryBuilder;
+    if (channelUrl != null && channelUrl.isNotEmpty) {
+      queryBuilder = isar.cGroupChannels
+          .where()
+          .channelTypeChannelUrlEqualTo(ChannelType.group, channelUrl)
+          .filter();
+    } else {
+      queryBuilder = isar.cGroupChannels
+          .where()
+          .channelTypeEqualToAnyChannelUrl(ChannelType.group) // Check
+          .filter();
+    }
 
+    final cGroupChannels = await queryBuilder
         // channelUrlsFilter
         .optional(query.channelUrlsFilter.isNotEmpty, (q) {
           return q.group((groupQ) {

lib/src/internal/main/chat/chat.dart

@@ -60,7 +60,7 @@ part 'chat_notifications.dart';
 part 'chat_push.dart';
 part 'chat_user.dart';
 
-const sdkVersion = '4.2.2';
+const sdkVersion = '4.2.3';
 
 // Internal implementation for main class. Do not directly access this class.
 class Chat with WidgetsBindingObserver {

lib/src/internal/main/chat_manager/collection_manager/group_channel_collection_manager.dart

@@ -179,7 +179,7 @@ extension GroupChannelCollectionManager on CollectionManager {
         }
 
         if (!isChannelExists) {
-          if (channelCollection.canAddChannel(eventSource, addedChannel)) {
+          if (await channelCollection.canAddChannel(eventSource, addedChannel)) {
             addedChannelsForEvent.add(addedChannel);
           }
         }
@@ -202,7 +202,7 @@ extension GroupChannelCollectionManager on CollectionManager {
             // Need to compare channel properties with updatedChannel
             // when eventSource is CollectionEventSource.channelChangeLogs (?)
 
-            if (channelCollection.canAddChannel(eventSource, updatedChannel,
+            if (await channelCollection.canAddChannel(eventSource, updatedChannel,
                 checkToUpdateChannel: true)) {
               channelCollection.channelList[index] = updatedChannel;
               updatedChannelsForEvent.add(updatedChannel);
@@ -218,7 +218,7 @@ extension GroupChannelCollectionManager on CollectionManager {
 
         if (eventSource == CollectionEventSource.channelChangeLogs &&
             !isUpdatedChannelInChannelList) {
-          if (channelCollection.canAddChannel(eventSource, updatedChannel)) {
+          if (await channelCollection.canAddChannel(eventSource, updatedChannel)) {
             addedChannelsForEvent.add(updatedChannel);
           }
         }

lib/src/internal/main/chat_manager/db_manager.dart

@@ -256,6 +256,16 @@ class DBManager {
     return [];
   }
 
+  Future<bool> canAddChannel({
+    required GroupChannelListQuery query,
+    required String channelUrl,
+  }) async {
+    if (isEnabled()) {
+      return await _db.canAddChannel(query, channelUrl);
+    }
+    return true;
+  }
+
   Future<GroupChannel?> getGroupChannel(String channelUrl) async {
     if (isEnabled()) {
       return await _db.getGroupChannel(channelUrl);

lib/src/public/main/collection/group_channel_collection/group_channel_collection.dart

@@ -234,11 +234,11 @@ class GroupChannelCollection {
     }
   }
 
-  bool canAddChannel(
+  Future<bool> canAddChannel(
     CollectionEventSource eventSource,
     GroupChannel addedChannel, {
     bool checkToUpdateChannel = false,
-  }) {
+  }) async {
     if (eventSource == CollectionEventSource.channelCacheLoadMore ||
         eventSource == CollectionEventSource.channelLoadMore) {
       return true;
@@ -297,6 +297,14 @@ class GroupChannelCollection {
       }
     }
 
+    if (eventSource == CollectionEventSource.channelChangeLogs) {
+      if (await _chat.dbManager.canAddChannel(
+              query: _query, channelUrl: addedChannel.channelUrl) ==
+          false) {
+        return false;
+      }
+    }
+
     return true;
   }
 }

lib/src/public/main/query/channel/open_channel_list_query.dart

@@ -47,26 +47,31 @@ class OpenChannelListQuery extends BaseQuery {
       if (includeMetaData) ChannelListQueryIncludeOption.includeMetadata
     ];
 
-    final res =
-        await chat.apiClient.send<ChannelListQueryResponse<OpenChannel>>(
-      OpenChannelListRequest(
-        chat,
-        limit: limit,
-        nameKeyword: nameKeyword,
-        urlKeyword: urlKeyword,
-        customType: customTypeFilter,
-        token: token,
-        options: options,
-      ),
-    );
+    ChannelListQueryResponse<OpenChannel> res;
+    try {
+      res = await chat.apiClient.send<ChannelListQueryResponse<OpenChannel>>(
+        OpenChannelListRequest(
+          chat,
+          limit: limit,
+          nameKeyword: nameKeyword,
+          urlKeyword: urlKeyword,
+          customType: customTypeFilter,
+          token: token,
+          options: options,
+        ),
+      );
 
-    for (final element in res.channels) {
-      element.set(chat);
+      token = res.next;
+      hasNext = res.next != '';
+      for (final element in res.channels) {
+        element.set(chat);
+      }
+    } catch (_) {
+      isLoading = false;
+      rethrow;
     }
 
     isLoading = false;
-    token = res.next;
-    hasNext = res.next != '';
     return res.channels;
   }
 }

lib/src/public/main/query/channel/public_group_channel_list_query.dart

@@ -130,26 +130,31 @@ class PublicGroupChannelListQuery extends BaseQuery {
       ..createdBefore = GroupChannelFilter.toSec(createdBefore)
       ..createdAfter = GroupChannelFilter.toSec(createdAfter);
 
-    final res =
-        await chat.apiClient.send<ChannelListQueryResponse<GroupChannel>>(
-      PublicGroupChannelListRequest(
-        chat,
-        limit: limit,
-        order: order,
-        token: token,
-        channelUrls: channelUrlsFilter,
-        options: options,
-        filter: filter,
-      ),
-    );
-
-    for (final element in res.channels) {
-      element.set(chat);
+    ChannelListQueryResponse<GroupChannel> res;
+    try {
+      res = await chat.apiClient.send<ChannelListQueryResponse<GroupChannel>>(
+        PublicGroupChannelListRequest(
+          chat,
+          limit: limit,
+          order: order,
+          token: token,
+          channelUrls: channelUrlsFilter,
+          options: options,
+          filter: filter,
+        ),
+      );
+
+      token = res.next;
+      hasNext = res.next != '';
+      for (final element in res.channels) {
+        element.set(chat);
+      }
+    } catch (_) {
+      isLoading = false;
+      rethrow;
     }
 
     isLoading = false;
-    token = res.next;
-    hasNext = res.next != '';
     return res.channels;
   }
 }