channel: Ensure SubscriptionRemoveEvent updates streams collections

Author: Khader-1

lib/api/model/model.dart

@@ -437,6 +437,24 @@ class Subscription extends ZulipStream {
 
   @override
   Map<String, dynamic> toJson() => _$SubscriptionToJson(this);
+
+  /// Returns a plain `ZulipStream` with same values as `this`
+  ///
+  /// This is helpful when unsubscribing from a stream.
+  ZulipStream toStream() => ZulipStream(
+    streamId: streamId,
+    name: name,
+    description: description,
+    renderedDescription: renderedDescription,
+    dateCreated: dateCreated,
+    firstMessageId: firstMessageId,
+    inviteOnly: inviteOnly,
+    isWebPublic: isWebPublic,
+    historyPublicToSubscribers: historyPublicToSubscribers,
+    messageRetentionDays: messageRetentionDays,
+    channelPostPolicy: channelPostPolicy,
+    canRemoveSubscribersGroup: canRemoveSubscribersGroup,
+    streamWeeklyTraffic: streamWeeklyTraffic);
 }
 
 @JsonEnum(fieldRename: FieldRename.snake, valueField: "apiValue")

lib/model/channel.dart

@@ -173,6 +173,8 @@ class ChannelStoreImpl with ChannelStore {
           assert(streamsByName.containsKey(streams[streamId]!.name)
             && streamsByName[streams[streamId]!.name] is Subscription);
           assert(subscriptions.containsKey(streamId));
+          streams[streamId] = subscriptions[streamId]!.toStream();
+          streamsByName[streams[streamId]!.name] = subscriptions[streamId]!.toStream();
           subscriptions.remove(streamId);
         }
 

test/model/channel_test.dart

@@ -103,6 +103,17 @@ void main() {
         value: false));
       check(store.subscriptions[stream.streamId]!.isMuted).isTrue();
     });
+
+    test('SubscriptionRemoveEvent updates streams and streamsByName', () async {
+      final store = eg.store(initialSnapshot: eg.initialSnapshot(
+        streams: [eg.subscription(stream)],
+        subscriptions: [eg.subscription(stream)],
+      ));
+
+      await store.handleEvent(SubscriptionRemoveEvent(id: 1, streamIds: [stream.streamId]));
+      check(store.streams[stream.streamId] is Subscription).isFalse();
+      check(store.streams[stream.streamId] is ZulipStream).isTrue();
+    });
   });
 
   group('topic visibility', () {