Merge pull request #90 from GetStream/fix-issue-89

Author: xsahil03x

example/lib/main.dart

@@ -9,7 +9,7 @@ void main() {
   WidgetsFlutterBinding.ensureInitialized();
   final _key = String.fromEnvironment('key');
   final _user_token = String.fromEnvironment('user_token');
-  final client = StreamFeedClient.connect(_key, userToken: _user_token);
+  final client = StreamFeedClient.connect(_key, token: Token(_user_token));
   runApp(
     MyApp(
       client: client,

packages/stream_feed/lib/src/core/models/realtime_message.dart

@@ -5,6 +5,7 @@ import 'package:stream_feed/src/core/models/activity.dart';
 import 'package:stream_feed/src/core/models/feed_id.dart';
 
 import 'package:stream_feed/src/core/models/foreign_id_time_pair.dart';
+import 'package:stream_feed/stream_feed.dart';
 
 part 'realtime_message.g.dart';
 
@@ -16,7 +17,7 @@ class RealtimeMessage extends Equatable {
     required this.feed,
     this.deleted = const <String>[],
     this.deletedForeignIds = const <ForeignIdTimePair>[],
-    this.newActivities = const <Activity>[],
+    this.newActivities = const <EnrichedActivity>[],
     this.appId,
     this.publishedAt,
   });
@@ -45,7 +46,7 @@ class RealtimeMessage extends Equatable {
 
   /// All activities created by this update
   @JsonKey(name: 'new')
-  final List<Activity> newActivities;
+  final List<EnrichedActivity> newActivities;
 
   /// Time of the update in ISO format
   @JsonKey(includeIfNull: false)

packages/stream_feed/lib/src/core/models/realtime_message.g.dart

@@ -0,0 +1,19 @@
+{
+    "deleted": [],
+    "deleted_foreign_ids": [],
+    "feed": "reward:1",
+    "new": [
+      {
+        "actor": "reward:1",
+        "foreign_id": null,
+        "id": "f3de8328-be2d-11eb-bb18-128a130028af",
+        "message": "@Jessica check out getstream.io it's so dang awesome.",
+        "object": "tweet:id",
+        "origin": null,
+        "target": null,
+        "time": "2021-05-26T14:23:33.918391",
+        "to": ["notification:jessica"],
+        "verb": "tweet"
+      }
+    ]
+  }

packages/stream_feed/test/fixtures/realtime_message.json

@@ -0,0 +1,32 @@
+{
+    "deleted": [],
+    "deleted_foreign_ids": [],
+    "feed": "task: 32db0f46-3593-4e14-aa57-f05af4887260",
+    "new": [
+        {
+            "actor": {
+                "created_at": "2021-04-13T22:53:19.670051Z",
+                "updated_at": "2021-04-13T22:53:19.670051Z",
+                "id": "eTHVBnEm0FQB2HeaRKVlEfVf58B3personal",
+                "data": {
+                    "gender": "Male",
+                    "name": "Rickey Lee",
+                    "photo": "https://firebasestorage.googleapis.com/v0/b/fire-snab.appspot.com/o/profile-image-placeholder.png?alt=media&token=b17598bb-a510-4167-8354-ab75642ba89e"
+                }
+            },
+            "createdTask": {
+                "id": "32db0f46-3593-4e14-aa57-f05af4887260",
+                "title": "KeyPack",
+                "isFinished": true
+            },
+            "foreign_id": null,
+            "group": "updated_2021-06-09",
+            "id": "cff95542-c979-11eb-8080-80005abdd229",
+            "object": "task_situation_updated to true",
+            "origin": null,
+            "target": null,
+            "time": "2021-06-09T23:24:18.238189",
+            "verb": "updated"
+        }
+    ]
+}

packages/stream_feed/test/fixtures/realtime_message_issue89.json

@@ -125,7 +125,38 @@ void main() {
       });
     });
   });
+  group('RealtimeMessage', () {
+    test('fromJson', () {
+      final fromJson =
+          RealtimeMessage.fromJson(jsonFixture('realtime_message.json'));
+
+      expect(
+          fromJson,
+          RealtimeMessage(
+              deleted: [],
+              deletedForeignIds: [],
+              feed: FeedId.fromId('reward:1'),
+              newActivities: [
+                EnrichedActivity(
+                    actor: EnrichableField('reward:1'),
+                    id: 'f3de8328-be2d-11eb-bb18-128a130028af',
+                    extraData: {
+                      'message':
+                          "@Jessica check out getstream.io it's so dang awesome.",
+                    },
+                    origin: EnrichableField(null),
+                    target: EnrichableField(null),
+                    object: EnrichableField('tweet:id'),
+                    time: DateTime.parse('2021-05-26T14:23:33.918391'),
+                    to: ['notification:jessica'],
+                    verb: 'tweet')
+              ]));
+    });
 
+    test('issue-89', () {
+      RealtimeMessage.fromJson(jsonFixture('realtime_message_issue89.json'));
+    });
+  });
   test('EnrichedActivity issue 61', () {
     final enrichedActivity = EnrichedActivity.fromJson(
         jsonFixture('enriched_activity_issue61.json'));