Adapt tests with person type

Author: Joel-Luca

app/tests/custom_fields/test_custom_field_base_manager.py

@@ -5,10 +5,12 @@
 from django.contrib.contenttypes.models import ContentType
 
 from app.models import Person
+from app.models import PersonType
 from app.tests import APITestCase
 from app.tests.custom_fields.factories import CustomFieldFactory
 from app.tests.custom_fields.factories import CustomValueFactory
 from app.tests.factories import PersonFactory
+from app.tests.factories import PersonTypeFactory
 from django_features.custom_fields.models import CustomField
 
 
@@ -18,7 +20,9 @@ class CustomFieldBaseModelManagerTest(APITestCase):
 
     def setUp(self) -> None:
         self.person_ct = ContentType.objects.get_for_model(Person)
-        self.person: Person = PersonFactory()  # type: ignore
+        self.person_type_1: PersonType = PersonTypeFactory()  # type: ignore
+        self.person_type_2: PersonType = PersonTypeFactory()  # type: ignore
+        self.person: Person = PersonFactory(person_type=self.person_type_1)  # type: ignore
 
     def test_custom_field_base_manager_annotate_custom_field_keys(self) -> None:
         CustomFieldFactory(identifier="birthday", content_type=self.person_ct)
@@ -27,6 +31,20 @@ def test_custom_field_base_manager_annotate_custom_field_keys(self) -> None:
             ["birthday", "hobby"], Person.objects.first().custom_field_keys
         )
 
+    def test_custom_field_base_manager_annotate_only_type_specific_fields(self) -> None:
+        CustomFieldFactory(
+            identifier="birthday",
+            content_type=self.person_ct,
+            type_object=self.person_type_1,
+        )
+        CustomFieldFactory(
+            identifier="hobby",
+            content_type=self.person_ct,
+            type_object=self.person_type_2,
+        )
+        self.person.refresh_with_custom_fields()
+        self.assertEqual(["birthday"], Person.objects.first().custom_field_keys)
+
     def test_custom_field_base_manager_annotate_char_value(self) -> None:
         field = CustomFieldFactory(
             identifier="char_value",

app/tests/custom_fields/test_custom_field_base_model.py

@@ -5,10 +5,12 @@
 from django.contrib.contenttypes.models import ContentType
 
 from app.models import Person
+from app.models import PersonType
 from app.tests import APITestCase
 from app.tests.custom_fields.factories import CustomFieldFactory
 from app.tests.custom_fields.factories import CustomValueFactory
 from app.tests.factories import PersonFactory
+from app.tests.factories import PersonTypeFactory
 from django_features.custom_fields.models import CustomField
 from django_features.custom_fields.models import CustomValue
 
@@ -19,7 +21,11 @@ class CustomFieldBaseModelTest(APITestCase):
 
     def setUp(self) -> None:
         self.person_ct = ContentType.objects.get_for_model(Person)
-        self.person: Person = PersonFactory()  # type: ignore
+        self.person_type: PersonType = PersonTypeFactory()  # type: ignore
+        self.person: Person = PersonFactory(person_type=self.person_type)  # type: ignore
+
+    def test_custom_field_base_model_custom_field_type_model(self) -> None:
+        self.assertEqual(PersonType, Person.objects.get_type_model())
 
     def test_custom_field_base_model_set_char_value(self) -> None:
         CustomFieldFactory(