Merge pull request #3826 from nickmango/revert/latest-signature

Revert fetching latest signature
communitybridge · Mar 2, 2023 · 3859d4b · 3859d4b
2 parents 4128212 + ed9bf70
commit 3859d4b
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/cla-backend/cla/models/dynamo_models.py b/cla-backend/cla/models/dynamo_models.py
@@ -1898,18 +1898,15 @@ def get_latest_signature(self, project_id, company_id=None, signature_signed=Non
                                               signature_signed=signature_signed, signature_approved=signature_approved)
         latest = None
         for signature in signatures:
-            if signature.get_signature_approved() and signature.get_signature_signed():
+            if latest is None:
+                latest = signature
+            elif signature.get_signature_document_major_version() > latest.get_signature_document_major_version():
+                latest = signature
+            elif (
+                    signature.get_signature_document_major_version() == latest.get_signature_document_major_version()
+                    and signature.get_signature_document_minor_version() > latest.get_signature_document_minor_version()
+            ):
                 latest = signature
-                break
-            # if latest is None:
-            #     latest = signature
-            # elif signature.get_signature_document_major_version() > latest.get_signature_document_major_version():
-            #     latest = signature
-            # elif (
-            #         signature.get_signature_document_major_version() == latest.get_signature_document_major_version()
-            #         and signature.get_signature_document_minor_version() > latest.get_signature_document_minor_version()
-            # ):
-            #     latest = signature
 
         if latest is None:
             cla.log.debug(