major refactoring

Signed-off-by: Sahil Kumar <[email protected]>

packages/stream_chat/test/src/api/channel_test.dart

@@ -3,13 +3,13 @@ import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:dio/native_imp.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:stream_chat/src/api/requests.dart';
+import 'package:stream_chat/src/core/api/requests.dart';
 import 'package:stream_chat/src/client.dart';
 import 'package:stream_chat/src/event_type.dart';
-import 'package:stream_chat/src/models/event.dart';
-import 'package:stream_chat/src/models/message.dart';
-import 'package:stream_chat/src/models/own_user.dart';
-import 'package:stream_chat/src/models/reaction.dart';
+import 'package:stream_chat/src/core/models/event.dart';
+import 'package:stream_chat/src/core/models/message.dart';
+import 'package:stream_chat/src/core/models/own_user.dart';
+import 'package:stream_chat/src/core/models/reaction.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:test/test.dart';
 

packages/stream_chat/test/src/api/responses_test.dart

@@ -1,12 +1,12 @@
 import 'dart:convert';
 
 import 'package:test/test.dart';
-import 'package:stream_chat/src/api/responses.dart';
-import 'package:stream_chat/src/models/device.dart';
-import 'package:stream_chat/src/models/member.dart';
-import 'package:stream_chat/src/models/message.dart';
-import 'package:stream_chat/src/models/reaction.dart';
-import 'package:stream_chat/src/models/read.dart';
+import 'package:stream_chat/src/core/api/responses.dart';
+import 'package:stream_chat/src/core/models/device.dart';
+import 'package:stream_chat/src/core/models/member.dart';
+import 'package:stream_chat/src/core/models/message.dart';
+import 'package:stream_chat/src/core/models/reaction.dart';
+import 'package:stream_chat/src/core/models/read.dart';
 import 'package:stream_chat/stream_chat.dart';
 
 void main() {

packages/stream_chat/test/src/api/web_socket_stub_test.dart

@@ -4,7 +4,7 @@ import 'package:stream_chat/src/api/web_socket_channel_stub.dart';
 void main() {
   test('src/api/web_socket_stub_test', () {
     expect(
-      () => connectWebSocket('fakeurl'),
+      () => openConnection('fakeurl'),
       throwsA(isA<UnimplementedError>()),
     );
   });

packages/stream_chat/test/src/api/websocket_test.dart

@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:logging/logging.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:stream_chat/src/api/connection_status.dart';
-import 'package:stream_chat/src/api/websocket.dart';
-import 'package:stream_chat/src/models/event.dart';
-import 'package:stream_chat/src/models/user.dart';
+import 'package:stream_chat/src/ws/connection_status.dart';
+import 'package:stream_chat/src/ws/websocket.dart';
+import 'package:stream_chat/src/core/models/event.dart';
+import 'package:stream_chat/src/core/models/user.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:test/test.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
@@ -39,7 +39,7 @@ void main() {
       final ws = WebSocket(
         baseUrl: 'baseurl',
         user: User(id: 'testid'),
-        logger: Logger('ws'),
+        _logger: Logger('ws'),
         connectParams: {'test': 'true'},
         connectPayload: {'payload': 'test'},
         handler: print,
@@ -77,7 +77,7 @@ void main() {
     final ws = WebSocket(
       baseUrl: 'baseurl',
       user: User(id: 'testid'),
-      logger: Logger('ws'),
+      _logger: Logger('ws'),
       connectParams: {'test': 'true'},
       connectPayload: {'payload': 'test'},
       handler: handleFunc,
@@ -113,7 +113,7 @@ void main() {
     final ws = WebSocket(
       baseUrl: 'baseurl',
       user: User(id: 'testid'),
-      logger: Logger('ws'),
+      _logger: Logger('ws'),
       connectParams: {'test': 'true'},
       connectPayload: {'payload': 'test'},
       handler: handleFunc,
@@ -153,7 +153,7 @@ void main() {
     final ws = WebSocket(
       baseUrl: 'baseurl',
       user: User(id: 'testid'),
-      logger: Logger('ws'),
+      _logger: Logger('ws'),
       connectParams: {'test': 'true'},
       connectPayload: {'payload': 'test'},
       handler: handleFunc,
@@ -189,7 +189,7 @@ void main() {
     final ws = WebSocket(
       baseUrl: 'baseurl',
       user: User(id: 'testid'),
-      logger: Logger('ws'),
+      _logger: Logger('ws'),
       connectParams: {'test': 'true'},
       connectPayload: {'payload': 'test'},
       handler: handleFunc,
@@ -235,7 +235,7 @@ void main() {
     final ws = WebSocket(
       baseUrl: 'baseurl',
       user: User(id: 'testid'),
-      logger: Logger('ws'),
+      _logger: Logger('ws'),
       connectParams: {'test': 'true'},
       connectPayload: {'payload': 'test'},
       handler: handleFunc,
@@ -280,7 +280,7 @@ void main() {
     final ws = WebSocket(
       baseUrl: 'baseurl',
       user: User(id: 'testid'),
-      logger: Logger('ws'),
+      _logger: Logger('ws'),
       connectParams: {'test': 'true'},
       connectPayload: {'payload': 'test'},
       handler: handleFunc,
@@ -318,7 +318,7 @@ void main() {
     final ws = WebSocket(
       baseUrl: 'baseurl',
       user: User(id: 'testid'),
-      logger: Logger('ws'),
+      _logger: Logger('ws'),
       connectParams: {'test': 'true'},
       connectPayload: {'payload': 'test'},
       handler: print,

packages/stream_chat/test/src/client_test.dart

@@ -6,13 +6,13 @@ import 'package:dio/dio.dart';
 import 'package:dio/native_imp.dart';
 import 'package:logging/logging.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:stream_chat/src/api/requests.dart';
+import 'package:stream_chat/src/core/api/requests.dart';
 import 'package:stream_chat/src/client.dart';
 import 'package:stream_chat/src/exceptions.dart';
-import 'package:stream_chat/src/models/channel_model.dart';
-import 'package:stream_chat/src/models/filter.dart';
-import 'package:stream_chat/src/models/message.dart';
-import 'package:stream_chat/src/models/user.dart';
+import 'package:stream_chat/src/core/models/channel_model.dart';
+import 'package:stream_chat/src/core/models/filter.dart';
+import 'package:stream_chat/src/core/models/message.dart';
+import 'package:stream_chat/src/core/models/user.dart';
 import 'package:test/test.dart';
 
 class MockDio extends Mock implements DioForNative {}
@@ -55,8 +55,8 @@ void main() {
         expect(client.baseURL, 'chat-us-east-1.stream-io-api.com');
         expect(client.apiKey, 'api-key');
         expect(client.logLevel, Level.WARNING);
-        expect(client.httpClient.options.connectTimeout, 6000);
-        expect(client.httpClient.options.receiveTimeout, 6000);
+        expect(client.httpClient._options.connectTimeout, 6000);
+        expect(client.httpClient._options.receiveTimeout, 6000);
       });
 
       test('should create the object correctly', overridePrint(() {
@@ -76,8 +76,8 @@ void main() {
         expect(client.baseURL, 'test.com');
         expect(client.apiKey, 'api-key');
         expect(Logger.root.level, Level.INFO);
-        expect(client.httpClient.options.connectTimeout, 10000);
-        expect(client.httpClient.options.receiveTimeout, 12000);
+        expect(client.httpClient._options.connectTimeout, 10000);
+        expect(client.httpClient._options.receiveTimeout, 12000);
 
         client.logger.warning('test');
         client.logger.config('test config');
@@ -170,7 +170,7 @@ void main() {
         await client.queryChannelsOnline(
           filter: queryFilter,
           sort: sortOptions,
-          options: options,
+          _options: options,
           paginationParams: paginationParams,
           waitForConnect: false,
         );
@@ -419,7 +419,7 @@ void main() {
         await client.queryUsers(
           filter: queryFilter,
           sort: sortOptions,
-          options: options,
+          _options: options,
         );
 
         verify(() =>

packages/stream_chat/test/src/models/filter_test.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:test/test.dart';
-import 'package:stream_chat/src/models/filter.dart';
+import 'package:stream_chat/src/core/models/filter.dart';
 
 void main() {
   group('operators', () {

packages/stream_chat/test/version_test.dart

@@ -1,5 +1,7 @@
+import 'dart:async';
 import 'dart:io';
 
+import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat/version.dart';
 import 'package:test/test.dart';
 
@@ -12,13 +14,38 @@ void prepareTest() {
 
 void main() {
   prepareTest();
-  test('stream chat version matches pubspec', () {
-    final pubspecPath = '${Directory.current.path}/pubspec.yaml';
-    final pubspec = File(pubspecPath).readAsStringSync();
-    // ignore: unnecessary_string_escapes
-    final regex = RegExp('version:\s*(.*)');
-    final match = regex.firstMatch(pubspec);
-    expect(match, isNotNull);
-    expect(PACKAGE_VERSION, match?.group(1)?.trim());
+  test('stream chat version matches pubspec', () async {
+    /// Create a new instance of [StreamChatClient]
+    /// by passing the apikey obtained from your project dashboard.
+    final client = StreamChatClient('b67pax5b2wdq', logLevel: Level.INFO);
+
+    /// Set the current user. In a production scenario, this should be done using
+    /// a backend to generate a user token using our server SDK.
+    /// Please see the following for more information:
+    /// https://getstream.io/chat/docs/ios_user_setup_and_tokens/
+    await client.connectUser(
+      User(
+        id: 'cool-shadow-7',
+        extraData: {
+          'image':
+              'https://getstream.io/random_png/?id=cool-shadow-7&name=Cool+shadow',
+        },
+      ),
+      '''eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiY29vbC1zaGFkb3ctNyJ9.gkOlCRb1qgy4joHPaxFwPOdXcGvSPvp6QY0S4mpRkVo''',
+    );
+
+    try {
+      await client.banUser('asdasdas');
+    } catch (e) {
+      print(e);
+    }
+
+    // final pubspecPath = '${Directory.current.path}/pubspec.yaml';
+    // final pubspec = File(pubspecPath).readAsStringSync();
+    // // ignore: unnecessary_string_escapes
+    // final regex = RegExp('version:\s*(.*)');
+    // final match = regex.firstMatch(pubspec);
+    // expect(match, isNotNull);
+    // expect(PACKAGE_VERSION, match?.group(1)?.trim());
   });
 }