Browse Source

feat(hadis): add language field to BookEdition and filter non-Arabic editions by user UI language

master
Mohsen Taba 3 weeks ago
parent
commit
13241114da
  1. 23
      apps/hadis/migrations/0075_bookedition_language.py
  2. 49
      apps/hadis/models/reference.py
  3. 111
      apps/hadis/serializers/hadis.py
  4. 36
      apps/hadis/serializers/reference_v2.py
  5. 4
      apps/hadis/serializers/serializers_admin.py

23
apps/hadis/migrations/0075_bookedition_language.py

@ -0,0 +1,23 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('hadis', '0074_bookcontributorrole_bookeditioncontributor_and_seed'),
]
operations = [
migrations.AddField(
model_name='bookedition',
name='language',
field=models.CharField(
blank=True,
db_index=True,
default='ar',
help_text='Language code of this edition (e.g., ar, ru, en, fa, ur). Arabic (ar) editions are displayed globally across all languages; non-Arabic editions are displayed only when the user selects that exact language.',
max_length=20,
verbose_name='Edition Language Code',
),
),
]

49
apps/hadis/models/reference.py

@ -343,6 +343,14 @@ class BookEdition(models.Model):
number_of_volumes = models.PositiveIntegerField(null=True, blank=True, verbose_name=_('Total Number of Volumes')) number_of_volumes = models.PositiveIntegerField(null=True, blank=True, verbose_name=_('Total Number of Volumes'))
source_url = models.URLField(max_length=1000, null=True, blank=True, verbose_name=_('Online Source URL')) source_url = models.URLField(max_length=1000, null=True, blank=True, verbose_name=_('Online Source URL'))
isbn = models.CharField(max_length=100, verbose_name=_('ISBN'), blank=True, null=True) isbn = models.CharField(max_length=100, verbose_name=_('ISBN'), blank=True, null=True)
language = models.CharField(
max_length=20,
default='ar',
blank=True,
db_index=True,
verbose_name=_('Edition Language Code'),
help_text=_('Language code of this edition (e.g., ar, ru, en, fa, ur). Arabic (ar) editions are displayed globally across all languages; non-Arabic editions are displayed only when the user selects that exact language.')
)
notes = models.JSONField(default=list, blank=True, verbose_name=_('Notes')) notes = models.JSONField(default=list, blank=True, verbose_name=_('Notes'))
tag = models.ForeignKey( tag = models.ForeignKey(
'BookTag', 'BookTag',
@ -372,7 +380,48 @@ class BookEdition(models.Model):
return f"{t_str} ({self.edition_number or 'Ed. ' + str(self.id)})" return f"{t_str} ({self.edition_number or 'Ed. ' + str(self.id)})"
return f"{self.book_reference} - {self.edition_number or 'Edition ' + str(self.id)}" return f"{self.book_reference} - {self.edition_number or 'Edition ' + str(self.id)}"
@staticmethod
def normalize_language_code(raw_code: Optional[str]) -> str:
if not raw_code:
return 'ar'
cleaned = str(raw_code).strip().lower().split(',')[0].split(';')[0].split('-')[0].split('_')[0]
alias_map = {
'ar': 'ar', 'ara': 'ar', 'arabic': 'ar', 'العربية': 'ar', 'عربي': 'ar', 'عربی': 'ar', 'арабский': 'ar',
'ru': 'ru', 'rus': 'ru', 'russian': 'ru', 'русский': 'ru', 'روسی': 'ru', 'الروسية': 'ru',
'en': 'en', 'eng': 'en', 'english': 'en', 'английский': 'en', 'انگلیسی': 'en', 'الإنجليزية': 'en',
'az': 'az', 'aze': 'az', 'azerbaijani': 'az', 'azərbaycanca': 'az', 'آذری': 'az', 'الأذربيجانية': 'az', 'азербайджанский': 'az',
'bn': 'bn', 'ben': 'bn', 'bengali': 'bn', 'বাংলা': 'bn',
'de': 'de', 'deu': 'de', 'ger': 'de', 'german': 'de', 'deutsch': 'de',
'es': 'es', 'spa': 'es', 'spanish': 'es', 'español': 'es',
'fa': 'fa', 'per': 'fa', 'fas': 'fa', 'persian': 'fa', 'farsi': 'fa', 'فارسی': 'fa', 'الفارسية': 'fa', 'персидский': 'fa',
'fr': 'fr', 'fra': 'fr', 'fre': 'fr', 'french': 'fr', 'français': 'fr',
'ha': 'ha', 'hau': 'ha', 'hausa': 'ha',
'id': 'id', 'ind': 'id', 'indonesian': 'id', 'indonesia': 'id',
'ky': 'ky', 'kir': 'ky', 'kyrgyz': 'ky', 'кыргызча': 'ky',
'sw': 'sw', 'swa': 'sw', 'swahili': 'sw', 'kiswahili': 'sw',
'tg': 'tg', 'tgk': 'tg', 'tajik': 'tg', 'тоҷикӣ': 'tg',
'tr': 'tr', 'tur': 'tr', 'turkish': 'tr', 'türkçe': 'tr', 'ترکی': 'tr', 'التركية': 'tr', 'турецкий': 'tr',
'ur': 'ur', 'urd': 'ur', 'urdu': 'ur', 'اردو': 'ur', 'الأردية': 'ur', 'урду': 'ur',
'uz': 'uz', 'uzb': 'uz', 'uzbek': 'uz', "o'zbekcha": 'uz',
'zh': 'zh', 'zho': 'zh', 'chi': 'zh', 'chinese': 'zh', '中文': 'zh',
}
return alias_map.get(cleaned, cleaned or 'ar')
def is_visible_for_language(self, user_lang: Optional[str]) -> bool:
"""
1. If edition language code is 'ar' (Arabic), display globally across all site/app languages.
2. If edition language code is non-Arabic (e.g., 'ru'), display ONLY when user_lang matches it.
"""
ed_lang = self.normalize_language_code(self.language)
if not ed_lang or ed_lang == 'ar':
return True
if not user_lang:
return False
target_lang = self.normalize_language_code(user_lang)
return ed_lang == target_lang
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
self.language = self.normalize_language_code(self.language)
if self.publisher_item_id and self.publisher_item: if self.publisher_item_id and self.publisher_item:
self.publisher = self.publisher_item.title or [] self.publisher = self.publisher_item.title or []
if self.city_of_publication_city_id and self.city_of_publication_city: if self.city_of_publication_city_id and self.city_of_publication_city:

111
apps/hadis/serializers/hadis.py

@ -1401,6 +1401,15 @@ class ReferenceImageSerializer(serializers.ModelSerializer):
return self.get_thumbnail(obj) return self.get_thumbnail(obj)
class EditionLanguageFilteredReferenceListSerializer(serializers.ListSerializer):
def to_representation(self, data):
request = self.context.get('request') if hasattr(self, 'context') and self.context else None
iterable = data.all() if hasattr(data, 'all') else data
items = list(iterable)
filtered = [item for item in items if _is_reference_visible_for_request(item, request)]
return [self.child.to_representation(item) for item in filtered]
class HadisReferenceSerializer(serializers.ModelSerializer): class HadisReferenceSerializer(serializers.ModelSerializer):
"""Serializer for HadisReference with book, author, edition, volume, and images""" """Serializer for HadisReference with book, author, edition, volume, and images"""
book_title = serializers.SerializerMethodField() book_title = serializers.SerializerMethodField()
@ -1422,6 +1431,7 @@ class HadisReferenceSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = HadisReference model = HadisReference
list_serializer_class = EditionLanguageFilteredReferenceListSerializer
fields = [ fields = [
'id', 'book', 'author', 'book_title', 'book_description', 'book_authors', 'share_link', 'id', 'book', 'author', 'book_title', 'book_description', 'book_authors', 'share_link',
'edition', 'edition_info', 'volume_info', 'volume', 'pages', 'hadith_number', 'edition', 'edition_info', 'volume_info', 'volume', 'pages', 'hadith_number',
@ -1429,7 +1439,7 @@ class HadisReferenceSerializer(serializers.ModelSerializer):
] ]
def _get_resolved_edition(self, obj): def _get_resolved_edition(self, obj):
return _resolve_reference_edition_fast(obj)
return _resolve_reference_edition_fast(obj, self.context.get("request"))
def get_edition_info(self, obj): def get_edition_info(self, obj):
return _build_edition_info_dict(obj, self._get_resolved_edition(obj), self.context.get("request")) return _build_edition_info_dict(obj, self._get_resolved_edition(obj), self.context.get("request"))
@ -2038,13 +2048,16 @@ def get_cached_edition_metadata():
) )
by_id = {} by_id = {}
first_by_book_id = {} first_by_book_id = {}
by_book_id = {}
for ed in editions: for ed in editions:
ed._cached_researchers = list(ed.researchers.all()) ed._cached_researchers = list(ed.researchers.all())
ed._cached_editors = list(ed.editors.all()) ed._cached_editors = list(ed.editors.all())
ed._cached_contributors = list(ed.contributors.all()) ed._cached_contributors = list(ed.contributors.all())
by_id[ed.id] = ed by_id[ed.id] = ed
if ed.book_reference_id and ed.book_reference_id not in first_by_book_id:
first_by_book_id[ed.book_reference_id] = ed
if ed.book_reference_id:
by_book_id.setdefault(ed.book_reference_id, []).append(ed)
if ed.book_reference_id not in first_by_book_id and ed.is_visible_for_language('ar'):
first_by_book_id[ed.book_reference_id] = ed
book_volumes_count = dict( book_volumes_count = dict(
BookVolume.objects.values('book_reference_id') BookVolume.objects.values('book_reference_id')
@ -2053,6 +2066,7 @@ def get_cached_edition_metadata():
) )
_EDITION_METADATA_MEM = { _EDITION_METADATA_MEM = {
'by_id': by_id, 'by_id': by_id,
'by_book_id': by_book_id,
'first_by_book_id': first_by_book_id, 'first_by_book_id': first_by_book_id,
'book_volumes_count': book_volumes_count, 'book_volumes_count': book_volumes_count,
} }
@ -2060,45 +2074,101 @@ def get_cached_edition_metadata():
return _EDITION_METADATA_MEM return _EDITION_METADATA_MEM
def _resolve_reference_edition_fast(obj):
if hasattr(obj, '_resolved_edition_cache'):
return obj._resolved_edition_cache
def _extract_req_lang_for_edition(request) -> str:
from django.utils.translation import get_language
from ..models import BookEdition
lang = None
if request:
query_params = getattr(request, "query_params", None) or getattr(request, "GET", None)
if query_params:
lang = query_params.get("language_code") or query_params.get("lang")
if not lang and hasattr(request, "headers"):
lang = request.headers.get("Accept-Language")
if not lang:
lang = getattr(request, "LANGUAGE_CODE", None)
if not lang:
lang = get_language() or "ru"
return BookEdition.normalize_language_code(lang)
def _resolve_reference_edition_fast(obj, request=None):
user_lang = _extract_req_lang_for_edition(request)
cache_attr = f'_resolved_edition_cache_{user_lang}'
if hasattr(obj, cache_attr):
return getattr(obj, cache_attr)
meta = get_cached_edition_metadata() meta = get_cached_edition_metadata()
by_id = meta['by_id'] by_id = meta['by_id']
by_book_id = meta.get('by_book_id', {})
first_by_book_id = meta['first_by_book_id'] first_by_book_id = meta['first_by_book_id']
edition = None edition = None
ed_id = getattr(obj, 'edition_id', None) ed_id = getattr(obj, 'edition_id', None)
if ed_id and ed_id in by_id: if ed_id and ed_id in by_id:
edition = by_id[ed_id]
cand = by_id[ed_id]
if cand.is_visible_for_language(user_lang):
edition = cand
if not edition and getattr(obj, 'book_volume_id', None) and getattr(obj, 'book_volume', None): if not edition and getattr(obj, 'book_volume_id', None) and getattr(obj, 'book_volume', None):
bv_ed_id = getattr(obj.book_volume, 'edition_id', None) bv_ed_id = getattr(obj.book_volume, 'edition_id', None)
if bv_ed_id and bv_ed_id in by_id: if bv_ed_id and bv_ed_id in by_id:
edition = by_id[bv_ed_id]
cand = by_id[bv_ed_id]
if cand.is_visible_for_language(user_lang):
edition = cand
if not edition and getattr(obj, 'book_reference_id', None): if not edition and getattr(obj, 'book_reference_id', None):
edition = first_by_book_id.get(obj.book_reference_id)
book_eds = by_book_id.get(obj.book_reference_id, [])
for cand in book_eds:
if cand.is_visible_for_language(user_lang):
edition = cand
break
if not edition:
edition = first_by_book_id.get(obj.book_reference_id)
if not edition: if not edition:
if getattr(obj, 'edition_id', None) and obj.edition:
if getattr(obj, 'edition_id', None) and obj.edition and obj.edition.is_visible_for_language(user_lang):
edition = obj.edition edition = obj.edition
elif getattr(obj, 'book_volume', None) and obj.book_volume.edition:
elif getattr(obj, 'book_volume', None) and obj.book_volume.edition and obj.book_volume.edition.is_visible_for_language(user_lang):
edition = obj.book_volume.edition edition = obj.book_volume.edition
elif getattr(obj, 'book_reference', None) and hasattr(obj.book_reference, 'editions'): elif getattr(obj, 'book_reference', None) and hasattr(obj.book_reference, 'editions'):
if hasattr(obj.book_reference, '_prefetched_objects_cache') and 'editions' in obj.book_reference._prefetched_objects_cache: if hasattr(obj.book_reference, '_prefetched_objects_cache') and 'editions' in obj.book_reference._prefetched_objects_cache:
editions_list = list(obj.book_reference.editions.all())
editions_list = [e for e in obj.book_reference.editions.all() if e.is_visible_for_language(user_lang)]
edition = editions_list[0] if editions_list else None edition = editions_list[0] if editions_list else None
else: else:
edition = obj.book_reference.editions.first()
for e in obj.book_reference.editions.all():
if e.is_visible_for_language(user_lang):
edition = e
break
obj._resolved_edition_cache = edition
setattr(obj, cache_attr, edition)
return edition return edition
def _is_reference_visible_for_request(ref_obj, request) -> bool:
user_lang = _extract_req_lang_for_edition(request)
meta = get_cached_edition_metadata()
by_id = meta['by_id']
ed = None
ed_id = getattr(ref_obj, 'edition_id', None)
if ed_id and ed_id in by_id:
ed = by_id[ed_id]
elif getattr(ref_obj, 'edition_id', None) and getattr(ref_obj, 'edition', None):
ed = ref_obj.edition
elif getattr(ref_obj, 'book_volume_id', None) and getattr(ref_obj, 'book_volume', None):
bv_ed_id = getattr(ref_obj.book_volume, 'edition_id', None)
if bv_ed_id and bv_ed_id in by_id:
ed = by_id[bv_ed_id]
elif getattr(ref_obj.book_volume, 'edition', None):
ed = ref_obj.book_volume.edition
if ed is not None:
return ed.is_visible_for_language(user_lang)
return True
def _build_edition_info_dict(obj, edition, request): def _build_edition_info_dict(obj, edition, request):
if hasattr(obj, '_edition_info_cache'):
return obj._edition_info_cache
user_lang = _extract_req_lang_for_edition(request)
cache_attr = f'_edition_info_cache_{user_lang}'
if hasattr(obj, cache_attr):
return getattr(obj, cache_attr)
if not edition: if not edition:
obj._edition_info_cache = None
setattr(obj, cache_attr, None)
return None return None
pub_src = edition.publisher_item.title if (getattr(edition, "publisher_item_id", None) and edition.publisher_item and edition.publisher_item.title) else edition.publisher pub_src = edition.publisher_item.title if (getattr(edition, "publisher_item_id", None) and edition.publisher_item and edition.publisher_item.title) else edition.publisher
@ -2166,6 +2236,7 @@ def _build_edition_info_dict(obj, edition, request):
result = { result = {
"id": edition.id, "id": edition.id,
"title": ed_title or "", "title": ed_title or "",
"language": getattr(edition, "language", "ar") or "ar",
"edition_number": edition.edition_number, "edition_number": edition.edition_number,
"publisher": pub or "", "publisher": pub or "",
"publication_place": {"city": city or "", "country": country or ""}, "publication_place": {"city": city or "", "country": country or ""},
@ -2176,7 +2247,7 @@ def _build_edition_info_dict(obj, edition, request):
"editors": editors, "editors": editors,
"contributors": contributors, "contributors": contributors,
} }
obj._edition_info_cache = result
setattr(obj, cache_attr, result)
return result return result
@ -2226,6 +2297,7 @@ class DetailedCorrectionReferenceSerializer(BaseDetailedReferenceSerializer):
class Meta: class Meta:
model = CorrectionReference model = CorrectionReference
list_serializer_class = EditionLanguageFilteredReferenceListSerializer
fields = [ fields = [
'id', 'id',
'book', 'book',
@ -2358,6 +2430,7 @@ class DetailedInterpretationReferenceSerializer(DetailedCorrectionReferenceSeria
class Meta: class Meta:
model = InterpretationReference model = InterpretationReference
list_serializer_class = EditionLanguageFilteredReferenceListSerializer
fields = [ fields = [
'id', 'id',
'book', 'book',
@ -2383,6 +2456,7 @@ class DetailedOriginalTextReferenceSerializer(DetailedCorrectionReferenceSeriali
class Meta: class Meta:
model = OriginalTextReference model = OriginalTextReference
list_serializer_class = EditionLanguageFilteredReferenceListSerializer
fields = [ fields = [
'id', 'id',
'book', 'book',
@ -2409,6 +2483,7 @@ class DetailedHadisReferenceSerializer(DetailedCorrectionReferenceSerializer):
class Meta: class Meta:
model = HadisReference model = HadisReference
list_serializer_class = EditionLanguageFilteredReferenceListSerializer
fields = [ fields = [
'id', 'id',
'book', 'book',

36
apps/hadis/serializers/reference_v2.py

@ -127,15 +127,33 @@ class BookReferenceV2ListSerializer(serializers.ModelSerializer):
return absolute_https_url(first_image.image.url) return absolute_https_url(first_image.image.url)
return None return None
def _get_book_editions(obj):
def _extract_user_lang_from_request(request) -> str:
from django.utils.translation import get_language
lang = None
if request:
query_params = getattr(request, "query_params", None) or getattr(request, "GET", None)
if query_params:
lang = query_params.get("language_code") or query_params.get("lang")
if not lang and hasattr(request, "headers"):
lang = request.headers.get("Accept-Language")
if not lang:
lang = getattr(request, "LANGUAGE_CODE", None)
if not lang:
lang = get_language() or "ru"
return BookEdition.normalize_language_code(lang)
def _get_book_editions(obj, request=None):
user_lang = _extract_user_lang_from_request(request)
seen = set() seen = set()
result = [] result = []
for ed in obj.editions.all(): for ed in obj.editions.all():
seen.add(ed.id)
result.append(ed)
if ed.id not in seen and ed.is_visible_for_language(user_lang):
seen.add(ed.id)
result.append(ed)
if hasattr(obj, 'editions_list'): if hasattr(obj, 'editions_list'):
for ed in obj.editions_list.all(): for ed in obj.editions_list.all():
if ed.id not in seen:
if ed.id not in seen and ed.is_visible_for_language(user_lang):
seen.add(ed.id) seen.add(ed.id)
result.append(ed) result.append(ed)
return result return result
@ -155,7 +173,7 @@ class BookEditionV2Serializer(serializers.ModelSerializer):
class Meta: class Meta:
model = BookEdition model = BookEdition
fields = [ fields = [
'id', 'title', 'publisher', 'publication_place', 'edition_number',
'id', 'title', 'language', 'publisher', 'publication_place', 'edition_number',
'year_of_publication', 'number_of_volumes', 'notes', 'source_url', 'tag', 'year_of_publication', 'number_of_volumes', 'notes', 'source_url', 'tag',
'researchers', 'editors', 'contributors' 'researchers', 'editors', 'contributors'
] ]
@ -259,7 +277,7 @@ class BookReferenceV2DetailSerializer(serializers.ModelSerializer):
def get_information(self, obj): def get_information(self, obj):
request = self.context.get("request") request = self.context.get("request")
summary = get_localized_text(obj.description, request) if obj.description else "" summary = get_localized_text(obj.description, request) if obj.description else ""
all_editions = _get_book_editions(obj)
all_editions = _get_book_editions(obj, request=request)
valid_editions = [ed for ed in all_editions if ed.volumes.exists()] or all_editions valid_editions = [ed for ed in all_editions if ed.volumes.exists()] or all_editions
editions = BookEditionV2Serializer(valid_editions, many=True, context=self.context).data editions = BookEditionV2Serializer(valid_editions, many=True, context=self.context).data
@ -270,7 +288,7 @@ class BookReferenceV2DetailSerializer(serializers.ModelSerializer):
def get_volumes(self, obj): def get_volumes(self, obj):
if obj.has_editions: if obj.has_editions:
editions = _get_book_editions(obj)
editions = _get_book_editions(obj, request= self.context.get('request'))
editions_data = [] editions_data = []
request = self.context.get("request") request = self.context.get("request")
for ed in editions: for ed in editions:
@ -321,7 +339,7 @@ class BookReferenceV2SyncSerializer(serializers.ModelSerializer):
def get_information(self, obj): def get_information(self, obj):
request = self.context.get("request") request = self.context.get("request")
summary = get_localized_text(obj.description, request) if obj.description else "" summary = get_localized_text(obj.description, request) if obj.description else ""
all_editions = _get_book_editions(obj)
all_editions = _get_book_editions(obj, request=request)
valid_editions = [ed for ed in all_editions if ed.volumes.exists()] or all_editions valid_editions = [ed for ed in all_editions if ed.volumes.exists()] or all_editions
editions = BookEditionV2Serializer(valid_editions, many=True, context=self.context).data editions = BookEditionV2Serializer(valid_editions, many=True, context=self.context).data
return { return {
@ -338,7 +356,7 @@ class BookReferenceV2SyncSerializer(serializers.ModelSerializer):
def get_volumes(self, obj): def get_volumes(self, obj):
if obj.has_editions: if obj.has_editions:
editions = _get_book_editions(obj)
editions = _get_book_editions(obj, request= self.context.get('request'))
editions_data = [] editions_data = []
request = self.context.get("request") request = self.context.get("request")
for ed in editions: for ed in editions:

4
apps/hadis/serializers/serializers_admin.py

@ -8390,6 +8390,8 @@ class AdminBookEditionSerializer(serializers.ModelSerializer):
source_url = serializers.CharField(max_length=1000, required=False, allow_null=True, allow_blank=True) source_url = serializers.CharField(max_length=1000, required=False, allow_null=True, allow_blank=True)
language = serializers.CharField(max_length=20, required=False, default="ar", allow_blank=True)
tag = serializers.PrimaryKeyRelatedField( tag = serializers.PrimaryKeyRelatedField(
queryset=BookTag.objects.all(), queryset=BookTag.objects.all(),
@ -8464,6 +8466,8 @@ class AdminBookEditionSerializer(serializers.ModelSerializer):
"isbn", "isbn",
"language",
"notes", "notes",
"tag", "tag",

Loading…
Cancel
Save