fix tests

clients/serializers.py

@@ -10,7 +10,7 @@ class Meta:
 
 
 class ClientSerializer(serializers.ModelSerializer[Client]):
-    director_position: serializers.CharField = serializers.CharField()
+    director_position = DirectorPositionSerializer()
     destination_city: serializers.CharField = serializers.CharField()
     railway_station: serializers.CharField = serializers.CharField()
 

clients/tests/conftest.py

@@ -9,56 +9,45 @@
 
 @pytest.fixture
 def director_position_object(faker):
-    return DirectorPosition.objects.create(id=faker.pyint(), director_position=faker.pystr())
+    return DirectorPosition.objects.create(director_position=faker.word())
 
 
 @pytest.fixture
 def destination_city_object(faker):
-    return City.objects.create(
-        id=faker.pyint(),
-        city=faker.city(),
-        region=faker.pystr(),
-    )
+    return City.objects.create(city=faker.city(), region=faker.word())
 
 
 @pytest.fixture
 def railway_station_object(faker):
-    return RailwayStation.objects.create(
-        id=faker.pyint(),
-        station_name=faker.pystr(),
-        station_id=faker.pyint(),
-        station_branch=faker.pystr(),
-    )
+    return RailwayStation.objects.create(station_name=faker.word(), station_branch=faker.word(),
+                                         station_id=faker.random_int())
 
 
 @pytest.fixture
-def clients_object(
-    director_position_object, destination_city_object, railway_station_object, user, faker
-):
+def clients_object(director_position_object, destination_city_object, railway_station_object, user,
+                   faker):
     return Client.objects.create(
-        id=faker.pyint(),
         client_name=faker.company(),
-        contract_number=faker.pystr(),
+        contract_number=faker.word(),
         contract_date=faker.date(),
         director_position=director_position_object,
         director_name=faker.last_name(),
         destination_city=destination_city_object,
         railway_station=railway_station_object,
         receiver_name=faker.company(),
-        receiver_id=faker.pyint(),
-        receiver_okpo=faker.pyint(),
+        receiver_id=faker.random_int(),
+        receiver_okpo=faker.random_int(),
         receiver_adress=faker.address(),
-        special_marks=faker.pystr(),
-        last_application_number=faker.pystr(),
+        special_marks=faker.text(),
+        last_application_number=faker.word(),
         user=user,
     )
 
 
 @pytest.fixture
 def user(faker):
-    return CustomUser.objects.create_user(
-        email=faker.email(), full_name=faker.name(), password=faker.password()
-    )
+    return CustomUser.objects.create_user(email=faker.email(), full_name=faker.name(),
+                                          password=faker.password())
 
 
 @pytest.fixture

clients/tests/test_serializers_clients.py

@@ -41,7 +41,7 @@ def test__client_serializer__create_object_valid_director_position(
     clients_object,
 ):
     serializer_data = ClientSerializer(clients_object).data
-    assert serializer_data["director_position"] == director_position_object.id
+    assert serializer_data["director_position"]["id"] == director_position_object.id
 
 
 @pytest.mark.django_db
@@ -53,21 +53,17 @@ def test__client_serializer__create_object_valid_director_name(
 
 
 @pytest.mark.django_db
-def test__client_serializer__create_object_valid_destination_city(
-    clients_object,
-    destination_city_object,
-):
+def test__client_serializer__create_object_valid_destination_city(clients_object,
+                                                                  destination_city_object):
     serializer_data = ClientSerializer(clients_object).data
-    assert serializer_data["destination_city"] == destination_city_object.id
+    assert serializer_data["destination_city"] == str(destination_city_object)
 
 
 @pytest.mark.django_db
-def test__client_serializer__create_object_valid_railway_station(
-    clients_object,
-    railway_station_object,
-):
+def test__client_serializer__create_object_valid_railway_station(clients_object,
+                                                                 railway_station_object):
     serializer_data = ClientSerializer(clients_object).data
-    assert serializer_data["railway_station"] == railway_station_object.id
+    assert serializer_data["railway_station"] == str(railway_station_object)
 
 
 @pytest.mark.django_db

logistics/tests/test_models_logistics.py

@@ -13,7 +13,7 @@ def test__tripsauto__return_valid_str(tripsauto_object):
 def test__railway_station__return_valid_str(railwaystation_object):
     assert (
         str(railwaystation_object)
-        == f"{railwaystation_object.station_name}, {railwaystation_object.station_branch}"
+        == f"{railwaystation_object.station_name}, {railwaystation_object.station_branch}, {railwaystation_object.station_id}"
     )