Changeset 13483 for main

Timestamp:

19 Nov 2015, 10:24:46 (9 years ago)

Author:

Henrik Bettermann

Message:

Add some basic and customizable components for the calculation of hostels statistics.

Location:

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

Files:

• container.py (modified) (2 diffs)
• interfaces.py (modified) (3 diffs)
• tests.py (modified) (5 diffs)
• utils.py (added)

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

@@ -23 +23 @@
 from datetime import datetime
 from zope.catalog.interfaces import ICatalog
-from zope.component import queryUtility
-from waeup.kofa.hostels.interfaces import IHostelsContainer, IHostel
+from zope.component import queryUtility, getUtility, ComponentLookupError
+from waeup.kofa.hostels.interfaces import (
+    IHostelsContainer, IHostel, IHostelsUtils)
 from waeup.kofa.utils.logger import Logger
 from waeup.kofa.utils.helpers import attrs_to_fields
@@ -79 +80 @@
         return False
 
+    @property
+    def statistics(self):
+        try:
+          statistics = getUtility(
+              IHostelsUtils).getBedStatistics()
+        except ComponentLookupError:  # happens in unit tests
+            return
+        return statistics
+
     logger_name = 'waeup.kofa.${sitename}.hostels'
     logger_filename = 'hostels.log'

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

@@ -20 +20 @@
 from zope.component import getUtility
 from zope.catalog.interfaces import ICatalog
-from zope.interface import invariant, Invalid, Attribute
+from zope.interface import invariant, Invalid, Attribute, Interface
 from zope import schema
 from waeup.kofa.interfaces import (
@@ -43 +43 @@
 
     expired = Attribute('True if current datetime is in application period.')
+    statistics = Attribute('Bed category statistics')
 
     startdate = schema.Datetime(
@@ -295 +296 @@
         """Add an INFO message to hostels.log.
         """
+
+class IHostelsUtils(Interface):
+    """A collection of methods which are subject to customization.
+    """
+
+    def getBedStatistics():
+        """Return bed statistics.
+        """

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

@@ -31 +31 @@
 from zope.security.interfaces import Unauthorized
 from zope.catalog.interfaces import ICatalog
-from zope.component import queryUtility
+from zope.component import queryUtility, getUtility
 from waeup.kofa.app import University
 from waeup.kofa.hostels.interfaces import (
-    IHostelsContainer, IHostel, IBed)
+    IHostelsContainer, IHostel, IBed, IHostelsUtils)
 from waeup.kofa.hostels.vocabularies import NOT_OCCUPIED
 from waeup.kofa.hostels.container import HostelsContainer
@@ -162 +162 @@
         bed.bed_id = u'hall_block_room_bed'
         bed.bed_number = 1
-        bed.bed_type = u'a_b_c'
+        bed.bed_type = u'regular_male_fr'
         self.app['hostels'][hostel.hostel_id][bed.bed_id] = bed
 
@@ -230 +230 @@
         return
 
+    def test_bed_statistics(self):
+        utils = getUtility(IHostelsUtils)
+        self.app['hostels']['hall-x'][
+            'hall_block_room_bed'].owner = NOT_OCCUPIED
+        notify(grok.ObjectModifiedEvent(
+            self.app['hostels']['hall-x']['hall_block_room_bed']))
+        stats = utils.getBedStatistics()
+        self.assertEqual(stats,
+            {'regular_male_fr': (1, 1),
+             'regular_female_fi': (0, 0),
+             'regular_male_re': (0, 0),
+             'regular_female_fr': (0, 0),
+             'regular_female_all': (0, 0),
+             'regular_female_re': (0, 0),
+             'regular_male_fi': (0, 0),
+             'regular_male_all': (0, 0)}
+             )
+        self.app[
+            'hostels']['hall-x']['hall_block_room_bed'].owner = self.student_id
+        notify(grok.ObjectModifiedEvent(
+            self.app['hostels']['hall-x']['hall_block_room_bed']))
+        stats = utils.getBedStatistics()
+        self.assertEqual(stats,
+            {'regular_male_fr': (0, 1),
+             'regular_female_fi': (0, 0),
+             'regular_male_re': (0, 0),
+             'regular_female_fr': (0, 0),
+             'regular_female_all': (0, 0),
+             'regular_female_re': (0, 0),
+             'regular_male_fi': (0, 0),
+             'regular_male_all': (0, 0)}
+             )
+
 class BedCatalogTests(HostelsFullSetup):
 
@@ -242 +275 @@
         # We can find a certain bed
         cat = queryUtility(ICatalog, name='beds_catalog')
-        results = cat.searchResults(bed_type=(u'a_b_c', u'a_b_c'))
+        results = cat.searchResults(
+            bed_type=(u'regular_male_fr', u'regular_male_fr'))
         results = [x for x in results] # Turn results generator into list
         assert len(results) == 1
@@ -531 +565 @@
             result,
             'bed_id,bed_number,bed_type,owner,hall,block,room,bed,'
-            'special_handling,sex,bt\r\nhall_block_room_bed,1,a_b_c,,'
-            'hall,block,room,bed,a,b,c\r\n'
+            'special_handling,sex,bt\r\nhall_block_room_bed,1,regular_male_fr,,'
+            'hall,block,room,bed,regular,male,fr\r\n'
             )
         return