Add next_election_to_organisation to org API endpoint

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  node: circleci/node@4.1.0
+  node: circleci/node@5.0.2
 
 jobs:
   build:

every_election/apps/api/serializers.py

@@ -64,6 +64,19 @@ class Meta:
         fields = org_fields
 
 
+class OrganisationStandaloneSerializer(OrganisationSerializer):
+    class Meta:
+        model = Organisation
+        fields = list(org_fields) + [
+            "next_election_to_organisation",
+        ]
+
+    next_election_to_organisation = serializers.SerializerMethodField()
+
+    def get_next_election_to_organisation(self, object):
+        return object.next_election_to_organisation
+
+
 class OrganisationGeoSerializer(GeoFeatureModelSerializer):
 
     geography_model = GeometrySerializerMethodField()

every_election/apps/api/views.py

@@ -1,5 +1,10 @@
 from collections import OrderedDict
 from datetime import datetime
+
+from django.db.models import (
+    Subquery,
+    OuterRef,
+)
 from django.http import Http404
 from rest_framework import viewsets
 from rest_framework.decorators import action
@@ -18,6 +23,7 @@
     OrganisationDivisionSerializer,
     OrganisationGeoSerializer,
     ElectionGeoSerializer,
+    OrganisationStandaloneSerializer,
 )
 from api import filters
 
@@ -161,8 +167,19 @@ class ElectionSubTypeViewSet(viewsets.ReadOnlyModelViewSet):
 
 
 class OrganisationViewSet(viewsets.ReadOnlyModelViewSet):
-    queryset = Organisation.objects.all()
-    serializer_class = OrganisationSerializer
+    subquery = Subquery(
+        Election.public_objects.filter(group_type="organisation")
+        .future()
+        .filter(organisation=OuterRef("id"))
+        .order_by("poll_open_date")
+        .values("poll_open_date")[:1]
+    )
+
+    queryset = Organisation.objects.all().annotate(
+        next_election_to_organisation=subquery
+    )
+
+    serializer_class = OrganisationStandaloneSerializer
     filterset_fields = ["modified"]
 
     def get_object(self, **kwargs):