Geodata save: transaction for main_geodata assignation to limit deadlocks

2 files changed, 10 insertions, 5 deletions

diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 6330742a3..1c77d1a90 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -36,7 +36,7 @@ from django.core.files import File
 from django.core.serializers import serialize
 from django.urls import reverse, NoReverseMatch
 from django.core.validators import validate_slug
-from django.db import connection
+from django.db import connection, transaction, OperationalError, IntegrityError
 from django.db.models import Q, Count, Max
 from django.db.models.signals import post_save, post_delete, m2m_changed
 from django.template import loader
@@ -2724,8 +2724,13 @@ class GeographicItem(models.Model):
             using=using,
             update_fields=update_fields,
         )
-        if self.main_geodata and not self.geodata.filter(pk=self.main_geodata.pk).count():
-            self.geodata.add(self.main_geodata)
+        if self.main_geodata and not self.geodata.filter(
+                pk=self.main_geodata.pk).count():
+            try:
+                with transaction.atomic():
+                    self.geodata.add(self.main_geodata)
+            except (OperationalError, IntegrityError):
+                pass
         elif not self.main_geodata and self.geodata.count():
             # arbitrary associate the first to geodata
             self.main_geodata = self.geodata.order_by("pk").all()[0]
diff --git a/ishtar_common/version.py b/ishtar_common/version.py
index 08bf33274..ad8f491b9 100644
--- a/ishtar_common/version.py
+++ b/ishtar_common/version.py
@@ -1,5 +1,5 @@
-# 4.0.23
-VERSION = (4, 0, 23)
+# 4.0.24
+VERSION = (4, 0, 24)
 
 
 def get_version():