merging from main

core/api/people_finder.py

@@ -3,21 +3,14 @@
 from core import services as core_services
 from core.schemas import Error
 from core.schemas.peoplefinder import (
-    CountrySchema,
     CountryResponse,
     CreateProfileRequest,
-    MinimalPeopleFinderProfile,
     ProfileMinimalResponse,
     ProfileResponse,
+    TextChoiceResponseSchema,
     UkStaffLocationResponse,
     UpdateProfileRequest,
 )
-from core.schemas.profiles import (
-    PeopleFinderProfileRequestSchema,
-    PeopleFinderProfileResponseSchema,
-    TextChoiceResponseSchema,
-    UkStaffLocationSchema,
-)
 from profiles.exceptions import ProfileExists
 from profiles.models.combined import Profile
 from profiles.models.generic import Country, UkStaffLocation
@@ -34,7 +27,7 @@
 @profile_router.get(
     "{slug}",
     response={
-        200: MinimalPeopleFinderProfile,
+        200: ProfileMinimalResponse,
         404: Error,
     },
 )
@@ -159,7 +152,7 @@ def update_profile(
 @reference_router.get(
     "countries/",
     response={
-        200: list[CountrySchema],
+        200: list[CountryResponse],
         404: Error,
     },
 )

core/schemas/peoplefinder.py

@@ -164,3 +164,8 @@ class Meta:
             "organisation",
             "building_name",
         ]
+
+
+class TextChoiceResponseSchema(Schema):
+    key: str
+    value: str

e2e_tests/test_peoplefinder.py

@@ -105,6 +105,7 @@ def test_create(combined_profile):
         ]
     }
 
+
 def test_get_workday(mocker):
     url = reverse("people-finder:get_workday")
     client = Client()

profiles/services/peoplefinder.py

@@ -5,8 +5,8 @@
 from django.contrib.admin.options import get_content_type_for_model
 from django.contrib.auth import get_user_model
 
-from profiles.models import Workday
 from profiles.exceptions import ProfileExists
+from profiles.models import Workday
 from profiles.models.generic import Country, Email, UkStaffLocation
 from profiles.models.peoplefinder import PeopleFinderProfile
 from profiles.types import UNSET, Unset