Changeset 13318 for main

Timestamp:

14 Oct 2015, 13:15:03 (9 years ago)

Author:

Henrik Bettermann

Message:

Log bed release already in releaseExpiredAllocations method.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/hostels

Files:

• container.py (modified) (1 diff)
• hostel.py (modified) (2 diffs)
• tests.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/hostels/container.py

@@ -60 +60 @@
         cat = queryUtility(ICatalog, name='beds_catalog')
         results = cat.searchResults(owner=(None, None))
-        counter = 0
+        released = []
         for bed in results:
-            success = bed.releaseBedIfMaintenanceNotPaid(n=n)
-            if success:
-                counter += 1
-        return counter
+            student_id = bed.releaseBedIfMaintenanceNotPaid(n=n)
+            if student_id:
+                released.append('%s (%s)' % (bed.bed_id,student_id))
+        if len(released):
+            message = ', '.join(released)
+            self.writeLogMessage(self, 'released: %s' % message)
+        return released
 
     @property

main/waeup.kofa/trunk/src/waeup/kofa/hostels/hostel.py

@@ -285 +285 @@
         days_ago = getattr(jetzt - bedticket.booking_date, 'days')
         if days_ago > n:
+            old_owner = self.owner
             self.owner = NOT_OCCUPIED
             notify(grok.ObjectModifiedEvent(self))
@@ -292 +293 @@
             bedticket.bed_coordinates = u'-- booking expired (%s) --' % (
                 timestamp,)
-            return True
+            return old_owner
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

@@ -192 +192 @@
         self.assertEqual(len(results), 1)
         released = self.app['hostels'].releaseExpiredAllocations(7)
-        self.assertEqual(released, 0)
+        self.assertEqual(released, [])
         delta = timedelta(days=10)
         bedticket.booking_date = datetime.utcnow() - delta
         released = self.app['hostels'].releaseExpiredAllocations(7)
-        self.assertEqual(released, 1)
+        self.assertEqual(len(released), 1)
+        self.assertEqual(released, ['hall_block_room_bed (K1000000)'])
         results = cat.searchResults(owner=(self.student_id, self.student_id))
         self.assertEqual(len(results), 0)
@@ -204 +205 @@
             self.app['hostels']['hall-x']['hall_block_room_bed'].owner,
             NOT_OCCUPIED)
+        # Releasing is logged.
+        logcontent = open(self.logfile).read()
+        self.assertTrue(
+            'hostels.container.HostelsContainer - hostels - '
+            'released: hall_block_room_bed (K1000000)'
+            in logcontent)
         return