add _self_ref_order field

Author: ozer550

morango/migrations/0003_auto_20260422_1053.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.25 on 2026-04-22 10:53
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('morango', '0002_store_idx_morango_deserialize'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='buffer',
+            name='_self_ref_order',
+            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+        migrations.AddField(
+            model_name='store',
+            name='_self_ref_order',
+            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]

morango/models/core.py

@@ -6,6 +6,7 @@
 from functools import reduce
 
 from django.core import exceptions
+from django.core.validators import MinValueValidator
 from django.db import connection, models, router, transaction
 from django.db.models import F, Func, Max, Q, TextField, Value, signals
 from django.db.models.deletion import Collector
@@ -391,6 +392,9 @@ class AbstractStore(models.Model):
     conflicting_serialized_data = models.TextField(blank=True)
 
     _self_ref_fk = models.CharField(max_length=32, blank=True)
+    _self_ref_order = models.IntegerField(
+        blank=True, null=True, validators=[MinValueValidator(0)]
+    )
 
     class Meta:
         abstract = True

tests/testapp/tests/models/test_core.py

@@ -2,13 +2,14 @@
 
 import factory
 import mock
+from django.core.exceptions import ValidationError
 from django.test import TestCase, override_settings
 from django.utils import timezone
 from facility_profile.models import Facility, MyUser
 
 from morango.constants import transfer_stages, transfer_statuses
 from morango.models.certificates import Filter
-from morango.models.core import DatabaseMaxCounter, Store, SyncSession, TransferSession
+from morango.models.core import Buffer, DatabaseMaxCounter, Store, SyncSession, TransferSession
 from morango.sync.controller import MorangoProfileController
 
 from ..helpers import RecordMaxCounterFactory, StoreFactory
@@ -370,3 +371,63 @@ def test_deferred_clean_fields(self, mock_clean_fields):
         sync_filter = Filter("test")
         f.deferred_clean_fields(exclude=["test1"], sync_filter=sync_filter)
         mock_clean_fields.assert_called_once_with(exclude=["test1"], sync_filter=sync_filter)
+
+
+class AbstractStoreSelfRefOrderValidationTestCase(TestCase):
+    def _store(self, self_ref_order):
+        return Store(
+            id=uuid.uuid4().hex,
+            profile="facilitydata",
+            serialized="{}",
+            deleted=False,
+            hard_deleted=False,
+            last_saved_instance=uuid.uuid4().hex,
+            last_saved_counter=1,
+            partition="partition",
+            source_id="source",
+            model_name="model",
+            _self_ref_order=self_ref_order,
+        )
+
+    def _buffer(self, self_ref_order):
+        sync_session = SyncSession.objects.create(
+            id=uuid.uuid4().hex,
+            profile="facilitydata",
+            last_activity_timestamp=timezone.now(),
+        )
+        transfer_session = TransferSession.objects.create(
+            id=uuid.uuid4().hex,
+            sync_session=sync_session,
+            push=True,
+            last_activity_timestamp=timezone.now(),
+        )
+        return Buffer(
+            transfer_session=transfer_session,
+            model_uuid=uuid.uuid4().hex,
+            profile="facilitydata",
+            serialized="{}",
+            deleted=False,
+            hard_deleted=False,
+            last_saved_instance=uuid.uuid4().hex,
+            last_saved_counter=1,
+            partition="partition",
+            source_id="source",
+            model_name="model",
+            _self_ref_order=self_ref_order,
+        )
+
+    def test_store_self_ref_order_allows_null(self):
+        self._store(None).full_clean()
+
+    def test_store_self_ref_order_rejects_negative(self):
+        store = self._store(-1)
+        with self.assertRaises(ValidationError):
+            store.full_clean()
+
+    def test_buffer_self_ref_order_allows_null(self):
+        self._buffer(None).full_clean()
+
+    def test_buffer_self_ref_order_rejects_negative(self):
+        buffer = self._buffer(-1)
+        with self.assertRaises(ValidationError):
+            buffer.full_clean()