revrted nextOffset calculation of hereNow

Mohit Tejani · Mohit Tejani · commit 458f305650dc · 2025-10-18T00:32:07.000+05:30
diff --git a/pubnub/lib/src/dx/_endpoints/presence.dart b/pubnub/lib/src/dx/_endpoints/presence.dart
@@ -340,43 +340,23 @@ class HereNowResult extends Result {
   final int totalOccupancy;
   final int totalChannels;
 
-  int? nextOffset;
-
-  HereNowResult._(this.channels, this.totalOccupancy, this.totalChannels,
-      {this.nextOffset});
+  HereNowResult._(this.channels, this.totalOccupancy, this.totalChannels);
 
   factory HereNowResult.fromJson(Map<String, dynamic> object,
-      {String? channelName,
-      int? limit = MAXIMUM_COUNT,
-      int? offset = DEFAULT_OFFSET}) {
-    int? nextOffset;
+      {String? channelName}) {
     var result = DefaultResult.fromJson(object);
     if (result.otherKeys.containsKey('payload')) {
       var payload = result.otherKeys['payload'] as Map<String, dynamic>;
       var channelsOccupancies = (payload['channels'] as Map<String, dynamic>)
           .map((key, value) => MapEntry(key,
               ChannelOccupancy.fromJson(key, value as Map<String, dynamic>)));
-      var maxOccupancyChannel = channelsOccupancies.values
-          .reduce((a, b) => a.count > b.count ? a : b);
-
-      if ((offset! + maxOccupancyChannel.uuids.length) <
-          maxOccupancyChannel.count) {
-        nextOffset = offset + maxOccupancyChannel.uuids.length;
-      }
       return HereNowResult._(channelsOccupancies,
-          payload['total_occupancy'] as int, payload['total_channels'] as int,
-          nextOffset: nextOffset);
+          payload['total_occupancy'] as int, payload['total_channels'] as int);
     } else {
       var channelOccupancy =
           ChannelOccupancy.fromJson(channelName!, result.otherKeys);
-      var fetchedOccupanciesCount = channelOccupancy.uuids.length;
-      if (result.otherKeys['occupancy'] as int >
-          (fetchedOccupanciesCount + offset!)) {
-        nextOffset = fetchedOccupanciesCount + offset;
-      }
-      return HereNowResult._({
-        channelName: channelOccupancy
-      }, result.otherKeys['occupancy'] as int, 1, nextOffset: nextOffset);
+      return HereNowResult._({channelName: channelOccupancy},
+          result.otherKeys['occupancy'] as int, 1);
     }
   }
 }
diff --git a/pubnub/lib/src/dx/presence/presence.dart b/pubnub/lib/src/dx/presence/presence.dart
@@ -57,9 +57,7 @@ mixin PresenceDx on Core {
         core: this,
         params: params,
         serialize: (object, [_]) => HereNowResult.fromJson(object,
-            channelName: (channels.length == 1) ? channels.first : null,
-            limit: limit,
-            offset: offset));
+            channelName: (channels.length == 1) ? channels.first : null));
   }
 
   /// Announce in [channels] and [channelGroups] that a device linked to the UUID in the keyset left.
diff --git a/pubnub/test/unit/dx/fixtures/presence.dart b/pubnub/test/unit/dx/fixtures/presence.dart
@@ -169,171 +169,3 @@ const _hereNowMixedStateResponse = '''
   ]
 }
 ''';
-
-const _hereNowWithNextOffsetNeededResponse = '''
-{
-  "message": "OK",
-  "payload": {
-    "channels": {
-      "my_channel": {
-        "occupancy": 3,
-        "uuids": [
-          "0a9e2e6a-1a36-4299-aa18-4d349e0019e5",
-          "24a51c02-f0bd-4f6a-b2cb-42dcf6ac6138"
-        ]
-      },
-      "test": {
-        "occupancy": 4,
-        "uuids": [
-          "93ce8247-223e-410d-a612-8e21c7ecb54a",
-          "7e4c3056-1ea8-437e-bf68-253926a99309",
-          "32f3fafb-3406-4ed0-aed5-1cdf138d9706"
-        ]
-      }
-    },
-    "total_channels": 2,
-    "total_occupancy": 7
-  },
-  "service": "Presence",
-  "status": 200
-}
-''';
-
-const _hereNowWithOutNextOffsetLastPage = '''
-{
-    "message": "OK",
-    "payload": {
-        "channels": {
-            "my_channel": {
-                "occupancy": 3,
-                "uuids": [
-                    "0a9e2e6a-1a36-4299-aa18-4d349e0019e5",
-                    "24a51c02-f0bd-4f6a-b2cb-42dcf6ac6138"
-                ]
-            },
-            "test": {
-                "occupancy": 4,
-                "uuids": [
-                    "93ce8247-223e-410d-a612-8e21c7ecb54a",
-                    "7e4c3056-1ea8-437e-bf68-253926a99309",
-                    "32f3fafb-3406-4ed0-aed5-1cdf138d9706"
-                ]
-            }
-        },
-        "total_channels": 2,
-        "total_occupancy": 7
-    },
-    "service": "Presence",
-    "status": 200
-}
-''';
-
-const _hereNowWithOffsetRequired = '''
-{
-    "message": "OK",
-    "payload": {
-        "channels": {
-            "my_channel": {
-                "occupancy": 3,
-                "uuids": [
-                    "0a9e2e6a-1a36-4299-aa18-4d349e0019e5",
-                    "24a51c02-f0bd-4f6a-b2cb-42dcf6ac6138"
-                ]
-            },
-            "test": {
-                "occupancy": 4,
-                "uuids": [
-                    "93ce8247-223e-410d-a612-8e21c7ecb54a",
-                    "7e4c3056-1ea8-437e-bf68-253926a99309"
-                ]
-            }
-        },
-        "total_channels": 2,
-        "total_occupancy": 7
-    },
-    "service": "Presence",
-    "status": 200
-}
-''';
-
-const _hereNowWithOffsetRequiredUnevenCount = '''
-{
-    "message": "OK",
-    "payload": {
-        "channels": {
-            "my_channel": {
-                "occupancy": 3,
-                "uuids": [
-                    "0a9e2e6a-1a36-4299-aa18-4d349e0019e5",
-                    "24a51c02-f0bd-4f6a-b2cb-42dcf6ac6138"
-                ]
-            },
-            "test": {
-                "occupancy": 4,
-                "uuids": [
-                    "93ce8247-223e-410d-a612-8e21c7ecb54a",
-                    "7e4c3056-1ea8-437e-bf68-253926a99309"
-                ]
-            }
-        },
-        "total_channels": 2,
-        "total_occupancy": 7
-    },
-    "service": "Presence",
-    "status": 200
-}
-''';
-
-const _hereNowSingleChannelResponse4Occupancies = '''
-{
-    "message": "OK",
-    "occupancy": 4,
-    "service": "Presence",
-    "status": 200,
-    "uuids": [
-        "93ce8247-223e-410d-a612-8e21c7ecb54a",
-        "7e4c3056-1ea8-437e-bf68-253926a99309",
-        "32f3fafb-3406-4ed0-aed5-1cdf138d9706",
-        "5125atqy-3406-4ed0-aed5-1cdf138d9706"
-    ]
-}
-''';
-
-const _hereNowSingleChannelResponse4OccupanciesLimit2 = '''
-{
-    "message": "OK",
-    "occupancy": 4,
-    "service": "Presence",
-    "status": 200,
-    "uuids": [
-        "93ce8247-223e-410d-a612-8e21c7ecb54a",
-        "7e4c3056-1ea8-437e-bf68-253926a99309"
-    ]
-}
-''';
-
-const _hereNowSingleChannelResponse4OccupanciesLimit2Offset1 = '''
-{
-    "message": "OK",
-    "occupancy": 4,
-    "service": "Presence",
-    "status": 200,
-    "uuids": [
-        "7e4c3056-1ea8-437e-bf68-253926a99309",
-        "32f3fafb-3406-4ed0-aed5-1cdf138d9706"
-    ]
-}
-''';
-
-const _hereNowSingleChannelsResponseMatchesLimit = '''
-{
-    "message": "OK",
-    "occupancy": 2,
-    "service": "Presence",
-    "status": 200,
-    "uuids": [
-        "7e4c3056-1ea8-437e-bf68-253926a99309",
-        "32f3fafb-3406-4ed0-aed5-1cdf138d9706"
-    ]
-}
-''';
diff --git a/pubnub/test/unit/dx/presence_test.dart b/pubnub/test/unit/dx/presence_test.dart
@@ -218,117 +218,6 @@ void main() {
           throwsA(TypeMatcher<PubNubException>()),
         );
       });
-
-      test('hereNow without offset parameter', () async {
-        when(
-          method: 'GET',
-          path:
-              '/v2/presence/sub_key/demo/channel/test,my_channel?uuid=test&disable_uuids=0&limit=1000',
-        ).then(status: 200, body: _hereNowWithNextOffsetNeededResponse);
-
-        final hereNowResponse = await pubnub!.hereNow(
-          channels: {'test', 'my_channel'},
-        );
-        expect(hereNowResponse.nextOffset, equals(3));
-      });
-    });
-
-    test('hereNow with limit and offset parameter', () async {
-      when(
-        method: 'GET',
-        path:
-            '/v2/presence/sub_key/demo/channel/test,my_channel?uuid=test&disable_uuids=0&limit=3&offset=1',
-      ).then(status: 200, body: _hereNowWithOutNextOffsetLastPage);
-
-      final hereNowResponse = await pubnub!.hereNow(
-        channels: {'test', 'my_channel'},
-        limit: 3,
-        offset: 1,
-      );
-      expect(hereNowResponse.nextOffset, equals(null));
-    });
-
-    test('hereNow with less limit value parameter', () async {
-      when(
-        method: 'GET',
-        path:
-            '/v2/presence/sub_key/demo/channel/test,my_channel?uuid=test&disable_uuids=0&limit=2',
-      ).then(status: 200, body: _hereNowWithOffsetRequired);
-
-      final hereNowResponse =
-          await pubnub!.hereNow(channels: {'test', 'my_channel'}, limit: 2);
-      expect(hereNowResponse.nextOffset, equals(2));
-    });
-
-    test(
-        'hereNow with multichannel less limit value parameter, uneven presence',
-        () async {
-      when(
-        method: 'GET',
-        path:
-            '/v2/presence/sub_key/demo/channel/test,my_channel?uuid=test&disable_uuids=0&limit=2&offset=1',
-      ).then(status: 200, body: _hereNowWithOffsetRequiredUnevenCount);
-
-      final hereNowResponse = await pubnub!
-          .hereNow(channels: {'test', 'my_channel'}, limit: 2, offset: 1);
-      expect(hereNowResponse.nextOffset, equals(3));
-    });
-
-    test('hereNow with single channel default limit offset', () async {
-      when(
-        method: 'GET',
-        path:
-            '/v2/presence/sub_key/demo/channel/test?uuid=test&disable_uuids=0&limit=1000',
-      ).then(status: 200, body: _hereNowSingleChannelResponse4Occupancies);
-
-      final hereNowResponse = await pubnub!.hereNow(channels: {'test'});
-      expect(hereNowResponse.nextOffset, equals(null));
-      expect(hereNowResponse.totalOccupancy, equals(4));
-    });
-
-    test('hereNow with single channel, nextOffset in the response', () async {
-      when(
-        method: 'GET',
-        path:
-            '/v2/presence/sub_key/demo/channel/test?uuid=test&disable_uuids=0&limit=2',
-      ).then(
-          status: 200, body: _hereNowSingleChannelResponse4OccupanciesLimit2);
-
-      final hereNowResponse =
-          await pubnub!.hereNow(channels: {'test'}, limit: 2);
-      expect(hereNowResponse.nextOffset, equals(2));
-      expect(hereNowResponse.totalOccupancy, equals(4));
-    });
-
-    test('hereNow with single channel with  offset, nextOffset in the response',
-        () async {
-      when(
-        method: 'GET',
-        path:
-            '/v2/presence/sub_key/demo/channel/test?uuid=test&disable_uuids=0&limit=2&offset=1',
-      ).then(
-          status: 200,
-          body: _hereNowSingleChannelResponse4OccupanciesLimit2Offset1);
-
-      final hereNowResponse =
-          await pubnub!.hereNow(channels: {'test'}, limit: 2, offset: 1);
-      expect(hereNowResponse.nextOffset, equals(3));
-      expect(hereNowResponse.totalOccupancy, equals(4));
-    });
-
-    test(
-        'hereNow with single channel in the response exact users count matches with limit',
-        () async {
-      when(
-        method: 'GET',
-        path:
-            '/v2/presence/sub_key/demo/channel/test?uuid=test&disable_uuids=0&limit=2',
-      ).then(status: 200, body: _hereNowSingleChannelsResponseMatchesLimit);
-
-      final hereNowResponse =
-          await pubnub!.hereNow(channels: {'test'}, limit: 2);
-      expect(hereNowResponse.nextOffset, equals(null));
-      expect(hereNowResponse.totalOccupancy, equals(2));
     });
 
     group('HereNowParams', () {
