Merge remote-tracking branch 'origin/master' into v10.0.0

# Conflicts:
#	packages/stream_chat_persistence/CHANGELOG.md
#	packages/stream_chat_persistence/lib/src/db/drift_chat_database.dart

Author: xsahil03x

packages/stream_chat/CHANGELOG.md

@@ -11,6 +11,10 @@
 
 ## Upcoming
 
+✅ Added
+
+- Added `avgResponseTime` field to the `User` model to track average response time in seconds.
+
 🐞 Fixed
 
 - Fixed `WebSocket` race condition where reconnection could access null user during disconnect.

packages/stream_chat/lib/src/core/models/own_user.dart

@@ -32,6 +32,7 @@ class OwnUser extends User {
     super.teams,
     super.language,
     super.teamsRole,
+    super.avgResponseTime,
   });
 
   /// Create a new instance from json.
@@ -55,6 +56,7 @@ class OwnUser extends User {
         teams: user.teams,
         language: user.language,
         teamsRole: user.teamsRole,
+        avgResponseTime: user.avgResponseTime,
       );
 
   /// Creates a copy of [OwnUser] with specified attributes overridden.
@@ -81,6 +83,7 @@ class OwnUser extends User {
     int? unreadThreads,
     String? language,
     Map<String, String>? teamsRole,
+    int? avgResponseTime,
   }) =>
       OwnUser(
         id: id ?? this.id,
@@ -107,6 +110,7 @@ class OwnUser extends User {
         blockedUserIds: blockedUserIds ?? this.blockedUserIds,
         language: language ?? this.language,
         teamsRole: teamsRole ?? this.teamsRole,
+        avgResponseTime: avgResponseTime ?? this.avgResponseTime,
       );
 
   /// Returns a new [OwnUser] that is a combination of this ownUser
@@ -135,6 +139,7 @@ class OwnUser extends User {
       updatedAt: other.updatedAt,
       language: other.language,
       teamsRole: other.teamsRole,
+      avgResponseTime: other.avgResponseTime,
     );
   }
 

packages/stream_chat/lib/src/core/models/own_user.g.dart

@@ -47,6 +47,7 @@ class User extends Equatable implements ComparableFieldProvider {
     this.teams = const [],
     this.language,
     this.teamsRole,
+    this.avgResponseTime,
   }) :
         // For backwards compatibility, set 'name', 'image' in [extraData].
         extraData = {
@@ -74,6 +75,7 @@ class User extends Equatable implements ComparableFieldProvider {
     'teams',
     'language',
     'teams_role',
+    'avg_response_time',
   ];
 
   /// User id.
@@ -143,6 +145,10 @@ class User extends Equatable implements ComparableFieldProvider {
   @JsonKey(includeIfNull: false)
   final Map< /*Team*/ String, /*Role*/ String>? teamsRole;
 
+  /// The average response time of the user in seconds.
+  @JsonKey(includeToJson: false)
+  final int? avgResponseTime;
+
   /// Map of custom user extraData.
   final Map<String, Object?> extraData;
 
@@ -171,6 +177,7 @@ class User extends Equatable implements ComparableFieldProvider {
     List<String>? teams,
     String? language,
     Map<String, String>? teamsRole,
+    int? avgResponseTime,
   }) =>
       User(
         id: id ?? this.id,
@@ -190,6 +197,7 @@ class User extends Equatable implements ComparableFieldProvider {
         teams: teams ?? this.teams,
         language: language ?? this.language,
         teamsRole: teamsRole ?? this.teamsRole,
+        avgResponseTime: avgResponseTime ?? this.avgResponseTime,
       );
 
   @override
@@ -204,6 +212,7 @@ class User extends Equatable implements ComparableFieldProvider {
         teams,
         language,
         teamsRole,
+        avgResponseTime,
       ];
 
   @override

packages/stream_chat/lib/src/core/models/user.dart

@@ -13,5 +13,7 @@
   "created_at": "2021-08-03 12:39:21.817646",
   "updated_at": "2021-08-04 12:39:21.817646",
   "last_active" : "2021-08-05 12:39:21.817646",
-  "language": "en"
+  "language": "en",
+  "teams_role": {"team-1": "admin", "team-2": "member"},
+  "avg_response_time": 120
 }

packages/stream_chat/lib/src/core/models/user.g.dart

@@ -18,6 +18,8 @@ void main() {
   const online = true;
   const banned = true;
   const teams = ['team-1', 'team-2'];
+  const teamsRole = {'team-1': 'admin', 'team-2': 'member'};
+  const avgResponseTime = 120;
   const createdAtString = '2021-08-03 12:39:21.817646';
   const updatedAtString = '2021-08-04 12:39:21.817646';
   const lastActiveString = '2021-08-05 12:39:21.817646';
@@ -41,6 +43,8 @@ void main() {
       expect(user.updatedAt, DateTime.parse(updatedAtString));
       expect(user.lastActive, DateTime.parse(lastActiveString));
       expect(user.language, 'en');
+      expect(user.teamsRole, teamsRole);
+      expect(user.avgResponseTime, avgResponseTime);
     });
 
     test('should serialize to json correctly', () {
@@ -62,6 +66,8 @@ void main() {
         online: banned,
         teams: const ['team-1', 'team-2'],
         language: 'fr',
+        teamsRole: teamsRole,
+        avgResponseTime: avgResponseTime,
       );
 
       expect(user.toJson(), {
@@ -73,6 +79,7 @@ void main() {
         'extraDataDoubleTest': extraDataDoubleTest,
         'extraDataBoolTest': extraDataBoolTest,
         'language': 'fr',
+        'teams_role': teamsRole,
       });
     });
 
@@ -91,6 +98,8 @@ void main() {
       expect(newUser.updatedAt, user.updatedAt);
       expect(newUser.lastActive, user.lastActive);
       expect(newUser.language, user.language);
+      expect(newUser.teamsRole, user.teamsRole);
+      expect(newUser.avgResponseTime, user.avgResponseTime);
 
       newUser = user.copyWith(
         id: 'test',
@@ -104,6 +113,8 @@ void main() {
         updatedAt: DateTime.parse('2021-05-04 12:39:21.817646'),
         lastActive: DateTime.parse('2021-05-06 12:39:21.817646'),
         language: 'it',
+        teamsRole: {'new-team1': 'admin', 'new-team2': 'member'},
+        avgResponseTime: 60,
       );
 
       expect(newUser.id, 'test');
@@ -118,6 +129,8 @@ void main() {
       expect(newUser.updatedAt, DateTime.parse('2021-05-04 12:39:21.817646'));
       expect(newUser.lastActive, DateTime.parse('2021-05-06 12:39:21.817646'));
       expect(newUser.language, 'it');
+      expect(newUser.teamsRole, {'new-team1': 'admin', 'new-team2': 'member'});
+      expect(newUser.avgResponseTime, 60);
     });
 
     test('name property and extraData manipulation', () {
@@ -202,6 +215,8 @@ void main() {
       expect(user.lastActive, null);
       expect(user.createdAt, null);
       expect(user.updatedAt, null);
+      expect(user.teamsRole, null);
+      expect(user.avgResponseTime, null);
     });
 
     test('default values, parse json', () {
@@ -218,6 +233,8 @@ void main() {
       expect(user.lastActive, null);
       expect(user.createdAt, null);
       expect(user.updatedAt, null);
+      expect(user.teamsRole, null);
+      expect(user.avgResponseTime, null);
     });
 
     group('ComparableFieldProvider', () {
@@ -449,6 +466,8 @@ User createTestUser({
   bool? banned,
   DateTime? lastActive,
   Map<String, Object?>? extraData,
+  Map<String, String>? teamsRole,
+  int? avgResponseTime,
 }) {
   return User(
     id: id,
@@ -457,5 +476,7 @@ User createTestUser({
     banned: banned ?? false,
     lastActive: lastActive,
     extraData: extraData ?? {},
+    teamsRole: teamsRole,
+    avgResponseTime: avgResponseTime,
   );
 }

packages/stream_chat/test/fixtures/user.json

@@ -9,6 +9,8 @@
 
 - Fixed `MessageListCore.dispose()` crash when channel reload fails due to insufficient permissions.
 - Fixed incorrect parent message comparison in `MessageListCore.didUpdateWidget()`.
+- Ensure `StreamChannel` future builder completes after channel
+  initialization. [[#2323]](https://github.com/GetStream/stream-chat-flutter/issues/2323)
 
 ## 10.0.0-beta.3
 

packages/stream_chat/test/src/core/models/user_test.dart

@@ -81,14 +81,24 @@ class StreamChannel extends StatefulWidget {
     StackTrace? stackTrace,
   ) {
     final backgroundColor = _getDefaultBackgroundColor(context);
+
+    Object? unwrapParallelError(Object error) {
+      if (error case ParallelWaitError(:final List<AsyncError?> errors)) {
+        return errors.firstWhereOrNull((it) => it != null)?.error;
+      }
+
+      return error;
+    }
+
+    final exception = unwrapParallelError(error);
     return Material(
       color: backgroundColor,
       child: Center(
-        child: switch (error) {
+        child: switch (exception) {
           DioException(type: DioExceptionType.badResponse) =>
-            Text(error.message ?? 'Bad response'),
+            Text(exception.message ?? 'Bad response'),
           DioException() => const Text('Check your connection and retry'),
-          _ => Text(error.toString()),
+          _ => Text(exception.toString()),
         },
       ),
     );
@@ -728,12 +738,12 @@ class StreamChannelState extends State<StreamChannel> {
     if (channel.state?.isUpToDate == false) return loadChannelAtMessage(null);
   }
 
-  late Future<void> _channelInitFuture;
+  late Future<List<void>> _channelInitFuture;
 
   @override
   void initState() {
     super.initState();
-    _channelInitFuture = _maybeInitChannel();
+    _channelInitFuture = [_maybeInitChannel(), channel.initialized].wait;
   }
 
   @override
@@ -742,7 +752,7 @@ class StreamChannelState extends State<StreamChannel> {
     if (oldWidget.channel.cid != widget.channel.cid ||
         oldWidget.initialMessageId != widget.initialMessageId) {
       // Re-initialize channel if the channel CID or initial message ID changes.
-      _channelInitFuture = _maybeInitChannel();
+      _channelInitFuture = [_maybeInitChannel(), channel.initialized].wait;
     }
   }
 

packages/stream_chat_flutter_core/CHANGELOG.md

@@ -92,7 +92,6 @@ void main() {
       );
 
       final mockChannel = MockChannel();
-      when(() => mockChannel.initialized).thenAnswer((_) => Future.value(true));
       when(() => mockChannel.state.unreadCount).thenReturn(0);
       when(() => mockChannel.state.isUpToDate).thenReturn(true);
       when(() => mockChannel.state.messagesStream)
@@ -135,7 +134,6 @@ void main() {
       when(() => mockChannel.state.messagesStream)
           .thenAnswer((_) => Stream.value([]));
       when(() => mockChannel.state.messages).thenReturn([]);
-      when(() => mockChannel.initialized).thenAnswer((_) => Future.value(true));
 
       await tester.pumpWidget(
         StreamChannel(
@@ -178,7 +176,6 @@ void main() {
       when(() => mockChannel.state.messagesStream)
           .thenAnswer((_) => Stream.value(messages));
       when(() => mockChannel.state.messages).thenReturn(messages);
-      when(() => mockChannel.initialized).thenAnswer((_) => Future.value(true));
 
       await tester.pumpWidget(
         StreamChannel(
@@ -224,7 +221,6 @@ void main() {
       final mockChannel = MockChannel();
 
       when(() => mockChannel.state.isUpToDate).thenReturn(true);
-      when(() => mockChannel.initialized).thenAnswer((_) async => true);
 
       const error = 'Error! Error! Error!';
       when(() => mockChannel.state.messagesStream)
@@ -266,7 +262,6 @@ void main() {
       final mockChannel = MockChannel();
 
       when(() => mockChannel.state.isUpToDate).thenReturn(true);
-      when(() => mockChannel.initialized).thenAnswer((_) async => true);
 
       const messages = <Message>[];
       when(() => mockChannel.state.messagesStream)
@@ -307,7 +302,6 @@ void main() {
       final mockChannel = MockChannel();
 
       when(() => mockChannel.state.isUpToDate).thenReturn(false);
-      when(() => mockChannel.initialized).thenAnswer((_) async => true);
       when(() => mockChannel.query(
             state: any(named: 'state'),
             watch: any(named: 'watch'),
@@ -362,7 +356,6 @@ void main() {
       final mockChannel = MockChannel();
 
       when(() => mockChannel.state.isUpToDate).thenReturn(true);
-      when(() => mockChannel.initialized).thenAnswer((_) async => true);
 
       final messages = _generateMessages();
       when(() => mockChannel.state.messagesStream)
@@ -411,7 +404,6 @@ void main() {
       final mockChannel = MockChannel();
 
       when(() => mockChannel.state.isUpToDate).thenReturn(true);
-      when(() => mockChannel.initialized).thenAnswer((_) async => true);
 
       final threads = {parentMessage.id: messages};