Use OrderedDict for r25 lists

Author: btb

mazevo_r25/management/commands/r25_mazevo.py

@@ -170,7 +170,7 @@ def handle(self, *args, **options):
             **reservation_search, category_id="+".join(
                 settings.MAZEVO_R25_CATEGORIES_UNLISTED))
 
-        unlisted_event_ids = dict(unlisted_events).keys()
+        unlisted_event_ids = unlisted_events.keys()
 
         paginate = "T"
         page = 1

mazevo_r25/models.py

@@ -19,7 +19,7 @@ def room_names(cls):
 
     @cachedclassproperty
     def space_names(cls):
-        return dict(get_space_list())
+        return get_space_list()
 
     room_id = models.PositiveIntegerField(primary_key=True)
     space_id = models.PositiveIntegerField(unique=True, null=True, default=None)
@@ -53,7 +53,7 @@ def status_names(cls):
 
     @cachedclassproperty
     def event_type_names(cls):
-        return dict(get_event_type_list(all_types="T"))
+        return get_event_type_list(all_types="T")
 
     ACTION_IGNORE = "ignore"
     ACTION_REMOVE = "remove"

mazevo_r25/more_r25.py

@@ -1,3 +1,4 @@
+from collections import OrderedDict
 import json
 import logging
 from lxml import etree
@@ -577,19 +578,14 @@ def get_event_list(**kwargs):
 
 
 def list_items_from_xml(tree):
-    items = []
+    items = OrderedDict()
     for node in tree.xpath("//r25:item", namespaces=nsmap):
-        item = list_item_from_xml(node)
-        items.append(item)
+        id = int(node.xpath("r25:id", namespaces=nsmap)[0].text)
+        name = node.xpath("r25:name", namespaces=nsmap)[0].text
+        items[id] = name
     return items
 
 
-def list_item_from_xml(tree):
-    id = int(tree.xpath("r25:id", namespaces=nsmap)[0].text)
-    name = tree.xpath("r25:name", namespaces=nsmap)[0].text
-    return (id, name)
-
-
 class Object(models.Model):
     EVENT_TYPE = 1
     ORGANIZATION_TYPE = 2

mazevo_r25/tests/test_more_r25.py

@@ -16,7 +16,7 @@ def test_get_space_by_short_name(self):
         self.assertEqual(space.space_id, "1001")
 
     def test_get_space_list(self):
-        spaces = get_space_list()
+        spaces = list(get_space_list().items())
         self.assertEqual(len(spaces), 3)
         space = spaces[2]
         self.assertEqual(len(space), 2)