UHF-9569: UHF-9569: Fix deprecated usage of administrative_division e…

…ndpoint

service_point_id- and unit-fields will be removed in the future. They
should be replaced with the use of "units" field. The deprecated fields
will stop appearing in the api results some time soon.

src/js/react/apps/health-station-search/enum/AppSettings.ts

@@ -1,6 +1,6 @@
 const AppSettings = {
   index: 'health_stations',
-  locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&type=health_station_district&unit_include=id',
+  locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&type=health_station_district',
   size: 15
 };
 

src/js/react/apps/health-station-search/hooks/UseProximityQuery.ts

@@ -7,8 +7,8 @@ import configurationsAtom from '../store';
 import getQueryString from '../helpers/ProximityQuery';
 import AppSettings from '../enum/AppSettings';
 
-type Unit = {
-  id?: number
+type Result = {
+  units?: number[]
 };
 
 const UseProximityQuery = (params: SearchParams) => {
@@ -45,7 +45,7 @@ const UseProximityQuery = (params: SearchParams) => {
         return null;
       }
 
-      ids = locationsData.results.map((result: { unit: Unit }) => result.unit.id);
+      ids = locationsData.results.flatMap((result: Result) => result.units ?? []);
     }
 
     return fetch(`${baseUrl}/${index}/_search`, {

src/js/react/apps/maternity-and-child-health-clinic-search/enum/AppSettings.ts

@@ -1,6 +1,6 @@
 const AppSettings = {
   index: 'maternity_and_child_health_clinic',
-  locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&type=maternity_clinic_district&unit_include=id',
+  locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&type=maternity_clinic_district',
   size: 15
 };
 

src/js/react/apps/maternity-and-child-health-clinic-search/hooks/UseProximityQuery.ts

@@ -7,8 +7,8 @@ import configurationsAtom from '../store';
 import getQueryString from '../helpers/ProximityQuery';
 import AppSettings from '../enum/AppSettings';
 
-type Unit = {
-  id?: number
+type Result = {
+  units?: number[]
 };
 
 const UseProximityQuery = (params: SearchParams) => {
@@ -45,7 +45,7 @@ const UseProximityQuery = (params: SearchParams) => {
         return null;
       }
 
-      ids = locationsData.results.map((result: { unit: Unit }) => result.unit.id);
+      ids = locationsData.results.flatMap((result: Result) => result.units ?? []);
     }
 
     return fetch(`${baseUrl}/${index}/_search`, {

src/js/react/apps/school-search/enum/AppSettings.ts

@@ -1,6 +1,6 @@
 const AppSettings = {
   index: 'schools',
-  locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&unit_include=id&type=lower_comprehensive_school_district_fi,lower_comprehensive_school_district_sv,upper_comprehensive_school_district_fi,upper_comprehensive_school_district_sv',
+  locationsBaseUrl: 'https://api.hel.fi/servicemap/v2/administrative_division/?municipality=helsinki&type=lower_comprehensive_school_district_fi,lower_comprehensive_school_district_sv,upper_comprehensive_school_district_fi,upper_comprehensive_school_district_sv',
   size: 15
 };
 

src/js/react/apps/school-search/hooks/UseProximityQuery.ts

@@ -7,8 +7,8 @@ import configurationsAtom from '../store';
 import getQueryString from '../helpers/ProximityQuery';
 import AppSettings from '../enum/AppSettings';
 
-type Unit = {
-  id?: number
+type Result = {
+  units?: number[]
 };
 
 const UseProximityQuery = (params: SearchParams) => {
@@ -45,7 +45,7 @@ const UseProximityQuery = (params: SearchParams) => {
         return null;
       }
 
-      ids = locationsData.results.map((result: { unit: Unit }) => result.unit.id);
+      ids = locationsData.results.flatMap((result: Result) => result.units ?? []);
     }
 
     return fetch(`${baseUrl}/${index}/_search`, {