[ENG-11771] - Update current_version_number

addons/osfstorage/models.py

@@ -314,9 +314,6 @@ def serialize(self, include_full=None, version=None):
         version = self.get_version(version)
         earliest_version = self.versions.order_by('created').first()
         ret.update({
-            # Must be the resolved version's own identifier, not versions.count() -- after a
-            # non-latest version is deleted, count() no longer matches any existing identifier,
-            # which breaks osfstorage_download's file_node.get_version(identifier=..., required=True).
             'version': int(version.identifier) if version else 0,
             'md5': version.metadata.get('md5') if version else None,
             'sha256': version.metadata.get('sha256') if version else None,

osf/migrations/0045_alter_fileversion_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.26 on 2026-08-04 13:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osf', '0044_notification_scheduled'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='fileversion',
+            options={'ordering': ('-created', '-id')},
+        ),
+    ]

osf/models/files.py

@@ -883,7 +883,10 @@ def serialize_waterbutler_settings(self, node_id, root_id):
         })
 
     class Meta:
-        ordering = ('-created',)
+        # '-id' is a deterministic tiebreak for versions created within the same instant (e.g. a
+        # version attached directly via add_version() right after another, in the same test/request) --
+        # without it, .first()/.last() on ties is undefined and can flip between identical queries.
+        ordering = ('-created', '-id')
 
 
 class BaseFileVersionsThrough(models.Model):