WC2-875: Add command to clean-up instance duplicates#2747
Open
WC2-875: Add command to clean-up instance duplicates#2747
Conversation
madewulf
reviewed
Feb 17, 2026
madewulf
reviewed
Feb 17, 2026
| self.stdout.write(self.style.ERROR(" - file_name is None, that's odd!")) | ||
| continue | ||
| # We should use the content of the latest file received. | ||
| file_name = Instance.objects.filter(uuid__isnull=True, file_name=duplicate["file_name"]).order_by( |
Member
There was a problem hiding this comment.
The file_name vairable could be renamed file_name_qs to express that it's a queryset
tdethier
approved these changes
Feb 19, 2026
Member
tdethier
left a comment
tdethier
left a comment
There was a problem hiding this comment.
I didn't test that because I don't have a WFP setup, but it looks good. I think there's just an order_by() missing
Comment on lines
55
to
72
| has_content = Instance.objects.filter( | ||
| uuid=duplicate["uuid"], file_name=duplicate["file_name"], json__isnull=False | ||
| ) | ||
| if has_content.count() == 1: | ||
| self.stdout.write( | ||
| f"{index}. Duplicate with uuid '{duplicate['uuid']}' has only one instance with content." | ||
| ) | ||
| self._delete_instances( | ||
| uuid=duplicate["uuid"], file_name=duplicate["file_name"], first_id=has_content.first().id | ||
| ) | ||
| single_content += 1 | ||
| elif has_content.count() > 1: | ||
| self.stdout.write( | ||
| f"{index}. Duplicate with uuid '{duplicate['uuid']}' has {has_content.count()} instances with content." | ||
| ) | ||
| # Based on the code of `Instance.import_data`, the first one is always the one that has the data. | ||
| self._delete_instances( | ||
| uuid=duplicate["uuid"], file_name=duplicate["file_name"], first_id=has_content.first().id |
Member
There was a problem hiding this comment.
You do has_content.first() but your has_content queryset doesn't have an .order_by(). I'm afraid you can't know for sure which one you're going to get here
Comment on lines
+143
to
+149
| def _delete_instances(self, uuid: str, file_name: Union[str, None], first_id: str): | ||
| to_delete = Instance.objects.filter(uuid=uuid).exclude(id=first_id) | ||
| if file_name: | ||
| to_delete = to_delete.filter(file_name=file_name) | ||
| self.stdout.write(self.style.WARNING(f" - Deleting {to_delete.count()} instances and linked entities")) | ||
| Entity.objects.filter(attributes__in=to_delete).delete() | ||
| to_delete.delete() |
Member
There was a problem hiding this comment.
Could these instances also have InstanceFile objects that need to be deleted? I'm not sure if that scenario can happen with the issue we've had
Member
Author
There was a problem hiding this comment.
I don't think we'll have InstanceFile as there are no attachment in WFP
| multiple_content += 1 | ||
| else: | ||
| self.stdout.write(f"{index}. Duplicate with uuid '{duplicate['uuid']}' has no instances with content.") | ||
| first = Instance.objects.filter(uuid=duplicate["uuid"], file_name=duplicate["file_name"]).first() |
Member
There was a problem hiding this comment.
Same comment about .first() and .order_by()
| list_filter = ("birth_date", "gender", "account", "guidelines", ProgrammeType) | ||
| list_display = ("id", "birth_date", "gender", "account", "guidelines") | ||
| actions = [create_uuid_index_action] | ||
| actions = [create_uuid_index_action, clean_up_duplicates_action, clean_up_duplicates_action_dry_run] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem is this PR solving?
Some instances have duplicates instances (Instance with the same UUID). This adds a command and a celery task to fix the issue.
Related JIRA tickets
WC2-875
Changes
The command looks for duplicate. Then, for each one, it tries to merge them the best it can.
How to test
With a dump of a database with duplicates. Either execute the command or launch the celery task.