Add history events 'check out' and 'check in' logging

apps/checkouts/managers.py

@@ -1,22 +1,28 @@
 from __future__ import absolute_import
 
 import datetime
+import logging
+
 from django.db import models
 
 from documents.models import Document
+from history.api import create_history
 
 from .exceptions import DocumentNotCheckedOut
 from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN
+from .events import HISTORY_DOCUMENT_CHECKED_IN
+
+logger = logging.getLogger(__name__)
 
 
 class DocumentCheckoutManager(models.Manager):
-    #TODO: 'check_expiration' method
-    
     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):
-        return Document.objects.filter(pk__in=self.model.objects.filter(expiration_datetime__gt=datetime.datetime.now()).values_list('document__pk', flat=True))
+        expired_list = Document.objects.filter(pk__in=self.model.objects.filter(expiration_datetime__lte=datetime.datetime.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():
@@ -28,13 +34,14 @@ class DocumentCheckoutManager(models.Manager):
         else:
             return False
             
-    def check_in_document(self, document):
+    def check_in_document(self, document, user=None):
         try:
             document_checkout = self.model.objects.get(document=document)
         except self.model.DoesNotExist:
             raise DocumentNotCheckedOut
         else:
-            #create_history(HISTORY_DOCUMENT_DELETED, data={'user': request.user, 'document': document})
+            if user:
+                create_history(HISTORY_DOCUMENT_CHECKED_IN, source_object=document, data={'user': user, 'document': document})
             document_checkout.delete()
             
     def document_checkout_info(self, document):