Handling revision separately and only if attributes are changed

admin/templates/resource/custom-list.html

@@ -451,7 +451,7 @@ <h3 class="mb-6 text-xl font-medium text-gray-900">Edit Receipt</h3>
                     <h3 class="mb-6 text-2xl font-medium text-gray-900">Edit History</h3>
                     {% for version in resource.versions %}
                         <div class="mb-4">
-                            <div class="text-lg">Version {{loop.index}}</div>
+                            <div class="text-lg">Version {{loop.revindex}}</div>
                             <div class="text-sm text-gray-700">{{version.created_at | admin_format_datetime(format="%d/%m/%Y, %I:%M %p") }}</div>
                         </div>
                         <div class="flex flex-wrap">

admin/views.py

@@ -848,35 +848,6 @@ def resource_edit(resource_type, resource_id):
             editable_relations=editable_relations,
         )
 
-    if (
-        hasattr(resource_class, "revisions")
-        and hasattr(resource_class, "revision_model")
-        and resource_class.revisions
-    ):
-        revision_model = resource_class.revision_model
-        revision_pk = resource_class.revision_pk
-
-        cloned_attributes_to_save = {}
-        for column, value in resource.__dict__.items():
-            if column in [
-                "_sa_instance_state",
-                "created_at",
-                "updated_at",
-                "promised_token",
-                "token_amount",
-            ]:
-                continue
-
-            if column == "id":
-                cloned_attributes_to_save[revision_pk] = value
-                continue
-
-            cloned_attributes_to_save[column] = value
-
-        cloned_resource = revision_model(**cloned_attributes_to_save)
-        db.session.add(cloned_resource)
-        db.session.commit()
-
     for attribute in editable_attributes:
         if attribute["name"] in request.form:
             attribute_value = request.form.get(attribute["name"])
@@ -923,6 +894,12 @@ def resource_edit(resource_type, resource_id):
     db.session.add(resource)
     db.session.commit()
 
+    handle_resource_revision(
+        resource_class=resource_class,
+        old_resource=old_resource,
+        new_resource=resource,
+    )
+
     # call after update hook
     if hasattr(resource_class, "after_update_callback"):
         resource_class.after_update_callback(resource, old_resource)
@@ -1231,3 +1208,53 @@ def update_receipt_status():
     response = update_approval_status(current_user)
 
     return response
+
+
+def handle_resource_revision(resource_class, old_resource, new_resource):
+    if (
+        hasattr(resource_class, "revisions")
+        and hasattr(resource_class, "revision_model")
+        and resource_class.revisions
+    ):
+        revision_model = resource_class.revision_model
+        revision_pk = resource_class.revision_pk
+
+        # check if resource has been edited then only create the revision
+        is_modified = False
+        for column, value in old_resource.__dict__.items():
+            if column in [
+                "id",
+                "_sa_instance_state",
+                "created_at",
+                "updated_at",
+            ]:
+                continue
+
+            if getattr(old_resource, column) != getattr(new_resource, column):
+                is_modified = True
+                break
+
+        if not is_modified:
+            return
+
+        cloned_attributes_to_save = {}
+        for column, value in old_resource.__dict__.items():
+            if column in [
+                "_sa_instance_state",
+                "created_at",
+                "updated_at",
+            ]:
+                continue
+
+            if column == "id":
+                cloned_attributes_to_save[revision_pk] = value
+                continue
+
+            cloned_attributes_to_save[column] = value
+
+        if current_user and "edited_by" in revision_model.__table__.columns:
+            cloned_attributes_to_save["edited_by"] = current_user.id
+
+        cloned_resource = revision_model(**cloned_attributes_to_save)
+        db.session.add(cloned_resource)
+        db.session.commit()