Merge pull request City-of-Helsinki#43 from aapris/master

Fix matko pop/rock Keyword id issue

events/api.py

@@ -609,6 +609,7 @@ def _filter_event_queryset(queryset, params, srs=None):
     # Filter only super or sub events if recurring has value
     val = params.get('recurring', None)
     if val:
+        val = val.lower()
         if val == 'super':
             queryset = queryset.filter(is_recurring_super=True)
         elif val == 'sub':

events/importer/matko.py

@@ -265,10 +265,18 @@ def _import_event_from_feed(self, lang_code, item, events, keyword_matcher):
                 event_types.update(
                     map(lambda x: x.lower(), t.split(",")))
 
+        # Save offers.is_free if 'ilmaistapahtumat' tag is present
+        if 'ilmaistapahtumat' in event_types:
+            if 'offers' not in event:
+                event['offers'] = [recur_dict()]
+            offer = event['offers'][0]
+            offer['is_free'] = True
+
         keywords = []
         for t in event_types:
             # Save original keyword in the raw too
-            _id = 'matko:{}'.format(t)
+            # Note: / in keyword id breaks URL resolver so we replace it with _
+            _id = 'matko:{}'.format(t.replace('/', '_'))
             kwargs = {
                 'id': _id,  # id like matko:konsertti
                 'data_source_id': 'matko',