Sort the manager methods of the checkouts app.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>

mayan/apps/checkouts/managers.py

@@ -19,37 +19,13 @@ logger = logging.getLogger(__name__)
 
 
 class DocumentCheckoutManager(models.Manager):
-    def checkout_document(self, document, expiration_datetime, user, block_new_version=True):
+    def are_document_new_versions_allowed(self, document, user=None):
-        return self.create(
+        try:
-            document=document, expiration_datetime=expiration_datetime,
+            checkout_info = self.document_checkout_info(document)
-            user=user, block_new_version=block_new_version
+        except DocumentNotCheckedOut:
-        )
-
-    def checked_out_documents(self):
-        return Document.objects.filter(
-            pk__in=self.model.objects.all().values_list(
-                'document__pk', flat=True
-            )
-        )
-
-    def expired_check_outs(self):
-        expired_list = Document.objects.filter(
-            pk__in=self.model.objects.filter(
-                expiration_datetime__lte=now()
-            ).values_list('document__pk', flat=True)
-        )
-        logger.debug('expired_list: %s', expired_list)
-        return expired_list
-
-    def check_in_expired_check_outs(self):
-        for document in self.expired_check_outs():
-            document.check_in()
-
-    def is_document_checked_out(self, document):
-        if self.model.objects.filter(document=document):
             return True
         else:
-            return False
+            return not checkout_info.block_new_version
 
     def check_in_document(self, document, user=None):
         try:
@@ -69,6 +45,23 @@ class DocumentCheckoutManager(models.Manager):
 
             document_checkout.delete()
 
+    def check_in_expired_check_outs(self):
+        for document in self.expired_check_outs():
+            document.check_in()
+
+    def checkout_document(self, document, expiration_datetime, user, block_new_version=True):
+        return self.create(
+            document=document, expiration_datetime=expiration_datetime,
+            user=user, block_new_version=block_new_version
+        )
+
+    def checked_out_documents(self):
+        return Document.objects.filter(
+            pk__in=self.model.objects.all().values_list(
+                'document__pk', flat=True
+            )
+        )
+
     def document_checkout_info(self, document):
         try:
             return self.model.objects.get(document=document)
@@ -81,13 +74,14 @@ class DocumentCheckoutManager(models.Manager):
         else:
             return STATE_CHECKED_IN
 
-    def are_document_new_versions_allowed(self, document, user=None):
+    def expired_check_outs(self):
-        try:
+        expired_list = Document.objects.filter(
-            checkout_info = self.document_checkout_info(document)
+            pk__in=self.model.objects.filter(
-        except DocumentNotCheckedOut:
+                expiration_datetime__lte=now()
-            return True
+            ).values_list('document__pk', flat=True)
-        else:
+        )
-            return not checkout_info.block_new_version
+        logger.debug('expired_list: %s', expired_list)
+        return expired_list
 
     def get_by_natural_key(self, document_natural_key):
         Document = apps.get_model(
@@ -100,14 +94,17 @@ class DocumentCheckoutManager(models.Manager):
 
         return self.get(document__pk=document.pk)
 
+    def is_document_checked_out(self, document):
+        if self.model.objects.filter(document=document):
+            return True
+        else:
+            return False
+
 
 class NewVersionBlockManager(models.Manager):
     def block(self, document):
         self.get_or_create(document=document)
 
-    def unblock(self, document):
-        self.filter(document=document).delete()
-
     def is_blocked(self, document):
         return self.filter(document=document).exists()
 
@@ -121,3 +118,6 @@ class NewVersionBlockManager(models.Manager):
             raise self.model.DoesNotExist
 
         return self.get(document__pk=document.pk)
+
+    def unblock(self, document):
+        self.filter(document=document).delete()