WIP read ints directly in remaining fields userId, senderId, time; TODO tests

Author: gnprice

lib/api/notifications.dart

@@ -84,7 +84,7 @@ sealed class FcmMessageWithIdentity extends FcmMessage {
   ///
   /// Useful mainly in the case where the user has multiple accounts in the
   /// same realm.
-  @_IntConverter()
+  @JsonKey(readValue: _readIntOrString) // TODO(server-12)
   final int userId;
 
   FcmMessageWithIdentity({
@@ -110,7 +110,7 @@ class MessageFcmMessage extends FcmMessageWithIdentity {
   @JsonKey(includeToJson: true)
   String get type => 'message';
 
-  @_IntConverter()
+  @JsonKey(readValue: _readIntOrString) // TODO(server-12)
   final int senderId;
   // final String senderEmail; // obsolete; ignore
   final Uri senderAvatarUrl;
@@ -121,7 +121,7 @@ class MessageFcmMessage extends FcmMessageWithIdentity {
 
   @JsonKey(readValue: _readMessageId)
   final int messageId;
-  @_IntConverter()
+  @JsonKey(readValue: _readIntOrString) // TODO(server-12)
   final int time; // in Unix seconds UTC, like [Message.timestamp]
 
   /// The content of the Zulip message, rendered as plain text.
@@ -301,4 +301,10 @@ class _IntConverter extends JsonConverter<int, String> {
   String toJson(int value) => value.toString();
 }
 
+Object? _readIntOrString(Map<dynamic, dynamic> json, String key) {
+  final jsonValue = json[key];
+  if (jsonValue is String) return _parseInt(jsonValue);
+  return jsonValue;
+}
+
 int _parseInt(String string) => int.parse(string, radix: 10);

lib/api/notifications.g.dart

@@ -8,7 +8,7 @@ import '../stdlib_checks.dart';
 void main() {
   final baseBaseJson = <String, Object?>{
     "realm_url": "https://zulip.example.com/",
-    "user_id": "234",
+    "user_id": 234,
   };
 
   // Before E2EE notifications, the data comes directly as FCM payloads,
@@ -39,12 +39,12 @@ void main() {
       ...baseBaseJson,
       "type": "message",
 
-      "sender_id": "123",
+      "sender_id": 123,
       "sender_email": "[email protected]",
       "sender_avatar_url": "https://zulip.example.com/avatar/123.jpeg",
       "sender_full_name": "A Sender",
 
-      "time": "1546300800",
+      "time": 1546300800,
       "message_id": 12345,
 
       "content": "This is a message",