Some fixes

Author: srugano

src/hope_country_report/apps/hope/models/_inspect.py

@@ -38,7 +38,6 @@ class BusinessArea(HopeModel):
     deduplication_batch_duplicates_allowed = models.IntegerField(null=True)
     deduplication_golden_record_duplicates_percentage = models.IntegerField(null=True)
     deduplication_golden_record_duplicates_allowed = models.IntegerField(null=True)
-    screen_beneficiary = models.BooleanField(null=True)
     deduplication_ignore_withdraw = models.BooleanField(null=True)
     biometric_deduplication_threshold = models.FloatField(null=True)
     is_accountability_applicable = models.BooleanField(null=True)
@@ -47,6 +46,9 @@ class BusinessArea(HopeModel):
     parent = models.ForeignKey(
         "self", on_delete=models.DO_NOTHING, related_name="businessarea_parent", blank=True, null=True
     )
+    office_country = models.ForeignKey(
+        "Country", on_delete=models.DO_NOTHING, related_name="businessarea_office_country", blank=True, null=True
+    )
 
     class Meta:
         managed = False
@@ -76,6 +78,23 @@ class Tenant:
         tenant_filter_field: str = "__all__"
 
 
+class BusinessareaPaymentCountries(HopeModel):
+    id = models.BigAutoField(primary_key=True)
+    businessarea = models.ForeignKey(
+        BusinessArea, on_delete=models.DO_NOTHING, related_name="businessareapaymentcountries_businessarea", null=True
+    )
+    country = models.ForeignKey(
+        "Country", on_delete=models.DO_NOTHING, related_name="businessareapaymentcountries_country", null=True
+    )
+
+    class Meta:
+        managed = False
+        db_table = "core_businessarea_payment_countries"
+
+    class Tenant:
+        tenant_filter_field: str = "__all__"
+
+
 class Businessareapartnerthrough(HopeModel):
     id = models.UUIDField(primary_key=True)
     created_at = models.DateTimeField(null=True)
@@ -890,35 +909,6 @@ class Tenant:
         tenant_filter_field: str = "__all__"
 
 
-class BankaccountInfo(HopeModel):
-    id = models.UUIDField(primary_key=True)
-    rdi_merge_status = models.CharField(max_length=10, null=True)
-    is_original = models.BooleanField(null=True)
-    created_at = models.DateTimeField(null=True)
-    updated_at = models.DateTimeField(null=True)
-    is_removed = models.BooleanField(null=True)
-    removed_date = models.DateTimeField(blank=True, null=True)
-    last_sync_at = models.DateTimeField(blank=True, null=True)
-    bank_name = models.CharField(max_length=255, null=True)
-    bank_account_number = models.CharField(max_length=64, null=True)
-    debit_card_number = models.CharField(max_length=255, null=True)
-    bank_branch_name = models.CharField(max_length=255, null=True)
-    account_holder_name = models.CharField(max_length=255, null=True)
-    copied_from = models.ForeignKey(
-        "self", on_delete=models.DO_NOTHING, related_name="bankaccountinfo_copied_from", blank=True, null=True
-    )
-    individual = models.ForeignKey(
-        "Individual", on_delete=models.DO_NOTHING, related_name="bankaccountinfo_individual", null=True
-    )
-
-    class Meta:
-        managed = False
-        db_table = "household_bankaccountinfo"
-
-    class Tenant:
-        tenant_filter_field: str = "__all__"
-
-
 class Document(HopeModel):
     id = models.UUIDField(primary_key=True)
     rdi_merge_status = models.CharField(max_length=10, null=True)
@@ -1140,6 +1130,8 @@ class Household(HopeModel):
     unknown_sex_group_count = models.IntegerField(blank=True, null=True)
     latitude = models.FloatField(blank=True, null=True)
     longitude = models.FloatField(blank=True, null=True)
+    collision_flag = models.BooleanField(null=True)
+    identification_key = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
         managed = False
@@ -1149,6 +1141,26 @@ class Tenant:
         tenant_filter_field: str = "__all__"
 
 
+class HouseholdExtraRdis(HopeModel):
+    id = models.BigAutoField(primary_key=True)
+    household = models.ForeignKey(
+        Household, on_delete=models.DO_NOTHING, related_name="householdextrardis_household", null=True
+    )
+    registrationdataimport = models.ForeignKey(
+        "DataRegistrationdataimport",
+        on_delete=models.DO_NOTHING,
+        related_name="householdextrardis_registrationdataimport",
+        null=True,
+    )
+
+    class Meta:
+        managed = False
+        db_table = "household_household_extra_rdis"
+
+    class Tenant:
+        tenant_filter_field: str = "__all__"
+
+
 class HouseholdCollection(HopeModel):
     id = models.BigAutoField(primary_key=True)
     unicef_id = models.CharField(max_length=255, blank=True, null=True)
@@ -1369,7 +1381,7 @@ class Account(HopeModel):
     )
     is_unique = models.BooleanField(null=True)
     account_type = models.ForeignKey(
-        "Accounttype", on_delete=models.DO_NOTHING, related_name="account_account_type", blank=True, null=True
+        "Accounttype", on_delete=models.DO_NOTHING, related_name="account_account_type", null=True
     )
     number = models.CharField(max_length=256, blank=True, null=True)
     financial_institution = models.ForeignKey(
@@ -2090,6 +2102,8 @@ class Program(HopeModel):
     beneficiary_group = models.ForeignKey(
         Beneficiarygroup, on_delete=models.DO_NOTHING, related_name="program_beneficiary_group", null=True
     )
+    collision_detection_enabled = models.BooleanField(null=True)
+    collision_detector = models.CharField(max_length=200, blank=True, null=True)
 
     class Meta:
         managed = False
@@ -2117,6 +2131,20 @@ class Tenant:
         tenant_filter_field: str = "__all__"
 
 
+class ProgramSanctionLists(HopeModel):
+    id = models.BigAutoField(primary_key=True)
+    program = models.ForeignKey(
+        Program, on_delete=models.DO_NOTHING, related_name="programsanctionlists_program", null=True
+    )
+
+    class Meta:
+        managed = False
+        db_table = "program_program_sanction_lists"
+
+    class Tenant:
+        tenant_filter_field: str = "__all__"
+
+
 class ProgramCycle(HopeModel):
     id = models.UUIDField(primary_key=True)
     created_at = models.DateTimeField(null=True)

src/hope_country_report/apps/power_query/utils.py

@@ -11,15 +11,18 @@
 from functools import wraps
 from io import BytesIO
 from pathlib import Path
+from urllib.parse import urljoin
 
 from django.conf import settings
 from django.contrib.auth import authenticate
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.db.models import QuerySet
 from django.http import HttpRequest, HttpResponse
 from django.utils.safestring import mark_safe
 
 import fitz
 import qrcode
+import requests
 import tablib
 from constance import config
 from PIL import ExifTags, Image, ImageDraw, ImageFont
@@ -149,20 +152,37 @@ def wrapper(*args: Any, **kwargs: Any) -> Any:
     return wrapper
 
 
+def get_font_url(font_filename: str) -> str:
+    """Constructs an absolute URL for a given font file."""
+    font_path = f"fonts/{font_filename}"
+    font_url = staticfiles_storage.url(font_path)
+    if not font_url.startswith(("http://", "https://")):
+        font_url = urljoin(settings.HOST, font_url)
+    return font_url
+
+
 def load_font_for_language(language: str, font_size: int = 12) -> ImageFont.FreeTypeFont:
-    """Returns the appropriate font for the given language."""
-    # Base directory for fonts
-    base_font_path = Path(settings.STATIC_ROOT) / "fonts"
-    font_files = {
-        "arabic": base_font_path / "NotoNaskhArabic-Bold.ttf",
-        "cyrillic": base_font_path / "FreeSansBold.ttf",
-        "bengali": base_font_path / "NotoSansBengali-Bold.ttf",
-        "burmese": base_font_path / "NotoSerifMyanmar-Bold.ttf",
+    """Returns the appropriate font for the given language by fetching it from its static URL."""
+    font_filenames = {
+        "arabic": "NotoNaskhArabic-Bold.ttf",
+        "cyrillic": "FreeSansBold.ttf",
+        "bengali": "NotoSansBengali-Bold.ttf",
+        "burmese": "NotoSerifMyanmar-Bold.ttf",
     }
 
-    default_font = base_font_path / "FreeSansBold.ttf"
-    font_path = font_files.get(language, default_font)
-    return ImageFont.truetype(str(font_path), size=font_size)
+    default_font_filename = "FreeSansBold.ttf"
+    font_filename = font_filenames.get(language, default_font_filename)
+    font_url = get_font_url(font_filename)
+
+    try:
+        response = requests.get(font_url, timeout=10)
+        response.raise_for_status()
+        font_data = BytesIO(response.content)
+        return ImageFont.truetype(font_data, size=font_size)
+    except requests.exceptions.RequestException as e:
+        logger.error(f"Failed to fetch font from {font_url}: {e}")
+        capture_exception(e)
+        raise
 
 
 def get_field_rect(document: fitz.Document, field_name: str) -> tuple[fitz.Rect, int] | None:

tests/power_query/test_pq_utils.py

@@ -21,6 +21,7 @@
     convert_pdf_to_image_pdf,
     dict_hash,
     get_field_rect,
+    get_font_url,
     get_sentry_url,
     insert_qr_code,
     insert_special_image,
@@ -203,7 +204,20 @@ def test_get_field_rect(sample_pdf: fitz.Document) -> None:
     assert page_index == 0
 
 
-def test_insert_special_language_image():
+def test_insert_special_language_image(mocked_responses):
+    expected_font_name = "NotoNaskhArabic-Bold.ttf"
+    font_url = get_font_url(expected_font_name)
+
+    font_file_path = resource_path(f"web/static/fonts/{expected_font_name}")
+    with open(font_file_path, "rb") as f:
+        font_content = f.read()
+
+    mocked_responses.add(
+        "GET",
+        font_url,
+        body=font_content,
+        status=200,
+    )
     text = "الافترايفكتس و البريمير و الافد ميدا كومبوزر"
     rect = fitz.Rect(0, 0, 200, 200)
     language = "arabic"
@@ -219,7 +233,20 @@ def test_convert_pdf_to_image_pdf(sample_pdf):
     assert len(new_pdf) == 1
 
 
-def test_insert_special_image(sample_pdf: fitz.Document) -> None:
+def test_insert_special_image(mocked_responses, sample_pdf: fitz.Document) -> None:
+    expected_font_name = "NotoNaskhArabic-Bold.ttf"
+    font_url = get_font_url(expected_font_name)
+
+    font_file_path = resource_path(f"web/static/fonts/{expected_font_name}")
+    with open(font_file_path, "rb") as f:
+        font_content = f.read()
+
+    mocked_responses.add(
+        "GET",
+        font_url,
+        body=font_content,
+        status=200,
+    )
     text_info = {"value": "الافترايفكتس و البريمير و الافد ميدا كومبوزر", "language": "arabic"}
     field_name = "Cognome_ar"
     page = sample_pdf[0]
@@ -263,9 +290,24 @@ def test_dict_hash():
         ("unknown_language", "FreeSansBold.ttf"),
     ],
 )
-def test_load_font_for_language(language, expected_font_name):
+def test_load_font_for_language(mocked_responses, language, expected_font_name):
+    font_url = get_font_url(expected_font_name)
+
+    font_file_path = resource_path(f"web/static/fonts/{expected_font_name}")
+    with open(font_file_path, "rb") as f:
+        font_content = f.read()
+
+    mocked_responses.add(
+        "GET",
+        font_url,
+        body=font_content,
+        status=200,
+    )
+
     font = load_font_for_language(language)
-    assert Path(font.path).name == expected_font_name
+    assert font is not None
+    assert len(mocked_responses.calls) == 1
+    assert mocked_responses.calls[0].request.url == font_url
 
 
 @pytest.mark.parametrize(