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

Author: vitali-yanushchyk-valor

src/country_workspace/contrib/hope/push.py

@@ -193,10 +193,11 @@ def prepare_batch(self) -> tuple[list[int], list[dict]]:
         ids, data = [], []
         for item in self.queryset:
             ids.append(item.id)
+            filter_none = lambda d: {k: v for k, v in d.items() if v is not None}
             data.append(
-                {**item.flex_fields, "members": [m.flex_fields for m in item.members.all()]}
+                {**filter_none(item.flex_fields), "members": [filter_none(m.flex_fields) for m in item.members.all()]}
                 if self.master_detail
-                else item.flex_fields
+                else filter_none(item.flex_fields)
             )
         return ids, data
 

src/country_workspace/utils/fields.py

@@ -1,9 +1,6 @@
-import binascii
 from collections.abc import Callable, Mapping, Iterable
 from functools import reduce
 from typing import Any
-from base64 import b64decode
-from uuid import UUID
 
 from django.utils import timezone
 
@@ -58,32 +55,3 @@ def uppercase_field_value(k: str, v: Any, fields_to_uppercase: Iterable[str] = T
 
     """
     return v.upper() if isinstance(v, str) and any(k.startswith(prefix) for prefix in fields_to_uppercase) else v
-
-
-def extract_uuid(value: str, prefix: str | None = None) -> UUID:
-    """Extract a UUID from the given string.
-
-    - If `value` is already a UUID, returns it unchanged.
-    - Otherwise attempts Base64-decoding and stripping an optional `prefix`.
-
-    """
-    if not isinstance(value, str):
-        raise TypeError("value must be a str")
-    if prefix is not None and not isinstance(prefix, str):
-        raise TypeError("prefix must be a str or None")
-
-    try:
-        return UUID(value)
-    except ValueError:
-        pass
-
-    try:
-        decoded = b64decode(value, validate=True).decode()
-    except (binascii.Error, UnicodeDecodeError):
-        raise ValueError(f"value is neither a valid UUID nor valid Base64: {value!r}")
-
-    raw = decoded.removeprefix(prefix or "")
-    try:
-        return UUID(raw)
-    except ValueError:
-        raise ValueError(f"decoded data is not a valid UUID: {raw!r}")

tests/utils/test_utils_fields.py

@@ -4,15 +4,12 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from pytest_mock import MockerFixture
 
-from base64 import b64encode
-from uuid import uuid4, UUID
 
 from country_workspace.contrib.kobo.api.data.helpers import VALUE_FORMAT
 from country_workspace.utils.fields import (
     clean_field_name,
     TO_REMOVE_VALUES,
     clean_field_names,
-    extract_uuid,
 )
 from country_workspace.utils.flex_fields import (
     Base64ImageInput,
@@ -85,41 +82,6 @@ def test_base64_image_field_content_is_unchanged(mocker: MockerFixture) -> None:
     super_clean_mock.assert_called_once_with(data, initial_data)
 
 
-FAKE_UUID = uuid4()
-FAKE_PREFIX = "Area:"
-ENC_B64_PREF = b64encode(f"{FAKE_PREFIX}{FAKE_UUID}".encode()).decode()
-ENC_B64 = b64encode(str(FAKE_UUID).encode()).decode()
-ENC_B64_BAD = b64encode("hello-world".encode()).decode()
-
-
-@pytest.mark.parametrize(
-    ("value", "prefix", "expected"),
-    [
-        (str(FAKE_UUID), None, FAKE_UUID),
-        (ENC_B64_PREF, FAKE_PREFIX, FAKE_UUID),
-        (ENC_B64, None, FAKE_UUID),
-    ],
-    ids=["raw-uuid", "b64-with-prefix", "b64-no-prefix"],
-)
-def test_extract_uuid_success(value: str, prefix: str | None, expected: UUID) -> None:
-    assert extract_uuid(value, prefix) == expected
-
-
-@pytest.mark.parametrize(
-    ("value", "prefix", "exc_type"),
-    [
-        ("not-a-uuid-or-base64", None, ValueError),
-        (ENC_B64_BAD, None, ValueError),
-        (123, None, TypeError),
-        (str(FAKE_UUID), 123, TypeError),
-    ],
-    ids=["invalid-string", "b64-not-uuid", "value-not-str", "prefix-not-str"],
-)
-def test_extract_uuid_errors(value: str | int, prefix: str | int | None, exc_type: type[Exception]) -> None:
-    with pytest.raises(exc_type):
-        extract_uuid(value, prefix)
-
-
 @pytest.mark.parametrize(
     ("value", "expected"),
     [