Skip to content

OpenConceptLab/ocl_online#456 | Order a concept's mappings by id (fixes flaky inverse-mappings test) #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paynejd merged 4 commits into from
Oct 22, 2026
Merged

OpenConceptLab/ocl_online#456 | Order a concept's mappings by id (fixes flaky inverse-mappings test) #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e501726
OpenConceptLab/ocl_online#456 | Print the full diff when the includeM…
paynejd Oct 22, 2026
5c03b08
OpenConceptLab/ocl_online#456 | Temporary: print the unequal leaves w…
paynejd Oct 22, 2026
de6304c
OpenConceptLab/ocl_online#456 | Temporary diagnostic: satisfy pylint
paynejd Oct 22, 2026
155eaf3
OpenConceptLab/ocl_online#456 | Order a concept's mappings by id in A…
paynejd Oct 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/concepts/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def get_mappings(self, obj): # pylint: disable=too-many-locals
) if is_collection else obj.get_bidirectional_mappings()
if not include_retired:
mappings = mappings.filter(retired=False)
return serializer_class(mappings, many=True).data
return serializer_class(mappings.order_by('id'), many=True).data
if self.include_direct_mappings:
mappings = obj.get_unidirectional_mappings_for_collection(
parent_uri, collection_version) if is_collection else obj.get_unidirectional_mappings()
Expand All @@ -307,7 +307,7 @@ def get_mappings(self, obj): # pylint: disable=too-many-locals
mappings = mappings.filter(to_source_url__in=target_repo_urls)
if not include_retired:
mappings = mappings.filter(retired=False)
return serializer_class(mappings, many=True).data
return serializer_class(mappings.order_by('id'), many=True).data

return []

Expand Down Expand Up @@ -726,11 +726,11 @@ def get_mappings(self, obj):
mappings = obj.get_bidirectional_mappings_for_collection(
parent_uri, collection_version
) if is_collection else obj.get_bidirectional_mappings()
return MappingDetailSerializer(mappings, many=True, context=context).data
return MappingDetailSerializer(mappings.order_by('id'), many=True, context=context).data
if self.include_direct_mappings:
mappings = obj.get_unidirectional_mappings_for_collection(
parent_uri, collection_version) if is_collection else obj.get_unidirectional_mappings()
return MappingDetailSerializer(mappings, many=True, context=context).data
return MappingDetailSerializer(mappings.order_by('id'), many=True, context=context).data

return []

Expand Down
6 changes: 5 additions & 1 deletion core/integration_tests/tests_concepts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4702,4 +4702,8 @@ def test_inverse_mappings_are_unchanged(self):
batched = self.client.get(url).data
with patch.object(ConceptAbstractSerializer, 'preload_page', lambda *args: None):
per_concept = self.client.get(url).data
self.assertEqual(batched, per_concept)
# plain lists, so a failure shows the differing element
self.assertEqual(list(batched), list(per_concept))
for row in batched:
mapping_ids = [int(mapping['uuid']) for mapping in row['mappings']]
self.assertEqual(mapping_ids, sorted(mapping_ids))
Loading