Fixed filter LoknitiResponder based on state_name

- Also removed deprecated attributes from Responses serializer
dhmit · May 14, 2024 · bc45638 · bc45638
1 parent 65ef464
commit bc45638
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 49 deletions.
diff --git a/backend/app/api_views.py b/backend/app/api_views.py
@@ -209,6 +209,16 @@ def get_lokniti_responders(request):
     return Response(serializer.data)
 
 
+@api_view(['GET'])
+def get_all_lokniti_responders(request):
+    """
+    API endpoint to get responders
+    """
+    responses = LoknitiResponders.objects.all()
+    serializer = LoknitiRespondersSerializer(responses, many=True)
+    return Response(serializer.data)
+
+
 @api_view(['GET'])
 def get_responders_by_constituency(request, election_year, state_name, pc_id):
     """
@@ -218,7 +228,7 @@ def get_responders_by_constituency(request, election_year, state_name, pc_id):
     if election_year == 2009:
         state_name = state_name.upper()
     responses = LoknitiResponders.objects.filter(
-        election_year=election_year, state_name=state_name, PC_id=pc_id)
+        election_year=election_year, state_name__icontains=state_name, PC_id=pc_id)
     serializer = LoknitiRespondersSerializer(responses, many=True)
     return Response(serializer.data)
 
@@ -253,7 +263,7 @@ def get_lokniti_responses_by_constituency(
 
     responses = LoknitiResponses.objects.filter(
         responder__election_year=election_year, question_var=question_var,
-        responder__state_name=state_name, responder__PC_id=PC_id
+        responder__state_name__icontains=state_name, responder__PC_id=PC_id
     )
     serializer = LoknitiResponsesSerializer(responses, many=True)
 

diff --git a/backend/app/serializers.py b/backend/app/serializers.py
@@ -118,7 +118,6 @@ class Meta:
             "income",
             "education_level",
             "occupation"
-
         ]
 
 
@@ -129,8 +128,6 @@ class LoknitiResponsesSerializer(serializers.ModelSerializer):
     class Meta:
         model = LoknitiResponses
         fields = [
-            "respondent_no",
-            "election_year",
             "question_var",
             "response",
             "responder",

diff --git a/backend/config/urls.py b/backend/config/urls.py
@@ -20,52 +20,50 @@
 from app import views, api_views
 
 urlpatterns = [
-    # Django admin page
-    path('admin/', admin.site.urls),
+     # Django admin page
+     path('admin/', admin.site.urls),
 
-    ################################################################################
-    # View Pages
-    ################################################################################
-    path('', views.index),
-    path('competitiveness/', views.competitiveness),
-    path('campaign-finance/top-10-donors-piechart/', views.PieChart),
-    path('campaign-finance/top-10-donors-barchart/', views.BarChart),
-    path('campaign-finance/donor-party-sankey/', views.FinanceSankey),
-    path('castemap/', views.LoknitiCasteMap),
+     ################################################################################
+     # View Pages
+     ################################################################################
+     path('', views.index),
+     path('competitiveness/', views.competitiveness),
+     path('campaign-finance/top-10-donors-piechart/', views.PieChart),
+     path('campaign-finance/top-10-donors-barchart/', views.BarChart),
+     path('campaign-finance/donor-party-sankey/', views.FinanceSankey),
+     path('castemap/', views.LoknitiCasteMap),
 
 
-    ################################################################################
-    # API endpoints
-    ################################################################################
-    path('api/1951-1962elections/', api_views.all_elections),
-    path('api/1962-2019seats/', api_views.all_seats),
-    path('api/ls-elections/', api_views.all_ls_elections),
-    path('api/ls-elections/<int:year>/', api_views.get_ls_election_year),
-    path('api/ls-elections/<int:year>/<str:state>/<int:constituency_no>/',
-         api_views.get_specific_ls_election),
-    path("api/SDE_DATA_IN_F7DSTRBND_1991/",
-         api_views.get_SDE_DATA_IN_F7DSTRBND_1991
-         ),
-    path("api/all-campaign-finance/", api_views.campaign_finance),
-    path("api/campaign-finance/party-donor-pair/<str:party_name>/<str:donor_name>/",
-         api_views.campaign_finance
-         ),
-    path("api/campaign-finance/all-donors/<str:party_name>/",
-         api_views.campaign_finance_party_subset),
-    path("api/campaign-finance/all-parties/<str:donor_name>/",
-         api_views.campaign_finance_donor_subset),
-    path("api/India_PC_2019_simplified/",
-         api_views.get_India_PC_2019_simplified),
-    path("api/India_PC_2019/",
-         api_views.get_India_PC_2019),
-    path("api/competitiveness_colors/<int:election_year>/",
-         api_views.get_competitiveness_data),
-    path("api/codebook/",
-         api_views.get_lokniti_codebook),
-    path("api/responderstest/",
-         api_views.get_lokniti_responders),
-    path("api/responders/<int:election_year>/<str:state_name>/<int:pc_id>",
-         api_views.get_responders_by_constituency)
-
+     ################################################################################
+     # API endpoints
+     ################################################################################
+     path('api/1951-1962elections/', api_views.all_elections),
+     path('api/1962-2019seats/', api_views.all_seats),
+     path('api/ls-elections/', api_views.all_ls_elections),
+     path('api/ls-elections/<int:year>/', api_views.get_ls_election_year),
+     path('api/ls-elections/<int:year>/<str:state>/<int:constituency_no>/',
+          api_views.get_specific_ls_election),
+     path("api/SDE_DATA_IN_F7DSTRBND_1991/",
+          api_views.get_SDE_DATA_IN_F7DSTRBND_1991),
+     path("api/all-campaign-finance/", api_views.campaign_finance),
+     path("api/campaign-finance/party-donor-pair/<str:party_name>/<str:donor_name>/",
+          api_views.campaign_finance),
+     path("api/campaign-finance/all-donors/<str:party_name>/",
+          api_views.campaign_finance_party_subset),
+     path("api/campaign-finance/all-parties/<str:donor_name>/",
+          api_views.campaign_finance_donor_subset),
+     path("api/India_PC_2019_simplified/",
+          api_views.get_India_PC_2019_simplified),
+     path("api/India_PC_2019/",
+          api_views.get_India_PC_2019),
+     path("api/competitiveness_colors/<int:election_year>/",
+          api_views.get_competitiveness_data),
+     path("api/codebook/",
+          api_views.get_lokniti_codebook),
+     path("api/responderstest/",
+          api_views.get_lokniti_responders),
+     path("api/responders/<int:election_year>/<str:state_name>/<int:pc_id>",
+          api_views.get_responders_by_constituency),
+     path("api/all_responders/", api_views.get_all_lokniti_responders)
 
 ]