1973 bug edit superhashlist bug in hashlist datasource

ci/apiv2/test_hashlist.py

@@ -1,4 +1,6 @@
-from hashtopolis import Hashlist, Helper, File
+import requests
+
+from hashtopolis import Hashlist, Helper, File, HashtopolisConnector, HashtopolisConfig
 from utils import BaseTest
 
 
@@ -158,3 +160,27 @@ def test_bulk_archive(self):
     def test_bulk_delete(self):
         hashlists = [self.create_test_object(delete=False) for i in range(5)]
         Hashlist.objects.delete_many(hashlists)
+
+    def test_superhashlist_edit_returns_meta_page_total_elements(self):
+        hashlist1 = self.create_test_object()
+        hashlist2 = self.create_test_object()
+
+        helper = Helper()
+        superhashlist = helper.create_superhashlist(
+            name="SuperhashList edit test",
+            hashlists=[hashlist1, hashlist2]
+        )
+        self.delete_after_test(superhashlist)
+
+        config = HashtopolisConfig()
+        connector = HashtopolisConnector('/ui/hashlists',config)
+        connector.authenticate()
+
+        uri = connector._api_endpoint + connector._model_uri + f'/{superhashlist.id}?include=hashlists,hashType'
+        req = requests.get(uri, headers=connector._headers)
+        response = req.json()
+
+        self.assertIn('meta', response)
+        self.assertIn('page', response['meta'])
+        self.assertIn('total_elements', response['meta']['page'])
+        self.assertEqual(response['meta']['page']['total_elements'], 2)

src/inc/apiv2/common/AbstractBaseAPI.php

@@ -1659,6 +1659,24 @@ protected static function getOneResource(object $apiClass, object $object, Reque
     $links = ["self" => $linksSelf];
 
     $metaData = [];
+
+    $toManyRelations = $apiClass::getToManyRelationships();
+    $hasToManyExpand = false;
+    $totalExpanded = 0;
+    foreach ($expands as $expand) {
+      if (array_key_exists($expand, $toManyRelations)) {
+        $hasToManyExpand = true;
+        if (isset($expandResult[$expand])) {
+          foreach ($expandResult[$expand] as $objectList) {
+            $totalExpanded += count($objectList);
+          }
+        }
+      }
+    }
+    if ($hasToManyExpand) {
+      $metaData["page"] = ["total_elements" => $totalExpanded];
+    }
+
     if ($apiClass->permissionErrors !== null) {
       $metaData["Include errors"] = $apiClass->permissionErrors;
     }