From 2eb850364671854217da64bd70d6fdd4776e70f5 Mon Sep 17 00:00:00 2001
From: Han <apricot13@users.noreply.github.com>
Date: Thu, 20 Jun 2024 20:26:12 +0100
Subject: [PATCH 1/5] TOP-235 switch to service_at_location fields

---
 .../DetailDialog/DetailDialog.styles.js       | 46 +++++++++
 .../DetailDialog/LocationAccordion.jsx        | 42 +++++---
 src/components/DetailDialog/ScheduleTable.jsx | 31 ++++++
 src/components/DetailDialog/index.jsx         | 98 ++++++-------------
 4 files changed, 135 insertions(+), 82 deletions(-)
 create mode 100644 src/components/DetailDialog/DetailDialog.styles.js
 create mode 100644 src/components/DetailDialog/ScheduleTable.jsx

diff --git a/src/components/DetailDialog/DetailDialog.styles.js b/src/components/DetailDialog/DetailDialog.styles.js
new file mode 100644
index 0000000..488cf29
--- /dev/null
+++ b/src/components/DetailDialog/DetailDialog.styles.js
@@ -0,0 +1,46 @@
+import styled from "styled-components"
+
+export const Crosshead = styled.h2`
+  margin-bottom: 15px;
+  color: ${props => props.theme.styles.text};
+`
+
+export const CrossheadSub = styled.h3`
+  margin-bottom: 15px;
+  color: ${props => props.theme.styles.text};
+`
+
+export const Columns = styled.div`
+  margin-bottom: 30px;
+  &:last-of-type {
+    margin-bottom: 0px;
+  }
+  div {
+    margin-bottom: 20px;
+    &:last-of-type {
+      margin-bottom: 0px;
+    }
+  }
+  @supports (display: grid) {
+    @media screen and (min-width: ${props => props.theme.styles.breakpointM}) {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      column-gap: 35px;
+      row-gap: 25px;
+      div {
+        margin-bottom: 0px;
+      }
+    }
+  }
+`
+
+export const Table = styled.table`
+  width: 100%;
+  color: ${props => props.theme.styles.text};
+  td {
+    width: 50%;
+  }
+  tr:not(:last-child) td {
+    padding-bottom: 10px;
+  }
+`
diff --git a/src/components/DetailDialog/LocationAccordion.jsx b/src/components/DetailDialog/LocationAccordion.jsx
index f3a9be3..c14b983 100644
--- a/src/components/DetailDialog/LocationAccordion.jsx
+++ b/src/components/DetailDialog/LocationAccordion.jsx
@@ -108,41 +108,43 @@ const TickListWithTopMargin = styled(TickList)`
   margin-top: 25px;
 `
 
-const LocationAccordion = ({ locations }) => {
+const LocationAccordion = ({ service_at_locations }) => {
   const [active, setActive] = useState(0)
   const cookiesAccepted = checkCookiesAccepted()
 
   return (
     <Outer>
       <Crosshead>Locations</Crosshead>
-      {locations.map((location, i) => (
-        <div key={location.id}>
+      {service_at_locations.map((service_at_location, i) => (
+        <div key={service_at_location.location.id}>
           <Button
             onClick={e => (active === i ? setActive(false) : setActive(i))}
             aria-expanded={active === i}
           >
             <h3>
-              {location.name || location.address_1 || `Location ${i + 1}`}
+              {service_at_location.location.name ||
+                service_at_location.location.address_1 ||
+                `Location ${i + 1}`}
             </h3>
           </Button>
           <Panel hidden={active !== i}>
             <div>
-              {location.mask_exact_address ? (
+              {service_at_location.location.mask_exact_address ? (
                 <>
-                  <p>Near {location.city}</p>
-                  <p>{location.postal_code}</p>
+                  <p>Near {service_at_location.location.city}</p>
+                  <p>{service_at_location.location.postal_code}</p>
                   <p>
                     <em>This location is approximate</em>
                   </p>
                 </>
               ) : (
                 <>
-                  <p>{location.address_1}</p>
-                  <p>{location.city}</p>
-                  <p>{location.postal_code}</p>
+                  <p>{service_at_location.location.address_1}</p>
+                  <p>{service_at_location.location.city}</p>
+                  <p>{service_at_location.location.postal_code}</p>
                   <p>
                     <A
-                      href={`https://maps.google.com/maps/search/${location.postal_code}`}
+                      href={`https://maps.google.com/maps/search/${service_at_location.location.postal_code}`}
                     >
                       Get directions
                     </A>
@@ -150,7 +152,7 @@ const LocationAccordion = ({ locations }) => {
                 </>
               )}
               <TickListWithTopMargin>
-                {location.accessibilities.map(point => (
+                {service_at_location.location.accessibilities.map(point => (
                   <TickListItem key={point.name}>{point.name}</TickListItem>
                 ))}
               </TickListWithTopMargin>
@@ -158,16 +160,24 @@ const LocationAccordion = ({ locations }) => {
             {cookiesAccepted ? (
               <MapContainer>
                 <Map
-                  latitude={parseFloat(location.geometry.coordinates[1])}
-                  longitude={parseFloat(location.geometry.coordinates[0])}
+                  latitude={parseFloat(
+                    service_at_location.location.geometry.coordinates[1]
+                  )}
+                  longitude={parseFloat(
+                    service_at_location.location.geometry.coordinates[0]
+                  )}
                 />
               </MapContainer>
             ) : (
               <>
                 <StaticMapContainer>
                   <MapStatic
-                    latitude={location.geometry.coordinates[1]}
-                    longitude={location.geometry.coordinates[0]}
+                    latitude={
+                      service_at_location.location.geometry.coordinates[1]
+                    }
+                    longitude={
+                      service_at_location.location.geometry.coordinates[0]
+                    }
                     offCenter={false}
                     zoom={15}
                     size={`300x250`}
diff --git a/src/components/DetailDialog/ScheduleTable.jsx b/src/components/DetailDialog/ScheduleTable.jsx
new file mode 100644
index 0000000..aba368b
--- /dev/null
+++ b/src/components/DetailDialog/ScheduleTable.jsx
@@ -0,0 +1,31 @@
+import React from "react"
+import { Crosshead, CrossheadSub, Columns, Table } from "./DetailDialog.styles"
+import { twelveHourTime } from "../../lib/utils"
+
+const ScheduleTable = ({ title, subtitle, regular_schedules }) => {
+  return (
+    regular_schedules.length > 0 && (
+      <Columns>
+        {title && <Crosshead>{title}</Crosshead>}
+        {subtitle && <CrossheadSub>{subtitle}</CrossheadSub>}
+        <Table>
+          <tbody>
+            {regular_schedules.map((sched, i) => (
+              <tr key={i}>
+                <td>
+                  <strong>{sched.weekday}s</strong>
+                </td>
+                <td>
+                  {twelveHourTime(sched.opens_at)} to{" "}
+                  {twelveHourTime(sched.closes_at)}
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </Table>
+      </Columns>
+    )
+  )
+}
+
+export default ScheduleTable
diff --git a/src/components/DetailDialog/index.jsx b/src/components/DetailDialog/index.jsx
index 80ec9ad..85a549e 100644
--- a/src/components/DetailDialog/index.jsx
+++ b/src/components/DetailDialog/index.jsx
@@ -2,12 +2,7 @@ import React, { useState, useEffect } from "react"
 import styled from "styled-components"
 
 import fetch from "isomorphic-unfetch"
-import {
-  daysSince,
-  buildGoodToKnow,
-  truncate,
-  twelveHourTime,
-} from "../../lib/utils"
+import { daysSince, buildGoodToKnow, truncate } from "../../lib/utils"
 import { Helmet } from "react-helmet"
 import "@reach/dialog/styles.css"
 
@@ -26,6 +21,9 @@ import { checkCookiesAccepted } from "./../../lib/cookies"
 
 import AlertStatic from "./../AlertStatic"
 
+import { Crosshead, Columns, Table } from "./DetailDialog.styles"
+import ScheduleTable from "./ScheduleTable"
+
 const Body = styled(InheritedBody)`
   &:first-of-type {
     padding-top: 0px;
@@ -81,35 +79,6 @@ const TwoColumnTickList = styled(TickList)`
   }
 `
 
-const Crosshead = styled.h2`
-  margin-bottom: 15px;
-  color: ${props => props.theme.styles.text};
-`
-
-const Columns = styled.div`
-  margin-bottom: 30px;
-  &:last-of-type {
-    margin-bottom: 0px;
-  }
-  div {
-    margin-bottom: 20px;
-    &:last-of-type {
-      margin-bottom: 0px;
-    }
-  }
-  @supports (display: grid) {
-    @media screen and (min-width: ${props => props.theme.styles.breakpointM}) {
-      display: grid;
-      grid-template-columns: 1fr 1fr;
-      column-gap: 35px;
-      row-gap: 25px;
-      div {
-        margin-bottom: 0px;
-      }
-    }
-  }
-`
-
 const ContactName = styled.h3`
   line-height: 1.5;
   color: ${props => props.theme.styles.text};
@@ -120,17 +89,6 @@ const ContactRole = styled.p`
   font-style: italic;
 `
 
-const Table = styled.table`
-  width: 100%;
-  color: ${props => props.theme.styles.text};
-  td {
-    width: 50%;
-  }
-  tr:not(:last-child) td {
-    padding-bottom: 10px;
-  }
-`
-
 const Footer = styled(Body)`
   text-align: center;
   padding: 25px;
@@ -275,8 +233,10 @@ const DetailDialog = ({ serviceId, location, navigate }) => {
             {service.description && (
               <Description description={service.description} />
             )}
-            {service.locations.length > 1 && (
-              <LocationAccordion locations={service.locations} />
+            {service.service_at_locations.length > 1 && (
+              <LocationAccordion
+                service_at_locations={service.service_at_locations}
+              />
             )}
           </Body>
           {goodToKnow.length > 0 && (
@@ -354,26 +314,32 @@ const DetailDialog = ({ serviceId, location, navigate }) => {
                   </TickList>
                 </Columns>
               )}
+
             {service.regular_schedules.length > 0 && (
-              <Columns>
-                <Crosshead>Hours</Crosshead>
-                <Table>
-                  <tbody>
-                    {service.regular_schedules.map((sched, i) => (
-                      <tr key={i}>
-                        <td>
-                          <strong>{sched.weekday}s</strong>
-                        </td>
-                        <td>
-                          {twelveHourTime(sched.opens_at)} to{" "}
-                          {twelveHourTime(sched.closes_at)}
-                        </td>
-                      </tr>
-                    ))}
-                  </tbody>
-                </Table>
-              </Columns>
+              <ScheduleTable
+                title="Hours"
+                regular_schedules={service.regular_schedules.filter(
+                  v => v.service_at_location === null
+                )}
+              />
+            )}
+
+            {service.service_at_locations.length > 1 && (
+              <>
+                {service.service_at_locations.map((service_at_location, i) => (
+                  <ScheduleTable
+                    key={service_at_location.id}
+                    subtitle={
+                      service_at_location.location.name ||
+                      service_at_location.location.address_1 ||
+                      `Location ${i + 1}`
+                    }
+                    regular_schedules={service_at_location.regular_schedule}
+                  />
+                ))}
+              </>
             )}
+
             {service.cost_options.length > 0 && (
               <Columns>
                 <Crosshead>Fees</Crosshead>

From f774662150770b7429327f29a7781b6b5fbdbdfe Mon Sep 17 00:00:00 2001
From: Han <apricot13@users.noreply.github.com>
Date: Fri, 21 Jun 2024 12:14:06 +0100
Subject: [PATCH 2/5] TOP-235 switch from locations to service_at_locations

---
 src/components/DetailDialog/index.jsx  | 25 ++++++++++++++++---------
 src/components/ListMap/index.jsx       | 18 +++++++++---------
 src/components/ListMapStatic/index.jsx |  8 ++++----
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/components/DetailDialog/index.jsx b/src/components/DetailDialog/index.jsx
index 85a549e..2054cd1 100644
--- a/src/components/DetailDialog/index.jsx
+++ b/src/components/DetailDialog/index.jsx
@@ -213,8 +213,8 @@ const DetailDialog = ({ serviceId, location, navigate }) => {
           {!cookiesAccepted && (
             <AlertStatic>{theme.cookiesDisabledMessage}</AlertStatic>
           )}
-          {service.locations.length === 1 && (
-            <SingleLocation {...service.locations[0]} />
+          {service.service_at_locations.length === 1 && (
+            <SingleLocation {...service.service_at_locations[0].location} />
           )}
           <Body>
             <Actions>
@@ -290,16 +290,23 @@ const DetailDialog = ({ serviceId, location, navigate }) => {
             </Body>
           )}
           <Body>
-            {service.hasOwnProperty("locations") &&
-              service.locations.length === 1 &&
-              service.locations[0].hasOwnProperty("accessibilities") &&
-              service.locations[0].accessibilities.length > 0 && (
+            {service.hasOwnProperty("service_at_locations") &&
+              service.service_at_locations.length === 1 &&
+              service.service_at_locations[0].location.hasOwnProperty(
+                "accessibilities"
+              ) &&
+              service.service_at_locations[0].location.accessibilities.length >
+                0 && (
                 <Columns>
                   <Crosshead>Access needs</Crosshead>
                   <TickList>
-                    {service.locations[0].accessibilities.map(point => (
-                      <TickListItem key={point.name}>{point.name}</TickListItem>
-                    ))}
+                    {service.service_at_locations[0].location.accessibilities.map(
+                      point => (
+                        <TickListItem key={point.name}>
+                          {point.name}
+                        </TickListItem>
+                      )
+                    )}
                   </TickList>
                 </Columns>
               )}
diff --git a/src/components/ListMap/index.jsx b/src/components/ListMap/index.jsx
index 5b721fc..6739374 100644
--- a/src/components/ListMap/index.jsx
+++ b/src/components/ListMap/index.jsx
@@ -31,22 +31,22 @@ const BoundSetter = ({ results }) => {
 }
 
 const ListMap = React.memo(({ results, isLoaded, location, navigate }) => {
-  let plottableResults = []
-  results.map(result =>
-    result.locations.map(location => {
+  const plottableResults = results.reduce((acc, result) => {
+    result.service_at_locations.forEach(service_at_location => {
       if (
-        location.geometry.coordinates[0] &&
-        location.geometry.coordinates[1]
+        service_at_location.location.geometry.coordinates[0] &&
+        service_at_location.location.geometry.coordinates[1] &&
+        !acc.find(item => item.id === result.id) // Check if the result id is already in the accumulator
       ) {
-        plottableResults.push({
+        acc.push({
           id: result.id,
           name: result.name,
-          location: location,
+          location: service_at_location.location,
         })
       }
-      return null
     })
-  )
+    return acc
+  }, [])
 
   return isLoaded ? (
     <Outer>
diff --git a/src/components/ListMapStatic/index.jsx b/src/components/ListMapStatic/index.jsx
index 6a2cf02..6d17a04 100644
--- a/src/components/ListMapStatic/index.jsx
+++ b/src/components/ListMapStatic/index.jsx
@@ -25,13 +25,13 @@ export default ({ results }) => {
 
   let resultsLatLng = []
   results.map(result =>
-    result.locations.map(location => {
+    result.service_at_locations.map(service_at_location => {
       if (
-        location.geometry.coordinates[0] &&
-        location.geometry.coordinates[1]
+        service_at_location.location.geometry.coordinates[0] &&
+        service_at_location.location.geometry.coordinates[1]
       ) {
         resultsLatLng.push([
-          `${location.geometry.coordinates[1]},${location.geometry.coordinates[0]}`,
+          `${service_at_location.location.geometry.coordinates[1]},${service_at_location.location.geometry.coordinates[0]}`,
         ])
       }
       return null

From cacfc2913e9a542b84a19c10abd5db28093bc53d Mon Sep 17 00:00:00 2001
From: Han <apricot13@users.noreply.github.com>
Date: Mon, 24 Jun 2024 12:21:12 +0100
Subject: [PATCH 3/5] TOP-235 fix test content strucure

---
 cypress/fixtures/service.json          |   33 +-
 cypress/fixtures/services.json         | 2403 +++++++++++++++++++++---
 src/components/ListMap/index.jsx       |    8 +-
 src/components/ListMapStatic/index.jsx |    4 +-
 4 files changed, 2151 insertions(+), 297 deletions(-)

diff --git a/cypress/fixtures/service.json b/cypress/fixtures/service.json
index 19e3db5..7b1c6c6 100644
--- a/cypress/fixtures/service.json
+++ b/cypress/fixtures/service.json
@@ -18,6 +18,36 @@
   "needs_referral": null,
   "free": null,
   "created_at": "2020-11-26T10:49:42.460Z",
+  "service_at_locations": [
+    {
+      "id": 1,
+      "service_id": 1,
+      "location_id": 1,
+      "location": {
+        "id": 1,
+        "name": "St Joseph's Catholic Infant School",
+        "address_1": " Hazell Avenue",
+        "city": "Aylesbury",
+        "state_province": "Buckinghamshire",
+        "postal_code": "HP21 7JF",
+        "country": "GB",
+        "geometry": {
+          "type": "Point",
+          "coordinates": [-0.790659, 51.811001]
+        },
+        "mask_exact_address": false,
+        "accessibilities": []
+      },
+      "regular_schedule": [
+        {
+          "id": 1,
+          "weekday": "Monday",
+          "opens_at": "10:00",
+          "closes_at": "17:00"
+        }
+      ]
+    }
+  ],
   "locations": [
     {
       "id": 1,
@@ -62,7 +92,8 @@
       "id": 1,
       "weekday": "Monday",
       "opens_at": "10:00",
-      "closes_at": "17:00"
+      "closes_at": "17:00",
+      "service_at_location": null
     }
   ],
   "cost_options": [],
diff --git a/cypress/fixtures/services.json b/cypress/fixtures/services.json
index e0c6e57..b80627d 100644
--- a/cypress/fixtures/services.json
+++ b/cypress/fixtures/services.json
@@ -23,6 +23,29 @@
       "needs_referral": null,
       "free": null,
       "created_at": "2020-11-26T10:49:42.460Z",
+      "service_at_locations": [
+        {
+          "id": 1,
+          "service_id": 1,
+          "location_id": 1,
+          "location": {
+            "id": 1,
+            "name": "St Joseph's Catholic Infant School",
+            "address_1": " Hazell Avenue",
+            "city": "Aylesbury",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP21 7JF",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.790659, 51.811001]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 1,
@@ -63,19 +86,41 @@
         }
       ],
       "regular_schedules": [
-        { "weekday": "Monday", "opens_at": "10:00", "closes_at": "17:00" }
+        {
+          "weekday": "Monday",
+          "opens_at": "10:00",
+          "closes_at": "17:00",
+          "service_at_location": null
+        }
       ],
       "cost_options": [],
-      "links": [{ "label": "Facebook", "url": "http://example.com" }],
+      "links": [
+        {
+          "label": "Facebook",
+          "url": "http://example.com"
+        }
+      ],
       "send_needs": [
-        { "id": 1, "name": "Autism", "slug": "autism" },
-        { "id": 3, "name": "Hearing", "slug": "hearing" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
+        {
+          "id": 3,
+          "name": "Hearing",
+          "slug": "hearing"
+        },
         {
           "id": 5,
           "name": "Sensory and physical needs",
           "slug": "sensory-and-physical-needs"
         },
-        { "id": 7, "name": "Visual", "slug": "visual" }
+        {
+          "id": 7,
+          "name": "Visual",
+          "slug": "visual"
+        }
       ],
       "local_offer": {
         "description": "Example sentence",
@@ -135,6 +180,29 @@
       "free": null,
       "min_age": 12,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 2,
+          "service_id": 2,
+          "location_id": 2,
+          "location": {
+            "id": 2,
+            "name": "Thomley",
+            "address_1": " Menmarsh Road",
+            "city": "Aylesbury",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP18 9JZ",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-1.090864, 51.771984]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 2,
@@ -197,6 +265,29 @@
       "free": null,
       "min_age": 5,
       "max_age": 15,
+      "service_at_locations": [
+        {
+          "id": 3,
+          "service_id": 3,
+          "location_id": 3,
+          "location": {
+            "id": 3,
+            "name": "Scout HQ",
+            "address_1": " East Street",
+            "city": "Chesham",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP5 1HQ",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.61269, 51.703823]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 3,
@@ -206,7 +297,10 @@
           "state_province": "Buckinghamshire",
           "postal_code": "HP5 1HQ",
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [-0.61269, 51.703823] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [-0.61269, 51.703823]
+          },
           "mask_exact_address": null,
           "accessibilities": []
         }
@@ -262,6 +356,29 @@
       "free": null,
       "min_age": 5,
       "max_age": 15,
+      "service_at_locations": [
+        {
+          "id": 4,
+          "service_id": 4,
+          "location_id": 4,
+          "location": {
+            "id": 4,
+            "name": "1st Kingshill Scout Hut",
+            "address_1": " Hare Lane",
+            "city": "Great Missenden",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP16 0EE",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.711054, 51.684575]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 4,
@@ -330,6 +447,29 @@
       "free": null,
       "min_age": 5,
       "max_age": 25,
+      "service_at_locations": [
+        {
+          "id": 5,
+          "service_id": 5,
+          "location_id": 5,
+          "location": {
+            "id": 5,
+            "name": "Hilltop Community Centre",
+            "address_1": " Crest Road",
+            "city": "High Wycombe",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP11 1UA",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.773821, 51.612083]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 5,
@@ -404,6 +544,15 @@
       "needs_referral": null,
       "free": null,
       "created_at": "2020-11-26T10:49:46.110Z",
+      "service_at_locations": [
+        {
+          "id": 6,
+          "service_id": 6,
+          "location_id": null,
+          "location": {},
+          "regular_schedule": []
+        }
+      ],
       "locations": [],
       "contacts": [],
       "organisation": {
@@ -443,6 +592,29 @@
       "free": null,
       "min_age": 0,
       "max_age": 11,
+      "service_at_locations": [
+        {
+          "id": 7,
+          "service_id": 7,
+          "location_id": 7,
+          "location": {
+            "id": 7,
+            "name": "43 Chapman Place, Mile End, Colchester, CO4 5ZJ",
+            "address_1": " ",
+            "city": "Nationwide",
+            "state_province": "Buckinghamshire",
+            "postal_code": null,
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [0, 0]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 7,
@@ -452,7 +624,10 @@
           "state_province": "Buckinghamshire",
           "postal_code": null,
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [0, 0] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [0, 0]
+          },
           "mask_exact_address": null,
           "accessibilities": []
         }
@@ -517,6 +692,29 @@
       "free": null,
       "min_age": null,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 8,
+          "service_id": 8,
+          "location_id": 8,
+          "location": {
+            "id": 8,
+            "name": "Abbey View Primary Academy",
+            "address_1": " Kennedy Avenue",
+            "city": "High Wycombe",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP11 1BX",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.745362, 51.616709]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 8,
@@ -566,13 +764,21 @@
       "cost_options": [],
       "links": [],
       "send_needs": [
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
           "slug": "social-emotional-and-mental-health-difficulties"
         },
-        { "id": 3, "name": "Hearing", "slug": "hearing" },
+        {
+          "id": 3,
+          "name": "Hearing",
+          "slug": "hearing"
+        },
         {
           "id": 4,
           "name": "Communication and interaction",
@@ -604,6 +810,36 @@
       "free": null,
       "min_age": null,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 9,
+          "service_id": 10,
+          "location_id": 10,
+          "location": {
+            "id": 10,
+            "name": "Abbotts Brook Hall",
+            "address_1": " Marlow Road",
+            "city": "Bourne End",
+            "state_province": "Buckinghamshire",
+            "postal_code": "SL8 5PQ",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.719494, 51.583973]
+            },
+            "mask_exact_address": null,
+            "accessibilities": [
+              {
+                "name": "Accessible toilet facilities"
+              },
+              {
+                "name": "Wheelchair accessible entrance"
+              }
+            ]
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 10,
@@ -619,8 +855,12 @@
           },
           "mask_exact_address": null,
           "accessibilities": [
-            { "name": "Accessible toilet facilities" },
-            { "name": "Wheelchair accessible entrance" }
+            {
+              "name": "Accessible toilet facilities"
+            },
+            {
+              "name": "Wheelchair accessible entrance"
+            }
           ]
         }
       ],
@@ -705,6 +945,29 @@
       "free": null,
       "min_age": 5,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 10,
+          "service_id": 11,
+          "location_id": 11,
+          "location": {
+            "id": 11,
+            "name": "Abbotts View Farm",
+            "address_1": " Moat Lane",
+            "city": "Aylesbury",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP22 4NF",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.777298, 51.871839]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 11,
@@ -743,19 +1006,32 @@
           "slug": "parks-and-outdoor-activities",
           "parent_id": 1
         },
-        { "id": 275, "name": "Days out", "slug": "days-out", "parent_id": 1 }
+        {
+          "id": 275,
+          "name": "Days out",
+          "slug": "days-out",
+          "parent_id": 1
+        }
       ],
       "regular_schedules": [],
       "cost_options": [],
       "links": [],
       "send_needs": [
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
           "slug": "social-emotional-and-mental-health-difficulties"
         },
-        { "id": 3, "name": "Hearing", "slug": "hearing" },
+        {
+          "id": 3,
+          "name": "Hearing",
+          "slug": "hearing"
+        },
         {
           "id": 4,
           "name": "Communication and interaction",
@@ -787,6 +1063,29 @@
       "free": null,
       "min_age": 8,
       "max_age": 11,
+      "service_at_locations": [
+        {
+          "id": 11,
+          "service_id": 12,
+          "location_id": 12,
+          "location": {
+            "id": 12,
+            "name": "online via Zoom",
+            "address_1": " ",
+            "city": "Nationwide",
+            "state_province": "Buckinghamshire",
+            "postal_code": null,
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [0, 0]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 12,
@@ -796,7 +1095,10 @@
           "state_province": "Buckinghamshire",
           "postal_code": null,
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [0, 0] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [0, 0]
+          },
           "mask_exact_address": null,
           "accessibilities": []
         }
@@ -858,6 +1160,29 @@
       "free": null,
       "min_age": null,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 12,
+          "service_id": 17,
+          "location_id": 17,
+          "location": {
+            "id": 17,
+            "name": null,
+            "address_1": " ",
+            "city": "Nationwide",
+            "state_province": "Buckinghamshire",
+            "postal_code": null,
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [0, 0]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 17,
@@ -867,7 +1192,10 @@
           "state_province": "Buckinghamshire",
           "postal_code": null,
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [0, 0] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [0, 0]
+          },
           "mask_exact_address": null,
           "accessibilities": []
         }
@@ -898,7 +1226,11 @@
       "cost_options": [],
       "links": [],
       "send_needs": [
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 5,
           "name": "Sensory and physical needs",
@@ -909,25 +1241,41 @@
           "name": "Cognition and learning",
           "slug": "cognition-and-learning"
         },
-        { "id": 7, "name": "Visual", "slug": "visual" },
+        {
+          "id": 7,
+          "name": "Visual",
+          "slug": "visual"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
           "slug": "social-emotional-and-mental-health-difficulties"
         },
-        { "id": 3, "name": "Hearing", "slug": "hearing" },
+        {
+          "id": 3,
+          "name": "Hearing",
+          "slug": "hearing"
+        },
         {
           "id": 4,
           "name": "Communication and interaction",
           "slug": "communication-and-interaction"
         },
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
           "slug": "social-emotional-and-mental-health-difficulties"
         },
-        { "id": 3, "name": "Hearing", "slug": "hearing" },
+        {
+          "id": 3,
+          "name": "Hearing",
+          "slug": "hearing"
+        },
         {
           "id": 4,
           "name": "Communication and interaction",
@@ -959,6 +1307,7 @@
       "free": null,
       "min_age": 5,
       "max_age": null,
+      "service_at_locations": [],
       "locations": [],
       "contacts": [],
       "organisation": {
@@ -1011,6 +1360,29 @@
       "free": null,
       "min_age": 16,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 13,
+          "service_id": 19,
+          "location_id": 19,
+          "location": {
+            "id": 19,
+            "name": "GOV.UK",
+            "address_1": " ",
+            "city": "Nationwide",
+            "state_province": "Buckinghamshire",
+            "postal_code": null,
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [0, 0]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 19,
@@ -1020,7 +1392,10 @@
           "state_province": "Buckinghamshire",
           "postal_code": null,
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [0, 0] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [0, 0]
+          },
           "mask_exact_address": null,
           "accessibilities": []
         }
@@ -1066,7 +1441,11 @@
       "cost_options": [],
       "links": [],
       "send_needs": [
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 5,
           "name": "Sensory and physical needs",
@@ -1077,25 +1456,41 @@
           "name": "Cognition and learning",
           "slug": "cognition-and-learning"
         },
-        { "id": 7, "name": "Visual", "slug": "visual" },
+        {
+          "id": 7,
+          "name": "Visual",
+          "slug": "visual"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
           "slug": "social-emotional-and-mental-health-difficulties"
         },
-        { "id": 3, "name": "Hearing", "slug": "hearing" },
+        {
+          "id": 3,
+          "name": "Hearing",
+          "slug": "hearing"
+        },
         {
           "id": 4,
           "name": "Communication and interaction",
           "slug": "communication-and-interaction"
         },
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
           "slug": "social-emotional-and-mental-health-difficulties"
         },
-        { "id": 3, "name": "Hearing", "slug": "hearing" },
+        {
+          "id": 3,
+          "name": "Hearing",
+          "slug": "hearing"
+        },
         {
           "id": 4,
           "name": "Communication and interaction",
@@ -1111,7 +1506,11 @@
           "name": "Cognition and learning",
           "slug": "cognition-and-learning"
         },
-        { "id": 7, "name": "Visual", "slug": "visual" }
+        {
+          "id": 7,
+          "name": "Visual",
+          "slug": "visual"
+        }
       ],
       "local_offer": null,
       "score": 0,
@@ -1138,6 +1537,29 @@
       "free": null,
       "min_age": 5,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 14,
+          "service_id": 20,
+          "location_id": 20,
+          "location": {
+            "id": 20,
+            "name": "Stoke Mandeville Stadium",
+            "address_1": " Guttmann Road",
+            "city": "Aylesbury",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP21 9PP",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.800143, 51.800377]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 20,
@@ -1221,6 +1643,29 @@
       "free": null,
       "min_age": null,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 15,
+          "service_id": 21,
+          "location_id": 21,
+          "location": {
+            "id": 21,
+            "name": "Gerrards Cross Youth Centre",
+            "address_1": " East Common",
+            "city": "Gerrards Cross",
+            "state_province": "Buckinghamshire",
+            "postal_code": "SL9 7AD",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.551926, 51.582576]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 21,
@@ -1334,6 +1779,29 @@
       "needs_referral": null,
       "free": null,
       "created_at": "2020-11-26T10:49:54.105Z",
+      "service_at_locations": [
+        {
+          "id": 16,
+          "service_id": 22,
+          "location_id": 22,
+          "location": {
+            "id": 22,
+            "name": "197-199",
+            "address_1": " Woodside Road",
+            "city": "Amersham",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP6 6NU",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.593636, 51.673204]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 22,
@@ -1400,9 +1868,18 @@
       "regular_schedules": [],
       "cost_options": [],
       "links": [
-        { "label": "Facebook", "url": "https://www.example.com/" },
-        { "label": "Twitter", "url": "https://www.example.com/" },
-        { "label": "Google", "url": "https://www.example.com/" }
+        {
+          "label": "Facebook",
+          "url": "https://www.example.com/"
+        },
+        {
+          "label": "Twitter",
+          "url": "https://www.example.com/"
+        },
+        {
+          "label": "Google",
+          "url": "https://www.example.com/"
+        }
       ],
       "send_needs": [],
       "local_offer": null,
@@ -1430,6 +1907,29 @@
       "free": null,
       "min_age": null,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 17,
+          "service_id": 23,
+          "location_id": 23,
+          "location": {
+            "id": 23,
+            "name": null,
+            "address_1": "201 Buckingham Road",
+            "city": "Aylesbury",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP19 9QF",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.814572, 51.823875]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 23,
@@ -1507,6 +2007,29 @@
       "free": null,
       "min_age": null,
       "max_age": null,
+      "service_at_locations": [
+        {
+          "id": 18,
+          "service_id": 29,
+          "location_id": 29,
+          "location": {
+            "id": 29,
+            "name": null,
+            "address_1": " ",
+            "city": "Online",
+            "state_province": "Buckinghamshire",
+            "postal_code": null,
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [0, 0]
+            },
+            "mask_exact_address": null,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 29,
@@ -1516,7 +2039,10 @@
           "state_province": "Buckinghamshire",
           "postal_code": null,
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [0, 0] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [0, 0]
+          },
           "mask_exact_address": null,
           "accessibilities": []
         }
@@ -1572,6 +2098,33 @@
       "free": null,
       "min_age": 2,
       "max_age": 11,
+      "service_at_locations": [
+        {
+          "id": 19,
+          "service_id": 723,
+          "location_id": 724,
+          "location": {
+            "id": 724,
+            "name": "Chepping View Primary Academy",
+            "address_1": " Cressex Road",
+            "city": "High Wycombe",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP12 4PR",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.775954, 51.614866]
+            },
+            "mask_exact_address": null,
+            "accessibilities": [
+              {
+                "name": "Disabled car parking space"
+              }
+            ]
+          },
+          "regular_schedule": []
+        }
+      ],
       "locations": [
         {
           "id": 724,
@@ -1586,7 +2139,11 @@
             "coordinates": [-0.775954, 51.614866]
           },
           "mask_exact_address": null,
-          "accessibilities": [{ "name": "Disabled car parking space" }]
+          "accessibilities": [
+            {
+              "name": "Disabled car parking space"
+            }
+          ]
         }
       ],
       "contacts": [],
@@ -1660,7 +2217,33 @@
       "created_at": "2024-02-07T10:17:10.599Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 20,
+          "service_id": 11935,
+          "location_id": 13128,
+          "location": {
+            "id": 13128,
+            "name": "St Anne's Church",
+            "address_1": "London Road",
+            "city": "High Wycombe",
+            "state_province": null,
+            "postal_code": "HP11 1ET",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.717223, 51.619114]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -1689,23 +2272,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 4189,
@@ -1745,7 +2355,8 @@
           "id": 18809,
           "weekday": "Wednesday",
           "opens_at": "09:30",
-          "closes_at": "11:30"
+          "closes_at": "11:30",
+          "service_at_location": null
         }
       ],
       "cost_options": [
@@ -1781,7 +2392,54 @@
       "created_at": "2024-01-25T16:13:51.413Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 21,
+          "service_id": 11860,
+          "location_id": 13051,
+          "location": {
+            "id": 13051,
+            "name": "Gilbert Inglefield Academy ",
+            "address_1": "Vandyke Road",
+            "city": "Leighton Buzzard",
+            "state_province": null,
+            "postal_code": "LU7 3FU",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.646899, 51.925997]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        },
+        {
+          "id": 22,
+          "service_id": 11860,
+          "location_id": 13052,
+          "location": {
+            "id": 13052,
+            "name": "Cottesloe school",
+            "address_1": "Aylesbury Road",
+            "city": "Wing",
+            "state_province": null,
+            "postal_code": "LU7 0NY",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.720829, 51.894553]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -1825,25 +2483,52 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
         {
-          "key": "Where is your pick-up/drop-off service from/to?",
+          "key": "Vacancies for under 5 year olds",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
-      ],
-      "organisation": {
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
+        {
+          "key": "Where is your pick-up/drop-off service from/to?",
+          "value": ""
+        },
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
+      ],
+      "organisation": {
         "id": 3465,
         "name": "Leighton Buzzard Kickboxing Academy",
         "description": null,
@@ -1906,8 +2591,62 @@
       "created_at": "2021-09-14T13:03:32.346Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" },
-        { "name": "Buckinghamshire Online Directory", "label": "bod" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        },
+        {
+          "name": "Buckinghamshire Online Directory",
+          "label": "bod"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 23,
+          "service_id": 5859,
+          "location_id": 6772,
+          "location": {
+            "id": 6772,
+            "name": "Penn Street Village Hall",
+            "address_1": "Penn Street",
+            "city": "Amersham",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP7 0PX",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.667496, 51.653394]
+            },
+            "mask_exact_address": false,
+            "accessibilities": [
+              {
+                "name": "Accessible toilet facilities",
+                "slug": "accessible-toilet-facilities"
+              },
+              {
+                "name": "Wheelchair accessible entrance",
+                "slug": "wheelchair-accessible-entrance"
+              },
+              {
+                "name": "Baby changing facilities",
+                "slug": "baby-changing-facilities"
+              },
+              {
+                "name": "Car parking",
+                "slug": "car-parking"
+              },
+              {
+                "name": "Changing facilities",
+                "slug": "changing-facilities"
+              },
+              {
+                "name": "Bus stop nearby",
+                "slug": "bus-stop-nearby"
+              }
+            ]
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -1936,9 +2675,18 @@
               "name": "Baby changing facilities",
               "slug": "baby-changing-facilities"
             },
-            { "name": "Car parking", "slug": "car-parking" },
-            { "name": "Changing facilities", "slug": "changing-facilities" },
-            { "name": "Bus stop nearby", "slug": "bus-stop-nearby" }
+            {
+              "name": "Car parking",
+              "slug": "car-parking"
+            },
+            {
+              "name": "Changing facilities",
+              "slug": "changing-facilities"
+            },
+            {
+              "name": "Bus stop nearby",
+              "slug": "bus-stop-nearby"
+            }
           ]
         }
       ],
@@ -1952,23 +2700,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 4105,
@@ -2018,7 +2793,33 @@
       "created_at": "2021-03-01T15:53:20.525Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 24,
+          "service_id": 3471,
+          "location_id": 4303,
+          "location": {
+            "id": 4303,
+            "name": "Wycombe Abbey School",
+            "address_1": "Abbey Way",
+            "city": "High Wycombe",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP11 1PE",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.750872, 51.626229]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -2047,20 +2848,38 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        }
       ],
       "organisation": {
         "id": 580,
@@ -2087,13 +2906,21 @@
       "cost_options": [],
       "links": [],
       "send_needs": [
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
           "slug": "social-emotional-and-mental-health-difficulties"
         },
-        { "id": 3, "name": "Hearing", "slug": "hearing" },
+        {
+          "id": 3,
+          "name": "Hearing",
+          "slug": "hearing"
+        },
         {
           "id": 4,
           "name": "Communication and interaction",
@@ -2109,7 +2936,11 @@
           "name": "Cognition and learning",
           "slug": "cognition-and-learning"
         },
-        { "id": 7, "name": "Visual", "slug": "visual" }
+        {
+          "id": 7,
+          "name": "Visual",
+          "slug": "visual"
+        }
       ],
       "suitabilities": [],
       "local_offer": {
@@ -2167,7 +2998,33 @@
       "created_at": "2021-03-01T15:44:54.732Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 25,
+          "service_id": 2786,
+          "location_id": 3508,
+          "location": {
+            "id": 3508,
+            "name": "Simpson Place Park",
+            "address_1": "Simpson Place",
+            "city": "Aylesbury",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP21 9PS",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.804204, 51.804144]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -2196,23 +3053,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 2706,
@@ -2268,7 +3152,33 @@
       "created_at": "2024-02-07T10:20:57.877Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 26,
+          "service_id": 11936,
+          "location_id": 13129,
+          "location": {
+            "id": 13129,
+            "name": "The Vicarage",
+            "address_1": "245 Micklefield Road",
+            "city": "High Wycombe",
+            "state_province": null,
+            "postal_code": "HP13 7HU",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.710736, 51.631388]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -2297,23 +3207,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 4189,
@@ -2347,7 +3284,8 @@
           "id": 18810,
           "weekday": "Thursday",
           "opens_at": "18:30",
-          "closes_at": "19:30"
+          "closes_at": "19:30",
+          "service_at_location": null
         }
       ],
       "cost_options": [],
@@ -2376,7 +3314,33 @@
       "created_at": "2021-09-14T12:59:34.602Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 27,
+          "service_id": 4493,
+          "location_id": 5406,
+          "location": {
+            "id": 5406,
+            "name": "",
+            "address_1": "",
+            "city": "Aylesbury",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP22 5RF",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.754388, 51.792373]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -2405,23 +3369,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 3242,
@@ -2477,8 +3468,37 @@
       "created_at": "2021-03-01T15:04:00.552Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" },
-        { "name": "Buckinghamshire Online Directory", "label": "bod" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        },
+        {
+          "name": "Buckinghamshire Online Directory",
+          "label": "bod"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 28,
+          "service_id": 19,
+          "location_id": 6,
+          "location": {
+            "id": 6,
+            "name": "Aqua Vale Swimming and Leisure Centre (all weather pitch)",
+            "address_1": "Vale Park, Park Street",
+            "city": "Aylesbury",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP20 1DX",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.802226, 51.817488]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -2507,23 +3527,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 17,
@@ -2563,7 +3610,8 @@
           "id": 12775,
           "weekday": "Wednesday",
           "opens_at": "19:00",
-          "closes_at": "20:00"
+          "closes_at": "20:00",
+          "service_at_location": null
         }
       ],
       "cost_options": [
@@ -2599,8 +3647,37 @@
       "created_at": "2023-07-06T14:40:18.613Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" },
-        { "name": "Buckinghamshire Online Directory", "label": "bod" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        },
+        {
+          "name": "Buckinghamshire Online Directory",
+          "label": "bod"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 29,
+          "service_id": 10750,
+          "location_id": 11851,
+          "location": {
+            "id": 11851,
+            "name": "Ground Floor, Building 1230 ",
+            "address_1": "Arlington Business Park",
+            "city": " Theale, Reading",
+            "state_province": null,
+            "postal_code": "RG7 4SA",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-1.063543, 51.435689]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -2629,23 +3706,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 6919,
@@ -2689,7 +3793,11 @@
         }
       ],
       "send_needs": [
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
@@ -2722,7 +3830,11 @@
           "name": "Mental health/acquired brain injury",
           "slug": "mental-health-acquired-brain-injury"
         },
-        { "id": 6, "name": "Autism", "slug": "autism" },
+        {
+          "id": 6,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 7,
           "name": "Learning difficulties",
@@ -2784,7 +3896,33 @@
       "created_at": "2021-03-01T15:44:55.973Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 30,
+          "service_id": 2787,
+          "location_id": 3509,
+          "location": {
+            "id": 3509,
+            "name": "",
+            "address_1": null,
+            "city": "Chalfont St. Peter, Gerrards Cross",
+            "state_province": "Buckinghamshire",
+            "postal_code": "SL9",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.55, 51.61]
+            },
+            "mask_exact_address": true,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -2795,7 +3933,10 @@
           "state_province": "Buckinghamshire",
           "postal_code": "SL9",
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [-0.55, 51.61] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [-0.55, 51.61]
+          },
           "mask_exact_address": true,
           "accessibilities": []
         }
@@ -2817,26 +3958,50 @@
         }
       ],
       "meta": [
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "Yes" },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "Yes"
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": "52"
         },
-        { "key": "Maximum number of children a day?", "value": "" },
-        { "key": "Vacancies for under 5 year olds", "value": "0" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "0" },
-        { "key": "Vacancies for over 8 year olds", "value": "0" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": "0"
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": "0"
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": "0"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
         {
           "key": "Communication Email address",
           "value": "sinead.stringfellow@gmail.com"
         },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "01494871629" }
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": "01494871629"
+        }
       ],
       "organisation": {
         "id": 2300,
@@ -2906,37 +4071,46 @@
           "id": 3103,
           "weekday": "Monday",
           "opens_at": "07:30",
-          "closes_at": "17:30"
+          "closes_at": "17:30",
+          "service_at_location": null
         },
         {
           "id": 3104,
           "weekday": "Tuesday",
           "opens_at": "07:30",
-          "closes_at": "17:30"
+          "closes_at": "17:30",
+          "service_at_location": null
         },
         {
           "id": 3105,
           "weekday": "Wednesday",
           "opens_at": "07:30",
-          "closes_at": "17:30"
+          "closes_at": "17:30",
+          "service_at_location": null
         },
         {
           "id": 3106,
           "weekday": "Thursday",
           "opens_at": "07:30",
-          "closes_at": "17:30"
+          "closes_at": "17:30",
+          "service_at_location": null
         },
         {
           "id": 3107,
           "weekday": "Friday",
           "opens_at": "07:30",
-          "closes_at": "17:00"
+          "closes_at": "17:00",
+          "service_at_location": null
         }
       ],
       "cost_options": [],
       "links": [],
       "send_needs": [
-        { "id": 1, "name": "Autism", "slug": "autism" },
+        {
+          "id": 1,
+          "name": "Autism",
+          "slug": "autism"
+        },
         {
           "id": 2,
           "name": "Social, emotional and mental health difficulties",
@@ -3004,28 +4178,59 @@
       "created_at": "2022-11-17T12:35:46.773Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
       ],
+      "service_at_locations": [],
       "locations": [],
       "contacts": [],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 6317,
@@ -3081,8 +4286,37 @@
       "created_at": "2021-09-14T13:04:09.319Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" },
-        { "name": "Buckinghamshire Online Directory", "label": "bod" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        },
+        {
+          "name": "Buckinghamshire Online Directory",
+          "label": "bod"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 31,
+          "service_id": 6046,
+          "location_id": 6959,
+          "location": {
+            "id": 6959,
+            "name": "",
+            "address_1": null,
+            "city": "Leckhampstead",
+            "state_province": "Buckinghamshire",
+            "postal_code": "MK18",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.94, 52.03]
+            },
+            "mask_exact_address": true,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -3093,7 +4327,10 @@
           "state_province": "Buckinghamshire",
           "postal_code": "MK18",
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [-0.94, 52.03] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [-0.94, 52.03]
+          },
           "mask_exact_address": true,
           "accessibilities": []
         }
@@ -3108,23 +4345,50 @@
         }
       ],
       "meta": [
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" },
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" }
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 4221,
@@ -3180,7 +4444,33 @@
       "created_at": "2024-02-06T11:16:53.158Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 32,
+          "service_id": 11931,
+          "location_id": 13123,
+          "location": {
+            "id": 13123,
+            "name": "Aston Clinton Baptist Church",
+            "address_1": "Green End Street",
+            "city": "Aston Clinton",
+            "state_province": null,
+            "postal_code": "HP22 5EX",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.725026, 51.802651]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -3201,23 +4491,50 @@
       ],
       "contacts": [],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 66,
@@ -3245,7 +4562,8 @@
           "id": 18782,
           "weekday": "Tuesday",
           "opens_at": "09:15",
-          "closes_at": "10:45"
+          "closes_at": "10:45",
+          "service_at_location": null
         }
       ],
       "cost_options": [],
@@ -3274,8 +4592,46 @@
       "created_at": "2021-03-01T15:53:24.912Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" },
-        { "name": "Buckinghamshire Online Directory", "label": "bod" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        },
+        {
+          "name": "Buckinghamshire Online Directory",
+          "label": "bod"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 33,
+          "service_id": 3481,
+          "location_id": 4313,
+          "location": {
+            "id": 4313,
+            "name": "111 to 113",
+            "address_1": " Cambridge Street",
+            "city": "Aylesbury",
+            "state_province": null,
+            "postal_code": "HP20 1BT",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.808969, 51.819283]
+            },
+            "mask_exact_address": false,
+            "accessibilities": [
+              {
+                "name": "Changing facilities",
+                "slug": "changing-facilities"
+              },
+              {
+                "name": "Bus stop nearby",
+                "slug": "bus-stop-nearby"
+              }
+            ]
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -3292,8 +4648,14 @@
           },
           "mask_exact_address": false,
           "accessibilities": [
-            { "name": "Changing facilities", "slug": "changing-facilities" },
-            { "name": "Bus stop nearby", "slug": "bus-stop-nearby" }
+            {
+              "name": "Changing facilities",
+              "slug": "changing-facilities"
+            },
+            {
+              "name": "Bus stop nearby",
+              "slug": "bus-stop-nearby"
+            }
           ]
         }
       ],
@@ -3307,23 +4669,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 1209,
@@ -3374,7 +4763,10 @@
         }
       ],
       "links": [
-        { "label": "Facebook", "url": "https://www.facebook.com/ZKSMAnews/" }
+        {
+          "label": "Facebook",
+          "url": "https://www.facebook.com/ZKSMAnews/"
+        }
       ],
       "send_needs": [],
       "suitabilities": [],
@@ -3400,7 +4792,50 @@
       "created_at": "2022-11-30T16:38:53.511Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 34,
+          "service_id": 9436,
+          "location_id": 10387,
+          "location": {
+            "id": 10387,
+            "name": "Christ Church ",
+            "address_1": "18 Oxford Road",
+            "city": "Marlow",
+            "state_province": null,
+            "postal_code": "SL7 2NL",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.780345, 51.572309]
+            },
+            "mask_exact_address": false,
+            "accessibilities": [
+              {
+                "name": "Baby changing facilities",
+                "slug": "baby-changing-facilities"
+              },
+              {
+                "name": "Car parking",
+                "slug": "car-parking"
+              },
+              {
+                "name": "Changing facilities",
+                "slug": "changing-facilities"
+              },
+              {
+                "name": "Building has lift",
+                "slug": "building-has-lift"
+              }
+            ]
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -3421,9 +4856,18 @@
               "name": "Baby changing facilities",
               "slug": "baby-changing-facilities"
             },
-            { "name": "Car parking", "slug": "car-parking" },
-            { "name": "Changing facilities", "slug": "changing-facilities" },
-            { "name": "Building has lift", "slug": "building-has-lift" }
+            {
+              "name": "Car parking",
+              "slug": "car-parking"
+            },
+            {
+              "name": "Changing facilities",
+              "slug": "changing-facilities"
+            },
+            {
+              "name": "Building has lift",
+              "slug": "building-has-lift"
+            }
           ]
         }
       ],
@@ -3437,23 +4881,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 759,
@@ -3487,7 +4958,8 @@
           "id": 13880,
           "weekday": "Tuesday",
           "opens_at": "10:00",
-          "closes_at": "12:00"
+          "closes_at": "12:00",
+          "service_at_location": null
         }
       ],
       "cost_options": [
@@ -3532,8 +5004,54 @@
       "created_at": "2024-02-01T17:00:34.265Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" },
-        { "name": "Buckinghamshire Online Directory", "label": "bod" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        },
+        {
+          "name": "Buckinghamshire Online Directory",
+          "label": "bod"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 35,
+          "service_id": 11882,
+          "location_id": 13073,
+          "location": {
+            "id": 13073,
+            "name": "Halton Village Hall",
+            "address_1": "11 Old School Close, Halton",
+            "city": "Aylesbury ",
+            "state_province": null,
+            "postal_code": "HP22 5NG",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.735186, 51.784219]
+            },
+            "mask_exact_address": false,
+            "accessibilities": [
+              {
+                "name": "Accessible toilet facilities",
+                "slug": "accessible-toilet-facilities"
+              },
+              {
+                "name": "Wheelchair accessible entrance",
+                "slug": "wheelchair-accessible-entrance"
+              },
+              {
+                "name": "Car parking",
+                "slug": "car-parking"
+              },
+              {
+                "name": "Bus stop nearby",
+                "slug": "bus-stop-nearby"
+              }
+            ]
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -3558,8 +5076,14 @@
               "name": "Wheelchair accessible entrance",
               "slug": "wheelchair-accessible-entrance"
             },
-            { "name": "Car parking", "slug": "car-parking" },
-            { "name": "Bus stop nearby", "slug": "bus-stop-nearby" }
+            {
+              "name": "Car parking",
+              "slug": "car-parking"
+            },
+            {
+              "name": "Bus stop nearby",
+              "slug": "bus-stop-nearby"
+            }
           ]
         }
       ],
@@ -3573,23 +5097,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 7392,
@@ -3617,7 +5168,8 @@
           "id": 18712,
           "weekday": "Thursday",
           "opens_at": "13:30",
-          "closes_at": "15:30"
+          "closes_at": "15:30",
+          "service_at_location": null
         }
       ],
       "cost_options": [
@@ -3653,8 +5205,58 @@
       "created_at": "2021-09-14T13:05:40.256Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" },
-        { "name": "Buckinghamshire Online Directory", "label": "bod" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        },
+        {
+          "name": "Buckinghamshire Online Directory",
+          "label": "bod"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 36,
+          "service_id": 6532,
+          "location_id": 7445,
+          "location": {
+            "id": 7445,
+            "name": "Salvation Army",
+            "address_1": "Moreton Road",
+            "city": "Buckingham",
+            "state_province": "Buckinghamshire",
+            "postal_code": "MK18 1JZ",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.987768, 52.002104]
+            },
+            "mask_exact_address": false,
+            "accessibilities": [
+              {
+                "name": "Accessible toilet facilities",
+                "slug": "accessible-toilet-facilities"
+              },
+              {
+                "name": "Wheelchair accessible entrance",
+                "slug": "wheelchair-accessible-entrance"
+              },
+              {
+                "name": "Baby changing facilities",
+                "slug": "baby-changing-facilities"
+              },
+              {
+                "name": "Car parking",
+                "slug": "car-parking"
+              },
+              {
+                "name": "Bus stop nearby",
+                "slug": "bus-stop-nearby"
+              }
+            ]
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -3683,8 +5285,14 @@
               "name": "Baby changing facilities",
               "slug": "baby-changing-facilities"
             },
-            { "name": "Car parking", "slug": "car-parking" },
-            { "name": "Bus stop nearby", "slug": "bus-stop-nearby" }
+            {
+              "name": "Car parking",
+              "slug": "car-parking"
+            },
+            {
+              "name": "Bus stop nearby",
+              "slug": "bus-stop-nearby"
+            }
           ]
         }
       ],
@@ -3705,23 +5313,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 3355,
@@ -3777,7 +5412,33 @@
       "created_at": "2023-01-10T14:47:01.793Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 37,
+          "service_id": 9557,
+          "location_id": 10545,
+          "location": {
+            "id": 10545,
+            "name": "Wycombe Swan",
+            "address_1": "St Mary Street",
+            "city": "High Wycombe",
+            "state_province": null,
+            "postal_code": "HP11 2XE",
+            "country": null,
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.750104, 51.628052]
+            },
+            "mask_exact_address": false,
+            "accessibilities": []
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -3813,23 +5474,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": ""
         },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 1197,
@@ -3869,23 +5557,31 @@
           "id": 18780,
           "weekday": "Tuesday",
           "opens_at": "10:30",
-          "closes_at": "15:30"
+          "closes_at": "15:30",
+          "service_at_location": null
         },
         {
           "id": 18781,
           "weekday": "Wednesday",
           "opens_at": "10:30",
-          "closes_at": "15:30"
+          "closes_at": "15:30",
+          "service_at_location": null
         },
         {
           "id": 19848,
           "weekday": "Thursday",
           "opens_at": "10:30",
-          "closes_at": "15:30"
+          "closes_at": "15:30",
+          "service_at_location": null
         }
       ],
       "cost_options": [
-        { "id": 5855, "option": " ", "amount": "32.00", "cost_type": "per day" }
+        {
+          "id": 5855,
+          "option": " ",
+          "amount": "32.00",
+          "cost_type": "per day"
+        }
       ],
       "links": [
         {
@@ -3917,7 +5613,46 @@
       "created_at": "2021-03-01T15:34:12.346Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 38,
+          "service_id": 1993,
+          "location_id": 2545,
+          "location": {
+            "id": 2545,
+            "name": "",
+            "address_1": null,
+            "city": "Amersham",
+            "state_province": "Buckinghamshire",
+            "postal_code": "HP7",
+            "country": "GB",
+            "geometry": {
+              "type": "Point",
+              "coordinates": [-0.6, 51.67]
+            },
+            "mask_exact_address": true,
+            "accessibilities": [
+              {
+                "name": "Baby changing facilities",
+                "slug": "baby-changing-facilities"
+              },
+              {
+                "name": "Car parking",
+                "slug": "car-parking"
+              },
+              {
+                "name": "Changing facilities",
+                "slug": "changing-facilities"
+              }
+            ]
+          },
+          "regular_schedule": []
+        }
       ],
       "locations": [
         {
@@ -3928,15 +5663,24 @@
           "state_province": "Buckinghamshire",
           "postal_code": "HP7",
           "country": "GB",
-          "geometry": { "type": "Point", "coordinates": [-0.6, 51.67] },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [-0.6, 51.67]
+          },
           "mask_exact_address": true,
           "accessibilities": [
             {
               "name": "Baby changing facilities",
               "slug": "baby-changing-facilities"
             },
-            { "name": "Car parking", "slug": "car-parking" },
-            { "name": "Changing facilities", "slug": "changing-facilities" }
+            {
+              "name": "Car parking",
+              "slug": "car-parking"
+            },
+            {
+              "name": "Changing facilities",
+              "slug": "changing-facilities"
+            }
           ]
         }
       ],
@@ -3950,26 +5694,50 @@
         }
       ],
       "meta": [
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "Yes" },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "Yes"
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": "51"
         },
-        { "key": "Maximum number of children a day?", "value": "" },
-        { "key": "Vacancies for under 5 year olds", "value": "" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "" },
-        { "key": "Vacancies for over 8 year olds", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": ""
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": ""
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
         {
           "key": "Communication Email address",
           "value": "lu.m.hyatt@gmail.com"
         },
-        { "key": "Contact Name", "value": "Lu Hyatt" },
-        { "key": "Contact Phone number ", "value": "01494583991" }
+        {
+          "key": "Contact Name",
+          "value": "Lu Hyatt"
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": "01494583991"
+        }
       ],
       "organisation": {
         "id": 2007,
@@ -4003,43 +5771,50 @@
           "id": 3068,
           "weekday": "Monday",
           "opens_at": "07:00",
-          "closes_at": "19:00"
+          "closes_at": "19:00",
+          "service_at_location": null
         },
         {
           "id": 3069,
           "weekday": "Tuesday",
           "opens_at": "07:00",
-          "closes_at": "19:00"
+          "closes_at": "19:00",
+          "service_at_location": null
         },
         {
           "id": 3070,
           "weekday": "Wednesday",
           "opens_at": "07:00",
-          "closes_at": "19:00"
+          "closes_at": "19:00",
+          "service_at_location": null
         },
         {
           "id": 3071,
           "weekday": "Thursday",
           "opens_at": "07:00",
-          "closes_at": "19:00"
+          "closes_at": "19:00",
+          "service_at_location": null
         },
         {
           "id": 3072,
           "weekday": "Friday",
           "opens_at": "07:00",
-          "closes_at": "19:00"
+          "closes_at": "19:00",
+          "service_at_location": null
         },
         {
           "id": 18671,
           "weekday": "Saturday",
           "opens_at": "09:00",
-          "closes_at": "18:00"
+          "closes_at": "18:00",
+          "service_at_location": null
         },
         {
           "id": 18672,
           "weekday": "Sunday",
           "opens_at": "09:00",
-          "closes_at": "18:00"
+          "closes_at": "18:00",
+          "service_at_location": null
         }
       ],
       "cost_options": [
@@ -4108,7 +5883,19 @@
       "created_at": "2023-01-17T22:04:33.596Z",
       "status": "active",
       "target_directories": [
-        { "name": "Family Information Service", "label": "bfis" }
+        {
+          "name": "Family Information Service",
+          "label": "bfis"
+        }
+      ],
+      "service_at_locations": [
+        {
+          "id": 39,
+          "service_id": 9624,
+          "location_id": null,
+          "location": {},
+          "regular_schedule": []
+        }
       ],
       "locations": [],
       "contacts": [
@@ -4121,23 +5908,50 @@
         }
       ],
       "meta": [
-        { "key": "Maximum number of children a day?", "value": "" },
+        {
+          "key": "Maximum number of children a day?",
+          "value": ""
+        },
         {
           "key": "How many weeks in a calendar year are you open?",
           "value": "45"
         },
-        { "key": "Vacancies for under 5 year olds", "value": "10" },
-        { "key": "Vacancies for 5 to 8 year olds", "value": "10" },
-        { "key": "Vacancies for over 8 year olds", "value": "10" },
-        { "key": "Do you provide a pick-up/drop-off service?", "value": "No" },
+        {
+          "key": "Vacancies for under 5 year olds",
+          "value": "10"
+        },
+        {
+          "key": "Vacancies for 5 to 8 year olds",
+          "value": "10"
+        },
+        {
+          "key": "Vacancies for over 8 year olds",
+          "value": "10"
+        },
+        {
+          "key": "Do you provide a pick-up/drop-off service?",
+          "value": "No"
+        },
         {
           "key": "Where is your pick-up/drop-off service from/to?",
           "value": ""
         },
-        { "key": "Childcare vacancies currently", "value": "No" },
-        { "key": "Communication Email address", "value": "" },
-        { "key": "Contact Name", "value": "" },
-        { "key": "Contact Phone number ", "value": "" }
+        {
+          "key": "Childcare vacancies currently",
+          "value": "No"
+        },
+        {
+          "key": "Communication Email address",
+          "value": ""
+        },
+        {
+          "key": "Contact Name",
+          "value": ""
+        },
+        {
+          "key": "Contact Phone number ",
+          "value": ""
+        }
       ],
       "organisation": {
         "id": 6465,
@@ -4165,31 +5979,36 @@
           "id": 14240,
           "weekday": "Monday",
           "opens_at": "17:00",
-          "closes_at": "18:00"
+          "closes_at": "18:00",
+          "service_at_location": null
         },
         {
           "id": 14241,
           "weekday": "Monday",
           "opens_at": "18:15",
-          "closes_at": "19:15"
+          "closes_at": "19:15",
+          "service_at_location": null
         },
         {
           "id": 14242,
           "weekday": "Monday",
           "opens_at": "19:30",
-          "closes_at": "20:30"
+          "closes_at": "20:30",
+          "service_at_location": null
         },
         {
           "id": 14243,
           "weekday": "Saturday",
           "opens_at": "09:00",
-          "closes_at": "10:00"
+          "closes_at": "10:00",
+          "service_at_location": null
         },
         {
           "id": 14244,
           "weekday": "Saturday",
           "opens_at": "10:15",
-          "closes_at": "11:15"
+          "closes_at": "11:15",
+          "service_at_location": null
         }
       ],
       "cost_options": [
@@ -4217,7 +6036,11 @@
           "name": "Visual and/or hearing impediment",
           "slug": "visual-and-or-hearing-impediment"
         },
-        { "id": 2, "name": "Older people", "slug": "older-people" },
+        {
+          "id": 2,
+          "name": "Older people",
+          "slug": "older-people"
+        },
         {
           "id": 5,
           "name": "Mental health/acquired brain injury",
diff --git a/src/components/ListMap/index.jsx b/src/components/ListMap/index.jsx
index 6739374..059a0f4 100644
--- a/src/components/ListMap/index.jsx
+++ b/src/components/ListMap/index.jsx
@@ -20,8 +20,8 @@ const BoundSetter = ({ results }) => {
     if (results.length > 0) {
       results.map(result =>
         bounds.extend({
-          lat: result.location.geometry.coordinates[1],
-          lng: result.location.geometry.coordinates[0],
+          lat: result.location?.geometry?.coordinates[1],
+          lng: result.location?.geometry?.coordinates[0],
         })
       )
       map.fitBounds(bounds)
@@ -34,8 +34,8 @@ const ListMap = React.memo(({ results, isLoaded, location, navigate }) => {
   const plottableResults = results.reduce((acc, result) => {
     result.service_at_locations.forEach(service_at_location => {
       if (
-        service_at_location.location.geometry.coordinates[0] &&
-        service_at_location.location.geometry.coordinates[1] &&
+        service_at_location.location?.geometry?.coordinates[0] &&
+        service_at_location.location?.geometry?.coordinates[1] &&
         !acc.find(item => item.id === result.id) // Check if the result id is already in the accumulator
       ) {
         acc.push({
diff --git a/src/components/ListMapStatic/index.jsx b/src/components/ListMapStatic/index.jsx
index 6d17a04..30dd6ea 100644
--- a/src/components/ListMapStatic/index.jsx
+++ b/src/components/ListMapStatic/index.jsx
@@ -27,8 +27,8 @@ export default ({ results }) => {
   results.map(result =>
     result.service_at_locations.map(service_at_location => {
       if (
-        service_at_location.location.geometry.coordinates[0] &&
-        service_at_location.location.geometry.coordinates[1]
+        service_at_location.location?.geometry?.coordinates[0] &&
+        service_at_location.location?.geometry?.coordinates[1]
       ) {
         resultsLatLng.push([
           `${service_at_location.location.geometry.coordinates[1]},${service_at_location.location.geometry.coordinates[0]}`,

From 4aaa5c282bca08892e287be8d324351e29941521 Mon Sep 17 00:00:00 2001
From: Han <apricot13@users.noreply.github.com>
Date: Mon, 24 Jun 2024 12:55:00 +0100
Subject: [PATCH 4/5] TOP-241 update footer text

---
 src/components/Prefooter/index.jsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Prefooter/index.jsx b/src/components/Prefooter/index.jsx
index aed4dc7..100a067 100644
--- a/src/components/Prefooter/index.jsx
+++ b/src/components/Prefooter/index.jsx
@@ -34,10 +34,14 @@ const Prefooter = ({ children }) => (
       {theme.feedbackUrl && (
         <Styles.PrefooterColumn>
           <h2>Feedback</h2>
-          <p>This is a brand new website. Your feedback helps us improve it.</p>
-          <Styles.PrefooterLink href={theme.feedbackUrl}>
-            Give feedback
-          </Styles.PrefooterLink>
+          <p>
+            Use our{" "}
+            <Styles.PrefooterLink href={theme.feedbackUrl}>
+              feedback form
+            </Styles.PrefooterLink>{" "}
+            to tell us what you think about our directory. Your feedback helps
+            us to improve our service.
+          </p>
         </Styles.PrefooterColumn>
       )}
 

From 1d6287d521a9b03aad130a1a97fe05d54d10591d Mon Sep 17 00:00:00 2001
From: Han <apricot13@users.noreply.github.com>
Date: Tue, 9 Jul 2024 13:06:35 +0100
Subject: [PATCH 5/5] Tweaks for sort order

---
 cypress/e2e/results_list.cy.js       |  2 +-
 src/App.jsx                          |  2 +-
 src/components/ServiceCard/index.jsx |  4 ++--
 src/lib/data-helpers.js              | 11 +++--------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/cypress/e2e/results_list.cy.js b/cypress/e2e/results_list.cy.js
index f5f227e..3f7a7e7 100644
--- a/cypress/e2e/results_list.cy.js
+++ b/cypress/e2e/results_list.cy.js
@@ -48,7 +48,7 @@ describe("Results list page", () => {
     cy.wait("@searchForServices")
 
     cy.get("p").contains(
-      "Showing 1-20 out of ~2805 results for Example near Example2"
+      "Showing 1-20 out of ~2805 results for Example within 20 miles of Example2"
     )
   })
 
diff --git a/src/App.jsx b/src/App.jsx
index 741cfcb..20812bd 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -482,7 +482,7 @@ const MainContent = ({
             )}{" "}
             {coverage && (
               <>
-                near <strong>{coverage}</strong>
+                within 20 miles of <strong>{coverage}</strong>
               </>
             )}
           </>
diff --git a/src/components/ServiceCard/index.jsx b/src/components/ServiceCard/index.jsx
index 3d2a51e..14cc559 100644
--- a/src/components/ServiceCard/index.jsx
+++ b/src/components/ServiceCard/index.jsx
@@ -61,7 +61,7 @@ const Description = styled.p`
 `
 
 const ServiceCard = React.forwardRef(
-  ({ id, name, description, ...service }, ref) => {
+  ({ id, name, description, score, ...service }, ref) => {
     const { search } = useLocation()
     // const [hasRef, setHasRef] = useState(false)
 
@@ -71,7 +71,7 @@ const ServiceCard = React.forwardRef(
 
     // <Outer ref={ref} hasRef={hasRef}>
     return (
-      <Outer ref={ref}>
+      <Outer ref={ref} data-score={score}>
         <StyledLink to={`/service/${id}${search}`}>
           <Name>{name}</Name>
         </StyledLink>
diff --git a/src/lib/data-helpers.js b/src/lib/data-helpers.js
index faddfa5..b86a1e0 100644
--- a/src/lib/data-helpers.js
+++ b/src/lib/data-helpers.js
@@ -96,16 +96,11 @@ export const removeDuplicateServices = services => {
 }
 
 export const sortServices = (services, query) => {
-  let { keywords, lat, lng, location } = queryString.parse(query)
+  let { keywords } = queryString.parse(query)
   // sorting
-  // if there is a location then sort by distance_away
-  // if there is a keyword and no location then the order matters
+  // if there is a keyword sort by score
   // otherwise sort by updated_at
-  if (!keywords && (lat || lng || location)) {
-    return services.sort(
-      (a, b) => new Date(a.distance_away) - new Date(b.distance_away)
-    )
-  } else if (keywords && !(lat || lng || location)) {
+  if (keywords) {
     return services.sort((a, b) => new Date(b.score) - new Date(a.score))
   } else {
     return services.sort(