Ilhasoft · lucaslinhares · Jan 13, 2025 · Jun 27, 2024 · Jun 27, 2024 · Jun 27, 2024
diff --git a/temba/templates/models.py b/temba/templates/models.py
@@ -7,6 +7,7 @@
 from temba.channels.models import Channel
 from temba.orgs.models import Org
 from temba.utils.languages import alpha2_to_alpha3
+from temba.utils.models import update_if_changed
 
 
 class TemplateType:
@@ -52,6 +53,11 @@ class Template(models.Model):
     # when this template was created
     created_on = models.DateTimeField(default=timezone.now)
 
+    @classmethod
+    def get_or_create(cls, org, name: str):
+        obj, created = cls.objects.get_or_create(org=org, name=name)
+        return obj
+
     def is_approved(self):
         """
         Returns whether this template has at least one translation and all are approved
@@ -131,62 +137,51 @@ def get_or_create(
         cls,
         channel,
         name,
-        *,
         locale,
+        *,
         status,
         external_id,
         external_locale,
         namespace: str,
         components: list,
         variables: list,
     ):
-        existing = TemplateTranslation.objects.filter(channel=channel, external_id=external_id).first()
-
-        if not existing:
-            template = Template.objects.filter(org=channel.org, name=name).first()
-            if not template:
-                template = Template.objects.create(
-                    org=channel.org, name=name, created_on=timezone.now(), modified_on=timezone.now()
-                )
-            else:
-                template.modified_on = timezone.now()
-                template.save(update_fields=["modified_on"])
-
-            existing = TemplateTranslation.objects.create(
+        # get the template with this name
+        template = Template.get_or_create(channel.org, name)
+
+        # look for an existing translation for this channel / locale pair
+        existing = template.translations.filter(channel=channel, locale=locale).first()
+
+        if existing:
+            # update existing translation if necessary
+            changed = update_if_changed(
+                existing,
+                components=components,
+                variables=variables,
+                status=status,
+                namespace=namespace,
+                external_id=external_id,
+                external_locale=external_locale,
+            )
+        else:
+            # create new translation
+            existing = cls.objects.create(
                 template=template,
                 channel=channel,
-                namespace=namespace,
                 locale=locale,
                 components=components,
                 variables=variables,
                 status=status,
+                namespace=namespace,
                 external_id=external_id,
                 external_locale=external_locale,
             )
+            changed = True
 
-        else:
-            if existing.status != status or existing.locale != locale or existing.components != components:
-                existing.namespace = namespace
-                existing.locale = locale
-                existing.status = status
-                existing.is_active = True
-                existing.components = components
-                existing.variables = variables
-                existing.external_locale = external_locale
-                existing.save(
-                    update_fields=[
-                        "namespace",
-                        "locale",
-                        "status",
-                        "components",
-                        "variables",
-                        "external_locale",
-                        "is_active",
-                    ]
-                )
-
-                existing.template.modified_on = timezone.now()
-                existing.template.save(update_fields=["modified_on"])
+        # mark template as modified if we made translation changes
+        if changed:
+            existing.template.modified_on = timezone.now()
+            existing.template.save(update_fields=("modified_on",))
 
         return existing
 

diff --git a/temba/templates/types/whatsapp/tests.py b/temba/templates/types/whatsapp/tests.py
@@ -245,7 +245,7 @@ def test_update_local_d3(self):
         self.assertEqual("foo_namespace", trans.namespace)
         self.assertEqual("eng", trans.locale)
         self.assertEqual("en", trans.external_locale)
-        self.assertEqual("en/hello", trans.external_id)
+        self.assertIsNone(trans.external_id)
         self.assertEqual(
             [{"name": "body", "type": "body/text", "content": "Hello {{1}}", "variables": {"1": 0}}],
             trans.components,

diff --git a/temba/templates/types/whatsapp/type.py b/temba/templates/types/whatsapp/type.py
@@ -26,14 +26,13 @@ def update_local(self, channel, raw: dict):
         if not supported:
             status = TemplateTranslation.STATUS_UNSUPPORTED
 
-        missing_external_id = f"{raw['language']}/{raw['name']}"
         return TemplateTranslation.get_or_create(
             channel,
             raw["name"],
             locale=self._parse_language(raw["language"]),
             status=status,
             external_locale=raw["language"],
-            external_id=raw.get("id", missing_external_id[:64]),
+            external_id=raw.get("id"),
             namespace=raw.get("namespace", channel_namespace),
             components=components,
             variables=variables,

diff --git a/temba/utils/models/base.py b/temba/utils/models/base.py
@@ -51,6 +51,22 @@ def delete_in_batches(qs, *, batch_size: int = 1000, pk: str = "id", pre_delete=
     return num_deleted
 
 
+def update_if_changed(obj, **kwargs) -> bool:
+    """
+    Updates the given model instance with the given values, saving it if a change was made.
+    """
+    update_fields = []
+    for attr, value in kwargs.items():
+        if getattr(obj, attr) != value:
+            setattr(obj, attr, value)
+            update_fields.append(attr)
+
+    if update_fields:
+        obj.save(update_fields=update_fields)
+
+    return bool(update_fields)
+
+
 class LegacyUUIDMixin(SmartModel):
     """
     Model mixin for things with an old-style VARCHAR(36) UUID

diff --git a/temba/utils/models/tests.py b/temba/utils/models/tests.py
@@ -9,7 +9,7 @@
 from temba.flows.models import Flow
 from temba.tests import TembaTest
 
-from .base import delete_in_batches, patch_queryset_count
+from .base import delete_in_batches, patch_queryset_count, update_if_changed
 from .es import IDSliceQuerySet
 from .fields import JSONAsTextField
 
@@ -51,6 +51,37 @@ def post_delete():
         self.assertTrue(Group.objects.filter(id=to_keep.id).exists())
         self.assertEqual(4, Group.objects.filter(id__in=[g.id for g in to_delete]).count())
 
+    def test_update_if_changed(self):
+        with self.assertNumQueries(1):
+            changed = update_if_changed(self.admin, first_name="Andrew", last_name="McAdmin")  # all fields changing
+
+        self.assertTrue(changed)
+        self.assertEqual("Andrew", self.admin.first_name)
+        self.assertEqual("McAdmin", self.admin.last_name)
+        self.admin.refresh_from_db()
+        self.assertEqual("Andrew", self.admin.first_name)
+        self.assertEqual("McAdmin", self.admin.last_name)
+
+        with self.assertNumQueries(1):
+            changed = update_if_changed(self.admin, first_name="Andy", last_name="McAdmin")  # one field changing
+
+        self.assertTrue(changed)
+        self.assertEqual("Andy", self.admin.first_name)
+        self.assertEqual("McAdmin", self.admin.last_name)
+        self.admin.refresh_from_db()
+        self.assertEqual("Andy", self.admin.first_name)
+        self.assertEqual("McAdmin", self.admin.last_name)
+
+        with self.assertNumQueries(0):
+            changed = update_if_changed(self.admin, first_name="Andy", last_name="McAdmin")  # no fields changing
+
+        self.assertFalse(changed)
+        self.assertEqual("Andy", self.admin.first_name)
+        self.assertEqual("McAdmin", self.admin.last_name)
+        self.admin.refresh_from_db()
+        self.assertEqual("Andy", self.admin.first_name)
+        self.assertEqual("McAdmin", self.admin.last_name)
+
 
 class IDSliceQuerySetTest(TembaTest):
     def test_fields(self):