cgh ! use p_code instead of UUID for admin area HOPE core API push

Author: vitali-yanushchyk-valor

src/country_workspace/contrib/hope/geo.py

@@ -7,7 +7,6 @@
 
 from country_workspace.cache.manager import cache_manager
 from country_workspace.state import state
-from country_workspace.utils.fields import extract_uuid
 
 from ...exceptions import RemoteError
 
@@ -65,7 +64,6 @@ class AdminLevelChoice(APIChoicesMixin, ChildFieldMixin, forms.ChoiceField):
 
     def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
-        self.id_to_code, self.code_to_id = {}, {}
         self.choices = self.get_choices_for_parent_value(parent_value=state.tenant.slug)
 
     def validate_with_parent(self, parent_value: Any, value: Any) -> None:
@@ -84,20 +82,11 @@ def get_choices_for_parent_value(
         ):
             return [] if only_codes else [("", "")]
 
-        self.code_to_id = {r["p_code"]: str(extract_uuid(str(r["id"]), "Area:")) for r in filtered}
-        self.id_to_code = {v: k for k, v in self.code_to_id.items()}
-
-        if only_codes:
-            return list(self.code_to_id)
-        return [("", ""), *[(r["p_code"], f"{r['p_code']} - {r['name']}") for r in filtered]]
-
-    def prepare_value(self, value: Any) -> str | None:
-        val = super().prepare_value(value)
-        return self.id_to_code.get(str(val), val)
-
-    def to_python(self, value: Any) -> str | None:
-        val = self.code_to_id.get(value, value)
-        return super().to_python(val)
+        return (
+            [r["p_code"] for r in filtered]
+            if only_codes
+            else [("", ""), *[(r["p_code"], f"{r['p_code']} - {r['name']}") for r in filtered]]
+        )
 
     def _get_valid_area_types(self) -> set[Any]:
         key = f"area_types_level_{self.level}"

tests/contrib/hope/test_geo.py

@@ -33,7 +33,6 @@
     "previous": None,
     "results": [
         {
-            "id": str(uuid4()),
             "name": "Kyivska",
             "p_code": "UA32",
             "area_type": str(uuid4()),
@@ -85,7 +84,7 @@ def test_admin_level_choice_validate(
     FlexFieldFactory(name="region", definition=fd2, fieldset=fs, master=country_field)
 
     country = COUNTRY["results"][0]["iso_code2"]
-    area_id = ADMIN1_UA["results"][0]["id"]
+    area_id = ADMIN1_UA["results"][0]["p_code"]
     errors = fs.validate([{"country": country, "region": area_id}])
     assert errors == {}
 
@@ -176,27 +175,3 @@ def test_admin_level_choice_cached_data(
 
     assert fetched == cached_data
     mock_get.assert_not_called()
-
-
-@override_config(HOPE_API_URL="https://fake-hope.org/api/rest/")
-def test_admin_level_choice_prepare_value(
-    db,
-    mocker: MockerFixture,
-    mocked_responses: RequestsMock,
-    office: "Office",
-    mock_area_type: mock.Mock,
-    mock_cache: mock.Mock,
-):
-    mocker.patch("country_workspace.contrib.hope.geo.state.tenant", office)
-    mocked_responses.add(
-        mocked_responses.GET,
-        f"https://fake-hope.org/api/rest/{office.slug}/geo/areas/",
-        json=ADMIN1_UA,
-    )
-
-    field = Admin1Choice()
-    rec = ADMIN1_UA["results"][0]
-
-    assert field.prepare_value(rec["id"]) == rec["p_code"]
-    assert field.prepare_value(rec["p_code"]) == rec["p_code"]
-    assert field.prepare_value("UNKNOWN") == "UNKNOWN"