api: don't override next version with new draft

invenio_drafts_resources/records/api.py

@@ -214,10 +214,10 @@ def edit(cls, record):
                 # Note, other values like bucket_id values was kept in the
                 # soft-deleted record, so we are not setting them again here.
         except NoResultFound:
-            # If a draft was ever force deleted, then we will create the draft.
-            # This is a very exceptional case as normally, when we edit a
-            # record then the soft-deleted draft exists and we are in above
-            # case.
+            # If a draft was ever force deleted, then we re-create it.
+            # A classic scenario for this case is editing a published record
+            # after enough time has passed for its original draft to have
+            # been cleaned up. It then needs to be recreated.
             draft = cls.create(
                 {},
                 # A draft to edit a record must share the id and uuid.

invenio_drafts_resources/records/systemfields/versions.py

@@ -209,8 +209,8 @@ def post_create(self, record):
         # The parent record is created on pre_create.
         versions = self.obj(record)
         if self._create and self._set_next:
-            # if fork is none - it's a new?
-            versions.set_next()
+            if not record.is_published:
+                versions.set_next()
         elif self._create and self._set_latest:
             versions.set_latest()
 

tests/records/test_api.py

@@ -7,6 +7,7 @@
 # details.
 
 """Data access layer tests."""
+from datetime import timedelta
 
 import pytest
 from invenio_search import current_search_client
@@ -133,6 +134,35 @@ def test_draft_parent_state_hard_delete(app, db, location):
     assert RecordMetadata.query.count() == 0
 
 
+def test_new_draft_of_published_record_doesnt_override_next_draft_id(app, db, location):
+    """Test multiple drafts when editing multiple versions of the same record."""
+    # Classic draft of published record having been cleaned up scenario
+    record_1 = Record.publish(Draft.create({}))
+    db.session.commit()
+    Draft.cleanup_drafts(timedelta(0))
+
+    # Wider test for any situation where draft of record doesn't exist anymore
+    # e.g. admin force deletion
+    parent = ParentRecord.create({})
+    record_2 = Record.create({}, parent=parent)
+    record_2.register()
+
+    db.session.commit()
+
+    for record in [record_1, record_2]:
+        # Create new_version before a record's draft exists
+        new_version_draft = Draft.new_version(record)
+        db.session.commit()
+        assert record.versions.next_draft_id == new_version_draft.id
+        assert record.versions.latest_id == record.id
+
+        # Check next_draft_id still holds after edit
+        Draft.edit(record)
+        db.session.commit()
+        assert record.versions.next_draft_id == new_version_draft.id
+        assert record.versions.latest_id == record.id
+
+
 def test_draft_parent_state_hard_delete_with_parent(app, db, location):
     """Test force deletion of a draft."""
     # Initial state: A previous reccord version exists, in addition to draft