type removal migration and filters for relations

api/nodes/migrations/0004_remove_node_type_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.0.4 on 2022-08-07 02:52
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nodes', '0003_remove_node_parents'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='node',
+            name='type',
+        ),
+        migrations.AlterField(
+            model_name='proposedrelationship',
+            name='from_node',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='to_nodes', to='nodes.node'),
+        ),
+        migrations.AlterField(
+            model_name='proposedrelationship',
+            name='to_node',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='from_nodes', to='nodes.node'),
+        ),
+    ]

api/nodes/models/node.py

@@ -45,14 +45,12 @@ class Meta:
     created_by = models.ForeignKey(User, related_name='proposed_relationships', on_delete=models.CASCADE)
 
     def __str__(self):
-        return f'{self.from_node} {self.type} {self.to_node}'
+        return f'{self.from_node} {self.to_node}'
 
     def save(self, *args, **kwargs):
         if self.from_node == self.to_node:
             raise ValueError('Cannot create relationship between a node and itself')
         if self.from_node.from_nodes.filter(to_node=self.to_node).exists():
             raise ValueError('Relationship already exists')
-        if self.from_node.type == self.to_node.type:
-            raise ValueError('Cannot create relationship between same type nodes')
         super().save(*args, **kwargs)
 

api/nodes/serializers/node.py

@@ -32,20 +32,6 @@ class Meta:
         fields = ('id', 'from_node', 'to_node', 'created_by')
 
 
-class ReadProposedFromRelationshipSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = ProposedRelationship
-        fields = ('id', 'from_node', 'created_by')
-
-
-class ReadProposedToRelationshipSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = ProposedRelationship
-        fields = ('id', 'to_node', 'created_by')
-
-
 class DescribeNodeSerializer(serializers.ModelSerializer):
 
     created_by = UserSerializer(read_only=True)
@@ -62,6 +48,24 @@ class Meta:
         fields = ('id', 'created_by', 'content', 'private', 'feed', 'parents_count', 'children_count')
 
 
+class ReadProposedFromRelationshipSerializer(serializers.ModelSerializer):
+
+    from_node = ListNodeSerializer()
+
+    class Meta:
+        model = ProposedRelationship
+        fields = ('id', 'from_node', 'created_by')
+
+
+class ReadProposedToRelationshipSerializer(serializers.ModelSerializer):
+
+    to_node = ListNodeSerializer()
+
+    class Meta:
+        model = ProposedRelationship
+        fields = ('id', 'to_node', 'created_by')
+
+
 class DescribeProposedRelationshipSerializer(serializers.ModelSerializer):
 
     from_node = ListNodeSerializer()

api/nodes/views/node.py

@@ -8,7 +8,9 @@
 
 from api.nodes.models import Node, ProposedRelationship
 from api.nodes.serializers import (
-    ListNodeSerializer, DescribeProposedRelationshipSerializer, WriteProposedRelationshipSerializer, DescribeNodeSerializer, WriteNodeSerializer
+    ListNodeSerializer, ReadProposedFromRelationshipSerializer,
+    ReadProposedToRelationshipSerializer, DescribeProposedRelationshipSerializer,
+    WriteProposedRelationshipSerializer, DescribeNodeSerializer, WriteNodeSerializer,
 )
 
 
@@ -33,11 +35,18 @@ def get_serializer_class(self):
             return WriteProposedRelationshipSerializer
         if self.action == 'retrieve':
             return DescribeProposedRelationshipSerializer
+        if self.action in ['list']:
+            if self.request.query_params.get('from_node'):
+                return ReadProposedFromRelationshipSerializer
+            if self.request.query_params.get('to_node'):
+                return ReadProposedToRelationshipSerializer
         return super().get_serializer_class()
 
     def get_queryset(self, **kwargs):
-        print("kwargs", kwargs)
-        if 'node' in kwargs:
+        if 'from_node' in kwargs:
             self.node = get_object_or_404(Node, id=kwargs['node'])
-            return ProposedRelationship.objects.filter(Q(from_node=self.node) | Q(to_node=self.node))
+            return ProposedRelationship.objects.filter(from_node=self.node)
+        if 'to_node' in kwargs:
+            self.node = get_object_or_404(Node, id=kwargs['node'])
+            return ProposedRelationship.objects.filter(to_node=self.node)
         return ProposedRelationship.objects.all()