Fix backend tests

Author: XanderVertegaal

backend/annotation/serializers.py

@@ -7,6 +7,12 @@
 
 
 class KnowledgeBaseAnnotationSerializer(serializers.ModelSerializer):
+    # Mark relationship as required. DRF thinks it is optional since it has a
+    # default value in the model.
+    relationship = serializers.ChoiceField(
+        choices=KnowledgeBaseAnnotation.Relationship.choices,
+        required=True,
+    )
     class Meta:
         model = KnowledgeBaseAnnotation
         fields = [

backend/problem/serializers.py

@@ -194,7 +194,7 @@ class ProblemInputSerializer(serializers.Serializer):
     base = serializers.IntegerField(required=False, allow_null=True)
 
     kbItems = serializers.ListField(
-        child=serializers.DictField(),
+        child=KnowledgeBaseAnnotationSerializer(),
         required=False,
         allow_empty=True,
         help_text="List of knowledge base annotations",

backend/problem/serializers_test.py

@@ -2,7 +2,7 @@
 from rest_framework.exceptions import ValidationError
 
 from .serializers import ProblemInputSerializer
-from .models import Problem, Sentence, KnowledgeBase
+from .models import Problem, Sentence
 
 
 @pytest.fixture
@@ -37,16 +37,6 @@ def non_user_problem(db, hypothesis_sentence, premise_sentence):
     return problem
 
 
-@pytest.fixture
-def kb_item(db, user_problem):
-    return KnowledgeBase.objects.create(
-        problem=user_problem,
-        entity1="e1",
-        entity2="e2",
-        relationship=KnowledgeBase.Relationship.EQUAL,
-    )
-
-
 @pytest.mark.django_db
 def test_valid_create_data():
     """Test valid data for creating a problem."""
@@ -60,15 +50,15 @@ def test_valid_create_data():
 
 
 @pytest.mark.django_db
-def test_valid_update_data(user_problem, kb_item):
+def test_valid_update_data(user_problem):
     """Test valid data for updating a user problem."""
     data = {
         "id": user_problem.pk,
         "premises": ["The cat is on the mat."],
         "hypothesis": "A cat is on a mat.",
         "kbItems": [
             {
-                "id": kb_item.pk,
+                "id": "kb1",
                 "entity1": "e1",
                 "entity2": "e2",
                 "relationship": "equal",