Refactor City model, fix tests, script

clients/tests/conftest.py

@@ -18,7 +18,6 @@ def destination_city_object(faker):
         id=faker.pyint(),
         city=faker.city(),
         region=faker.pystr(),
-        federal_district=faker.pystr(),
     )
 
 

logistics/admin.py

@@ -5,12 +5,12 @@
 
 @admin.register(City)
 class CityAdmin(admin.ModelAdmin):
-    list_display = ["city", "region", "federal_district"]
-    list_display_links = ["city", "region", "federal_district"]
+    list_display = ["city", "region"]
+    list_display_links = ["city", "region"]
     ordering = ["city"]
     list_per_page = 20
-    search_fields = ["city", "region", "federal_district"]
-    list_filter = ["city", "region", "federal_district"]
+    search_fields = ["city", "region"]
+    list_filter = ["city", "region"]
 
 
 @admin.register(RailwayStation)

logistics/constants.py

@@ -22,7 +22,6 @@
     ("Волгоград", "Новый Рогачик"),
 ]
 
-
 FACTORY_BRANCH = [
     ("Курск", "Московская ж/д"),
     ("Оскол", "Юго-Восточная ж/д"),
@@ -59,13 +58,3 @@
     ("ЗЖД", "Забайкальская ж/д"),
     ("ДВЖД", "Дальневосточная ж/д"),
 ]
-
-FED_DISCTRICT = [
-    ("ЦФО", "Центральный федеральный округ"),
-    ("СЗФО", "Северо-Западный федеральный округ"),
-    ("ЮФО", "Южный федеральный округ"),
-    ("ПФО", "Приволжский федеральный округ"),
-    ("УФО", "Уральский федеральный округ"),
-    ("СФО", "Сибирский федеральный округ"),
-    ("ДВФО", "Дальневосточный федеральный округ"),
-]

logistics/migrations/0002_alter_city_unique_together_alter_city_region_and_more.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.0.6 on 2024-06-05 17:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('logistics', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='city',
+            unique_together={('city', 'region')},
+        ),
+        migrations.AlterField(
+            model_name='city',
+            name='region',
+            field=models.CharField(max_length=100, verbose_name='Регион'),
+        ),
+        migrations.RemoveField(
+            model_name='city',
+            name='federal_district',
+        ),
+    ]

logistics/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 
-from .constants import BRANCHES, FED_DISCTRICT
+from .constants import BRANCHES
 
 
 class City(models.Model):
@@ -12,20 +12,14 @@ class City(models.Model):
     region = models.CharField(
         max_length=100,
         blank=False,
-        verbose_name="Субъект федерации",
-    )
-    federal_district = models.CharField(
-        max_length=100,
-        blank=False,
-        verbose_name="Федеральный округ",
-        choices=FED_DISCTRICT,
+        verbose_name="Регион",
     )
 
     class Meta:
         verbose_name = "Населенный пункт"
         verbose_name_plural = "Населенные пункты"
         ordering = ["city"]
-        unique_together = ["city", "region", "federal_district"]
+        unique_together = ["city", "region"]
 
     def __str__(self) -> str:
         return f"{self.city}, {self.region}"

logistics/tests/conftest.py

@@ -33,5 +33,5 @@ def tripsrailway_object(railwaystation_object, faker):
 @pytest.fixture
 def city_object(faker):
     return City.objects.create(
-        city=faker.pystr(), region=faker.pystr(), federal_district=faker.pystr()
+        city=faker.pystr(), region=faker.pystr()
     )

scripts/faker_script.py

@@ -78,7 +78,6 @@ def create_city(n):
         City.objects.create(
             city=fake.city(),
             region=fake.region(),
-            federal_district=choice(federal_districts),
         )