api: use internal_id as key for internal id, in every API (#87117)

tests/api/test_carddata.py

@@ -485,8 +485,17 @@ def test_api_card_list_custom_id_filter_identifier(pub):
         )
     )
     assert len(resp.json['data']) == 1
+    assert resp.json['data'][0]['id'] == 'bar'
+    assert resp.json['data'][0]['internal_id'] == str(card.id)
 
     app = get_app(pub)
     app.set_authorization(('Basic', ('test', '12345')))
     resp = app.get('/api/cards/foo/list?filter-identifier=bar')
     assert len(resp.json['data']) == 1
+    assert resp.json['data'][0]['id'] == 'bar'
+    assert resp.json['data'][0]['internal_id'] == str(card.id)
+
+    resp = app.get('/api/cards/foo/list?filter-identifier=bar&full=on')
+    assert len(resp.json['data']) == 1
+    assert resp.json['data'][0]['id'] == 'bar'
+    assert resp.json['data'][0]['internal_id'] == str(card.id)

tests/api/test_custom_view.py

@@ -497,7 +497,7 @@ def test_api_list_status_filter_different(pub, local_user):
 
     resp = get_app(pub).get(sign_uri('/api/cards/test/list/custom-view/'))
     assert len(resp.json['data']) == 1
-    assert resp.json['data'][0]['id'] == carddata2.id
+    assert resp.json['data'][0]['id'] == str(carddata2.id)
 
     resp = get_app(pub).get(sign_uri('/api/cards/test/custom-view/%s/' % carddata2.id))
     assert resp.json['id'] == str(carddata2.id)

tests/api/test_formdata.py

@@ -1263,12 +1263,12 @@ def test_api_list_formdata_filter_status(pub, local_user):
     # filter on id
     resp = get_app(pub).get(sign_uri('/api/forms/foo/list?filter=new', user=local_user))
     assert len(resp.json) == 1
-    assert resp.json[0]['id'] == new.id
+    assert resp.json[0]['id'] == str(new.id)
 
     # filter on name
     resp = get_app(pub).get(sign_uri('/api/forms/foo/list?filter=Ongoing', user=local_user))
     assert len(resp.json) == 1
-    assert resp.json[0]['id'] == wip.id
+    assert resp.json[0]['id'] == str(wip.id)
 
 
 def test_api_list_formdata_unknown_filter(pub, local_user):

wcs/backoffice/management.py

@@ -2777,7 +2777,8 @@ class FormPage(Directory, TempfileDirectoryMixin):
         else:
             output = [
                 {
-                    'id': filled.id,
+                    'id': filled.identifier,
+                    'internal_id': str(filled.id),
                     'display_id': filled.get_display_id(),
                     'display_name': filled.get_display_name(),
                     'digest': (filled.digests or {}).get(digest_key),

wcs/formdata.py

@@ -1544,7 +1544,7 @@ class FormData(StorableObject):
         if hasattr(self, 'uuid'):
             data['uuid'] = self.uuid
         data['id'] = self.identifier
-        data['internal-id'] = str(self.id)
+        data['internal_id'] = str(self.id)
         data['display_id'] = self.get_display_id()
         data['display_name'] = self.get_display_name()
         data['digests'] = self.digests