Merge a6454f7285 into ed9f20823b

rest_framework/tests/relations_nested.py

@@ -9,10 +9,18 @@ class ForeignKeyTarget(models.Model):
     name = models.CharField(max_length=100)
 
 
+class ForeignKeyTargetSource(models.Model):
+    name = models.CharField(max_length=100)
+    target = models.ForeignKey(ForeignKeyTarget, related_name='target_sources')
+
+
 class ForeignKeySource(models.Model):
     name = models.CharField(max_length=100)    
     target = models.ForeignKey(ForeignKeyTarget, related_name='sources')
+    target_source = models.ForeignKey(ForeignKeyTargetSource, related_name='sources')
 
+    class Meta:
+        app_label = 'tests'
     
 class ForeignKeySourceSerializer(serializers.ModelSerializer):
     class Meta:
@@ -25,6 +33,11 @@ class FlatForeignKeySourceSerializer(serializers.ModelSerializer):
         model = ForeignKeySource
 
 
+class FlatForeignKeyTargetSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ForeignKeyTarget
+
+
 class ForeignKeyTargetSerializer(serializers.ModelSerializer):
     sources = FlatForeignKeySourceSerializer()
 
@@ -32,6 +45,48 @@ class ForeignKeyTargetSerializer(serializers.ModelSerializer):
         model = ForeignKeyTarget
 
 
+class ForeignKeyTargetSourceSerializer1(serializers.ModelSerializer):
+    sources = FlatForeignKeySourceSerializer()
+
+    class Meta:
+        model = ForeignKeyTargetSource
+
+
+class ForeignKeyTargetSourceSerializer2(serializers.ModelSerializer):
+    target = FlatForeignKeyTargetSerializer()
+
+    class Meta:
+        model = ForeignKeyTargetSource
+
+
+class ReverseReverseSerializer(serializers.ModelSerializer):
+    target_sources = ForeignKeyTargetSourceSerializer1()
+
+    class Meta:
+        model = ForeignKeyTarget        
+
+
+class ReverseForwardSerializer(serializers.ModelSerializer):
+    sources = ForeignKeySourceSerializer()
+
+    class Meta:
+        model = ForeignKeyTargetSource
+
+
+class ForwardForwardSerializer(serializers.ModelSerializer):
+    target_sources = ForeignKeyTargetSourceSerializer2()
+
+    class Meta:
+        model = ForeignKeySource
+
+
+class ForwardReverseSerializer(serializers.ModelSerializer):
+    target = ForeignKeyTargetSerializer()
+
+    class Meta:
+        model = ForeignKeyTargetSource
+    
+
 # Nullable ForeignKey
 
 class NullableForeignKeySource(models.Model):
@@ -46,16 +101,23 @@ class NullableForeignKeySourceSerializer(serializers.ModelSerializer):
         model = NullableForeignKeySource
 
 
-class ReverseForeignKeyTests(TestCase):
+class NestedForeignKeyTests(TestCase):
     def setUp(self):
         target = ForeignKeyTarget(name='target-1')
         target.save()
         new_target = ForeignKeyTarget(name='target-2')
         new_target.save()
+        target_source = ForeignKeyTargetSource(name='target-source-1', target=target)
+        target_source.save()
+        new_target_source = ForeignKeyTargetSource(name='target-source-2', target=target)
+        new_target_source.save()
         for idx in range(1, 4):
-            source = ForeignKeySource(name='source-%d' % idx, target=target)
+            import pdb
+            pdb.set_trace()
+            source = ForeignKeySource(name='source-%d' % idx, target=target, target_source=target_source)
             source.save()
             
+
     def test_foreign_key_retrieve(self):
         queryset = ForeignKeySource.objects.all()
         serializer = ForeignKeySourceSerializer(queryset)
@@ -80,6 +142,25 @@ class ReverseForeignKeyTests(TestCase):
         ]
         self.assertEquals(serializer.data, expected)
 
+    def test_reverse_foreign_key_create(self):
+        target = ForeignKeyTarget.objects.get(name='target-2')
+        # The value for target here should be ignored
+        data = {'sources': [{'name': u'source-4', 'target': 1},
+                            {'name': u'source-5', 'target': 1}],
+                'name': u'target-2'
+                }
+        expected = {'sources': [{'id': 4, 'name': u'source-4', 'target': 2},
+                                {'id': 5, 'name': u'source-5', 'target': 2}],
+                    'id': 2, 'name': u'target-2'
+                    }
+        serializer = ForeignKeyTargetSerializer(target, data=data)
+        self.assertTrue(serializer.is_valid())
+        serializer.save()
+        # Ensure target 2 has new source and everything else is as expected
+        target = ForeignKeyTarget.objects.get(name='target-2')
+        serializer = ForeignKeyTargetSerializer(target)
+        self.assertEquals(serializer.data, expected)
+
 
 class NestedNullableForeignKeyTests(TestCase):
     def setUp(self):