fix append dictionary item if multiple items

keep the first item and delete the others
pyscada · Jul 4, 2024 · 5e7e404 · 5e7e404
1 parent 93faea8
commit 5e7e404
Showing 1 changed file with 56 additions and 21 deletions.
diff --git a/pyscada/models.py b/pyscada/models.py
@@ -1161,31 +1161,66 @@ def get_label(self, value):
 
     def append(self, label, value, silent=False, update=None):
         if update is None:
-            _, created = DictionaryItem.objects.get_or_create(
-                label=label, value=value, dictionary=self
-            )
-            if not created and not silent:
-                logger.warning(
-                    "Item ({}:{}) for dictionary {} already exist".format(
-                        label, value, self
+            try:
+                _, created = DictionaryItem.objects.get_or_create(
+                    label=label, value=value, dictionary=self
+                )
+                if not created and not silent:
+                    logger.warning(
+                        "Item ({}:{}) for dictionary {} already exist".format(
+                            label, value, self
+                        )
                     )
+            except DictionaryItem.MultipleObjectsReturned:
+                logger.warning(
+                    f"MultipleObjectsReturned for label={label}, value={value}, dictionary={self}. Keep the first one."
                 )
+                for di in DictionaryItem.objects.filter(label=label, value=value, dictionary=self)[1:]:
+                    di.delete()
         elif update == "label":
-            DictionaryItem.objects.update_or_create(
-                value=value,
-                dictionary=self,
-                defaults={
-                    "label": label,
-                },
-            )
+            try:
+                DictionaryItem.objects.update_or_create(
+                    value=value,
+                    dictionary=self,
+                    defaults={
+                        "label": label,
+                    },
+                )
+            except DictionaryItem.MultipleObjectsReturned:
+                logger.warning(
+                    f"MultipleObjectsReturned for value={value}, dictionary={self}. Keep the first one."
+                )
+                for di in DictionaryItem.objects.filter(value=value, dictionary=self)[1:]:
+                    di.delete()
+                DictionaryItem.objects.update_or_create(
+                    value=value,
+                    dictionary=self,
+                    defaults={
+                        "label": label,
+                    },
+                )
         elif update == "value":
-            DictionaryItem.objects.update_or_create(
-                label=label,
-                dictionary=self,
-                defaults={
-                    "value": value,
-                },
-            )
+            try:
+                DictionaryItem.objects.update_or_create(
+                    label=label,
+                    dictionary=self,
+                    defaults={
+                        "value": value,
+                    },
+                )
+            except DictionaryItem.MultipleObjectsReturned:
+                logger.warning(
+                    f"MultipleObjectsReturned for label={label}, dictionary={self}. Keep the first one."
+                )
+                for di in DictionaryItem.objects.filter(label=label, dictionary=self)[1:]:
+                    di.delete()
+                DictionaryItem.objects.update_or_create(
+                    label=label,
+                    dictionary=self,
+                    defaults={
+                        "value": value,
+                    },
+                )
 
     def remove(self, label=None, value=None):
         if label is not None and value is not None: