Merge pull request #5444 from nyaruka/note_vs_body_pt3

Add data migration to copy body to ticket on open ticket event

temba/api/v2/serializers.py

@@ -1596,10 +1596,14 @@ class TicketReadSerializer(ReadSerializer):
     opened_in = fields.FlowField()
     modified_on = serializers.DateTimeField(default_timezone=tzone.utc)
     closed_on = serializers.DateTimeField(default_timezone=tzone.utc)
+    body = serializers.SerializerMethodField()  # deprecated
 
     def get_status(self, obj):
         return self.STATUSES.get(obj.status)
 
+    def get_body(self, obj):
+        return None
+
     class Meta:
         model = Ticket
         fields = (

temba/mailroom/events.py

@@ -219,7 +219,7 @@ def from_ticket_event(cls, org: Org, user: User, obj: TicketEvent) -> dict:
                 "closed_on": ticket.closed_on.isoformat() if ticket.closed_on else None,
                 "topic": _topic(ticket.topic) if ticket.topic else None,
                 "status": ticket.status,
-                "body": ticket.body,
+                "body": None,
             },
             "created_on": get_event_time(obj).isoformat(),
             "created_by": _user(obj.created_by) if obj.created_by else None,

temba/tickets/migrations/0062_move_body_to_open_note.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.0.8 on 2024-08-08 14:58
+
+from django.db import migrations
+
+
+def move_body_to_open_note(apps, schema_editor):
+    Ticket = apps.get_model("tickets", "Ticket")
+
+    num_updated = 0
+
+    for ticket in Ticket.objects.exclude(body=None).exclude(body=""):
+        ticket.events.filter(event_type="O").update(note=ticket.body)
+
+        num_updated += 1
+
+        if num_updated % 1000 == 0:  # pragma: no cover
+            print(f" > updated {num_updated} tickets")
+
+    if num_updated:
+        print(f" > Updated {num_updated} tickets")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("tickets", "0061_alter_ticket_body_alter_ticketevent_note")]
+
+    operations = [migrations.RunPython(move_body_to_open_note, migrations.RunPython.noop)]

temba/tickets/tests.py

@@ -10,7 +10,7 @@
 
 from temba.contacts.models import Contact, ContactField, ContactURN
 from temba.orgs.models import Export
-from temba.tests import CRUDLTestMixin, TembaTest, matchers, mock_mailroom
+from temba.tests import CRUDLTestMixin, MigrationTest, TembaTest, matchers, mock_mailroom
 from temba.utils.dates import datetime_to_timestamp
 from temba.utils.uuid import uuid4
 
@@ -1396,3 +1396,28 @@ def _record_last_close(self, org, d: date, seconds: int, undo: bool = False):
         TicketDailyTiming.objects.create(
             count_type=TicketDailyTiming.TYPE_LAST_CLOSE, scope=f"o:{org.id}", day=d, count=count, seconds=seconds
         )
+
+
+class MoveBodyToOpenNoteTest(MigrationTest):
+    app = "tickets"
+    migrate_from = "0061_alter_ticket_body_alter_ticketevent_note"
+    migrate_to = "0062_move_body_to_open_note"
+
+    def setUpBeforeMigration(self, apps):
+        contact = self.create_contact("Bob", urns=["twitter:bobby"])
+
+        self.ticket1 = self.create_ticket(contact)
+        self.ticket2 = self.create_ticket(contact)
+        self.ticket2.body = "I was a body"
+        self.ticket2.save(update_fields=("body",))
+
+    def test_migration(self):
+        self.ticket1.refresh_from_db()
+        self.ticket2.refresh_from_db()
+
+        # body unchanged
+        self.assertIsNone(self.ticket1.body)
+        self.assertEqual("I was a body", self.ticket2.body)
+
+        self.assertEqual(None, self.ticket1.events.get(event_type="O").note)
+        self.assertEqual("I was a body", self.ticket2.events.get(event_type="O").note)