store [nfc]: Move queueId to PerAccountStoreBase

Author: PIG208

lib/model/store.dart

@@ -329,9 +329,10 @@ class AccountNotFoundException implements Exception {}
 
 /// A bundle of items that are useful to [PerAccountStore] and its substores.
 class CorePerAccountStore {
-  CorePerAccountStore({required this.connection});
+  CorePerAccountStore({required this.connection, required this.queueId});
 
   final ApiConnection connection; // TODO(#135): update zulipFeatureLevel with events
+  final String queueId;
 }
 
 /// A base class for [PerAccountStore] and its substores,
@@ -343,6 +344,7 @@ abstract class PerAccountStoreBase {
   final CorePerAccountStore _core;
 
   ApiConnection get connection => _core.connection;
+  String get queueId => _core.queueId;
 }
 
 /// Store for the user's data for a given Zulip account.
@@ -386,12 +388,11 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
     }
 
     final realmUrl = account.realmUrl;
-    final core = CorePerAccountStore(connection: connection);
+    final core = CorePerAccountStore(connection: connection, queueId: queueId);
     final channels = ChannelStoreImpl(initialSnapshot: initialSnapshot);
     return PerAccountStore._(
       globalStore: globalStore,
       core: core,
-      queueId: queueId,
       realmUrl: realmUrl,
       realmWildcardMentionPolicy: initialSnapshot.realmWildcardMentionPolicy,
       realmMandatoryTopics: initialSnapshot.realmMandatoryTopics,
@@ -435,7 +436,6 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
   PerAccountStore._({
     required GlobalStore globalStore,
     required super.core,
-    required this.queueId,
     required this.realmUrl,
     required this.realmWildcardMentionPolicy,
     required this.realmMandatoryTopics,
@@ -474,7 +474,6 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
 
   final GlobalStore _globalStore;
 
-  final String queueId;
   UpdateMachine? get updateMachine => _updateMachine;
   UpdateMachine? _updateMachine;
   set updateMachine(UpdateMachine? value) {