From 333b8b37158d65770d0a1c6672b5f949bad0bfc5 Mon Sep 17 00:00:00 2001 From: Olivier Leger Date: Mon, 13 Jan 2025 15:59:45 -0500 Subject: [PATCH] Update management command --- .../commands/clean_duplicated_submissions.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kobo/apps/openrosa/apps/logger/management/commands/clean_duplicated_submissions.py b/kobo/apps/openrosa/apps/logger/management/commands/clean_duplicated_submissions.py index 4117385090..3119a3cbe5 100644 --- a/kobo/apps/openrosa/apps/logger/management/commands/clean_duplicated_submissions.py +++ b/kobo/apps/openrosa/apps/logger/management/commands/clean_duplicated_submissions.py @@ -89,7 +89,6 @@ def handle(self, *args, **options): # Handle the different xml_hash duplicates (update uuid) if different_xml_hash_duplicates: - instance_ref = different_xml_hash_duplicates.pop(0) self._replace_duplicates(different_xml_hash_duplicates) def _delete_duplicates(self, instance_ref, duplicated_instances): @@ -165,12 +164,19 @@ def _replace_duplicates(self, duplicated_instances): if self._verbosity >= 1: self.stdout.write( - f'\tUpdating instance #{instance.pk} ({instance.uuid})…' + f'\tUpdating instance #{instance.pk}…' ) # Update the UUID and XML hash - instance.uuid = (f'DUPLICATE-{idx}-{instance.xform.id_string}-' - f'{instance.uuid}') + old_uuid = instance.uuid + instance.uuid = ( + f'DUPLICATE-{idx}-{instance.xform.id_string}-' + f'{instance.uuid}' + ) + if self._verbosity >= 2: + self.stdout.write( + f'\t\tOld UUID: {old_uuid}, New UUID: {instance.uuid}' + ) instance.xml = set_meta( instance.xml, 'instanceID', instance.uuid )