From dfeebf666cf4c53ea19ec80af8144e1b61a78377 Mon Sep 17 00:00:00 2001 From: Sushil Tiwari Date: Fri, 19 Dec 2025 21:43:48 +0545 Subject: [PATCH] chore(sector): Add ModelSerializer for primary sector --- api/serializers.py | 11 +++++------ api/views.py | 6 ++---- assets | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/api/serializers.py b/api/serializers.py index cd0ba0d73..3e5a2c626 100644 --- a/api/serializers.py +++ b/api/serializers.py @@ -13,7 +13,7 @@ # from api.utils import pdf_exporter from api.tasks import generate_url from api.utils import CountryValidator, RegionValidator -from deployments.models import EmergencyProject, Personnel, PersonnelDeployment +from deployments.models import EmergencyProject, Personnel, PersonnelDeployment, Sector from dref.models import Dref, DrefFinalReport, DrefOperationalUpdate from lang.models import String from lang.serializers import ModelSerializer @@ -2455,11 +2455,10 @@ class SearchSerializer(serializers.Serializer): reports = SearchReportSerializer(many=True, required=False, allow_null=True) -class ProjectPrimarySectorsSerializer(serializers.Serializer): - key = serializers.IntegerField() - label = serializers.CharField() - color = serializers.CharField() - is_deprecated = serializers.BooleanField() +class ProjectPrimarySectorsSerializer(ModelSerializer): + class Meta: + model = Sector + fields = "__all__" class ProjectSecondarySectorsSerializer(serializers.Serializer): diff --git a/api/views.py b/api/views.py index 56559130d..b21e542de 100644 --- a/api/views.py +++ b/api/views.py @@ -587,10 +587,8 @@ class ProjectPrimarySectors(APIView): responses=ProjectPrimarySectorsSerializer(many=True), ) def get(cls, request): - keys_labels = [ - {"key": s.id, "label": s.title, "color": s.color, "is_deprecated": s.is_deprecated} for s in Sector.objects.all() - ] - return Response(ProjectPrimarySectorsSerializer(keys_labels, many=True).data) + queryset = Sector.objects.filter(is_deprecated=False).all() + return Response(ProjectPrimarySectorsSerializer(queryset, many=True).data) class ProjectSecondarySectors(APIView): diff --git a/assets b/assets index aeda366d7..253e70a56 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit aeda366d7d172e5ed7eca71665937f2bc4fb0ec6 +Subproject commit 253e70a56686601b5dcf0b09a0675a594d303bf5