Merge pull request #63 from dev-lymar/editlogistics

Editlogistics

clients/serializers.py

@@ -10,6 +10,10 @@ class Meta:
 
 
 class ClientSerializer(serializers.ModelSerializer[Client]):
+    director_position = DirectorPositionSerializer()
+    destination_city: serializers.CharField = serializers.CharField()
+    railway_station: serializers.CharField = serializers.CharField()
+
     # Устанавливает текущего авторизованого пользователя в поле user
     user = serializers.HiddenField(default=serializers.CurrentUserDefault())
 

clients/tests/conftest.py

@@ -9,26 +9,18 @@
 
 @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(),
-        federal_district=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(),
+        station_name=faker.word(), station_branch=faker.word(), station_id=faker.random_int()
     )
 
 
@@ -37,20 +29,19 @@ 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,
     )
 

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
@@ -54,20 +54,18 @@ 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,
+    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,
+    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