見直し前の最終

backend/apps/fields/serializers.py

@@ -20,4 +20,4 @@ class FieldSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Field
-        fields = ['id', 'name', 'address', 'area_tan', 'area_m2', 'owner_name', 'kyosai_fields', 'chusankan_fields']
+        fields = ['id', 'name', 'address', 'area_tan', 'area_m2', 'owner_name', 'group_name', 'display_order', 'kyosai_fields', 'chusankan_fields']

backend/apps/fields/views.py

@@ -1,17 +1,24 @@
 import pandas as pd
+from django.db import models as django_models
 from django.http import JsonResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
-from rest_framework import viewsets, permissions
+from rest_framework import viewsets, permissions, filters
 from rest_framework.decorators import action
 from .models import OfficialKyosaiField, OfficialChusankanField, Field
 from .serializers import FieldSerializer
 
 
 class FieldViewSet(viewsets.ModelViewSet):
-    queryset = Field.objects.all()
+    queryset = Field.objects.all().order_by(
+        django_models.functions.Coalesce('group_name', django_models.Value('')),
+        'display_order',
+        'id'
+    )
     serializer_class = FieldSerializer
     permission_classes = [permissions.AllowAny]
+    filter_backends = [filters.OrderingFilter]
+    ordering_fields = ['group_name', 'display_order', 'id', 'area_tan']
 
 
 @csrf_exempt