add_ao_rayons_route

service/serializers.py

@@ -6,14 +6,14 @@ class PlacementPointSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.PlacementPoint
         fields = '__all__'
-
-class AOSerializer(serializers.ModelSerializer):
-    # rayons = RayonSerializer()
+class RayonSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.AO
         fields = '__all__'
 
-class RayonSerializer(serializers.ModelSerializer):
+class AOSerializer(serializers.ModelSerializer):
+    rayons = RayonSerializer(many=True, read_only=True)
     class Meta:
         model = models.AO
-        fields = '__all__'
+        fields = '__all__'
+

service/urls.py

@@ -8,8 +8,7 @@ from service import views
 
 router = routers.DefaultRouter()
 router.register('', views.PlacementPointViewSet)
-router.register('/ao', views.AOViewSet)
-router.register('/rayon', views.RayonViewSet)
+
 
 schema_view = get_schema_view(
     openapi.Info(
@@ -26,11 +25,12 @@ schema_view = get_schema_view(
 )
 
 urlpatterns = [
-    path('placement_points',
+    path('placement_points/',
          include([*router.urls,
-                  url(r'/update_status', views.update_status.as_view(), name='update_status'),
-                  url(r'/update_fact', views.update_fact.as_view(), name='update_fact'),
-                  url(r'/to_excel', views.get_excel.as_view(), name='to_excel')]), name='placement_points'),
+                  url(r'ao_rayons',views.AOViewSet.as_view({'get': 'list'}),name='ao_and_rayons'),
+                  url(r'update_status', views.update_status.as_view(), name='update_status'),
+                  url(r'update_fact', views.update_fact.as_view(), name='update_fact'),
+                  url(r'to_excel', views.get_excel.as_view(), name='to_excel')]), name='placement_points'),
     path('raschet/', views.raschet.as_view(), name='ao_and_rayons'),
     url(r'load_csv/', views.refresh_placement_points.as_view(), name='upload_placement_points'),
     url(r'upload_ao_and_rayons/', views.load_ao_and_rayons.as_view(), name='upload_ao_and_rayons'),