Merge pull request #59 from dgadling/master

Fix the relatedTo Query operator

parse_rest/datatypes.py

@@ -60,6 +60,11 @@ class ParseType(object):
             ParseResource: Pointer
         }
 
+        if hasattr(python_object, '__iter__'):
+            # It's an iterable? Repeat this whole process on each object
+            return [ParseType.convert_to_parse(o, as_pointer=as_pointer)
+                    for o in python_object]
+
         if python_type in transformation_map:
             klass = transformation_map.get(python_type)
             return klass(python_object)._to_native()

parse_rest/query.py

@@ -126,7 +126,7 @@ class Queryset(object):
             if operator is None:
                 q._where[attr] = parse_value
             elif operator == 'relatedTo':
-                q._where['$' + operator] = parse_value
+                q._where['$' + operator] = {'object': parse_value, 'key': attr}
             else:
                 if not isinstance(q._where[attr], dict):
                     q._where[attr] = {}

parse_rest/tests.py

@@ -59,6 +59,14 @@ class GameScore(Object):
     pass
 
 
+class GameMap(Object):
+    pass
+
+
+class GameMode(Object):
+    pass
+
+
 class City(Object):
     pass
 
@@ -348,6 +356,32 @@ class TestQuery(unittest.TestCase):
         self.assertEqual(GameScore.Query.filter(createdAt__lte=tomorrow).count(), 5,
                          'Could not make inequality comparison with dates')
 
+    def testRelations(self):
+        """Make some maps, make a Game Mode that has many maps, find all maps
+        given a Game Mode"""
+        maps = [GameMap(name="map " + i) for i in ['a', 'b', 'c', 'd']]
+        ParseBatcher().batch_save(maps)
+
+        gm = GameMode(name='test mode')
+        gm.save()
+        gm.addRelation("maps", GameMap.__name__, [m.objectId for m in maps])
+
+        modes = GameMode.Query.all()
+        self.assertEqual(len(modes), 1)
+        mode = modes[0]
+        maps_for_mode = GameMap.Query.filter(maps__relatedTo=mode)
+        self.assertEqual(len(maps_for_mode), 4)
+
+        gm.delete()
+        ParseBatcher().batch_delete(maps)
+
+    def testQueryByRelated(self):
+        game_scores_direct = GameScore.Query.filter(game=self.game)
+        self.assertTrue(len(game_scores_direct) > 0)
+
+        game_scores_in = GameScore.Query.filter(game__in=[self.game])
+        self.assertEqual(len(game_scores_in), len(game_scores_direct))
+
 
 class TestFunction(unittest.TestCase):
     def setUp(self):