Fix sitewide api tests

Use the expected count from the arguments of the assertSitewideStatEqual function call, and adds a total_{entity}_count check

Author: MonkeyDo

listenbrainz/testdata/sitewide_top_artists_db.json

@@ -14,5 +14,6 @@
     ],
     "to_ts": 1593043183,
     "stats_range": "all_time",
-    "count": 2
+    "count": 2,
+    "total_artist_count": 123
 }

listenbrainz/testdata/sitewide_top_artists_db_data_for_api_test.json

@@ -301,5 +301,6 @@
       "artist_mbid": "12379346-99d9-4941-b4a2-f04144a39863"
     }
   ],
-  "count": 60
-}
+  "count": 60,
+  "total_artist_count": 60
+}

listenbrainz/testdata/sitewide_top_artists_db_data_for_api_test_month.json

@@ -301,5 +301,6 @@
       "artist_mbid": "78df245f-0fe0-4a21-b1d4-e79f695354fd"
     }
   ],
-  "count": 60
-}
+  "count": 60,
+  "total_artist_count": 60
+}

listenbrainz/testdata/sitewide_top_artists_db_data_for_api_test_too_many.json

@@ -1011,5 +1011,6 @@
       "artist_mbid": "218bbe3d-63cc-46bc-8e43-e56a2f6c9829"
     }
   ],
-  "count": 202
-}
+  "count": 202,
+  "total_artist_count": 202
+}

listenbrainz/testdata/sitewide_top_artists_db_data_for_api_test_week.json

@@ -1001,5 +1001,6 @@
       "artist_mbid": "a2c1ed01-991f-4a9d-81e0-9b04c8df1c80"
     }
   ],
-  "count": 200
-}
+  "count": 200,
+  "total_artist_count": 200
+}

listenbrainz/testdata/sitewide_top_artists_db_data_for_api_test_year.json

@@ -301,5 +301,6 @@
       "artist_mbid": "a63d3de8-9c39-4320-8199-784df3f4c74c"
     }
   ],
-  "count": 60
-}
+  "count": 60,
+  "total_artist_count": 60
+}

listenbrainz/tests/integration/test_stats_api.py

@@ -245,7 +245,9 @@ def assertSitewideStatEqual(self, sent, response, entity, stats_range, count, of
 
         received = orjson.loads(response.data)['payload']
 
-        self.assertEqual(sent['count'], received['count'])
+        singular_entity = entity[:-1] if entity.endswith('s') else entity
+        self.assertEqual(sent[f'total_{singular_entity}_count'], received[f'total_{singular_entity}_count'])
+        self.assertEqual(count, received['count'])
         self.assertEqual(sent['from_ts'], received['from_ts'])
         self.assertEqual(sent['to_ts'], received['to_ts'])
         self.assertEqual(stats_range, received['range'])