diff --git a/apps/hadis/migrations/0073_transmitterlocation_transmitterorigin_and_more.py b/apps/hadis/migrations/0073_transmitterlocation_transmitterorigin_and_more.py new file mode 100644 index 0000000..a111239 --- /dev/null +++ b/apps/hadis/migrations/0073_transmitterlocation_transmitterorigin_and_more.py @@ -0,0 +1,170 @@ +# Generated by Django 4.2.30 on 2026-10-31 16:48 + +from django.db import migrations, models +from django.utils.text import slugify + + +def migrate_origins_and_locations(apps, schema_editor): + Transmitters = apps.get_model('hadis', 'Transmitters') + BookAuthor = apps.get_model('hadis', 'BookAuthor') + TransmitterOrigin = apps.get_model('hadis', 'TransmitterOrigin') + TransmitterLocation = apps.get_model('hadis', 'TransmitterLocation') + + def _extract_primary_text(title_list): + if not title_list or not isinstance(title_list, list): + return None + for lang in ('en', 'ru', 'ar', 'fa', 'tr'): + for item in title_list: + if isinstance(item, dict) and item.get('language_code') == lang: + txt = (item.get('text') or item.get('title') or '').strip() + if txt: + return txt + for item in title_list: + if isinstance(item, dict): + txt = (item.get('text') or item.get('title') or '').strip() + if txt: + return txt + return None + + origin_cache = {} + for obj in TransmitterOrigin.objects.all(): + primary = _extract_primary_text(obj.title) + if primary: + origin_cache[primary.lower()] = obj + + location_cache = {} + for obj in TransmitterLocation.objects.all(): + primary = _extract_primary_text(obj.title) + if primary: + location_cache[primary.lower()] = obj + + def _get_or_create_origin(raw_title): + primary = _extract_primary_text(raw_title) + if not primary: + return None + key = primary.lower() + obj = origin_cache.get(key) + if not obj: + base_slug = slugify(primary, allow_unicode=True)[:240] or 'origin' + slug = base_slug + counter = 1 + while TransmitterOrigin.objects.filter(slug=slug).exists(): + slug = f"{base_slug}-{counter}" + counter += 1 + obj = TransmitterOrigin.objects.create(title=raw_title, slug=slug) + origin_cache[key] = obj + return obj + + def _get_or_create_location(raw_title): + primary = _extract_primary_text(raw_title) + if not primary: + return None + key = primary.lower() + obj = location_cache.get(key) + if not obj: + base_slug = slugify(primary, allow_unicode=True)[:240] or 'location' + slug = base_slug + counter = 1 + while TransmitterLocation.objects.filter(slug=slug).exists(): + slug = f"{base_slug}-{counter}" + counter += 1 + obj = TransmitterLocation.objects.create(title=raw_title, slug=slug) + location_cache[key] = obj + return obj + + for Model in (Transmitters, BookAuthor): + for record in Model.objects.select_related('origin_city', 'lived_in_city', 'died_in_city').all(): + origin_raw = record.origin if (record.origin and isinstance(record.origin, list)) else ( + record.origin_city.title if (record.origin_city_id and record.origin_city) else None + ) + if origin_raw: + orig_obj = _get_or_create_origin(origin_raw) + if orig_obj: + record.origins_list.add(orig_obj) + + lived_raw = record.lived_in if (record.lived_in and isinstance(record.lived_in, list)) else ( + record.lived_in_city.title if (record.lived_in_city_id and record.lived_in_city) else None + ) + if lived_raw: + loc_obj = _get_or_create_location(lived_raw) + if loc_obj: + record.lived_in_locations.add(loc_obj) + + died_raw = record.died_in if (record.died_in and isinstance(record.died_in, list)) else ( + record.died_in_city.title if (record.died_in_city_id and record.died_in_city) else None + ) + if died_raw: + loc_obj = _get_or_create_location(died_raw) + if loc_obj: + record.died_in_locations.add(loc_obj) + + +class Migration(migrations.Migration): + + dependencies = [ + ('hadis', '0072_mawlastatus_transmitters_mawla_statuses'), + ] + + operations = [ + migrations.CreateModel( + name='TransmitterLocation', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.JSONField(default=list, verbose_name='Title')), + ('slug', models.SlugField(allow_unicode=True, blank=True, max_length=255, null=True, verbose_name='slug')), + ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')), + ('updated_at', models.DateTimeField(auto_now=True, verbose_name='updated at')), + ], + options={ + 'verbose_name': 'Transmitter Location', + 'verbose_name_plural': 'Transmitter Locations', + 'ordering': ('-created_at', '-id'), + }, + ), + migrations.CreateModel( + name='TransmitterOrigin', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.JSONField(default=list, verbose_name='Title')), + ('slug', models.SlugField(allow_unicode=True, blank=True, max_length=255, null=True, verbose_name='slug')), + ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')), + ('updated_at', models.DateTimeField(auto_now=True, verbose_name='updated at')), + ], + options={ + 'verbose_name': 'Transmitter Origin', + 'verbose_name_plural': 'Transmitter Origins', + 'ordering': ('-created_at', '-id'), + }, + ), + migrations.AddField( + model_name='bookauthor', + name='died_in_locations', + field=models.ManyToManyField(blank=True, related_name='died_in_authors', to='hadis.transmitterlocation', verbose_name='Died in Locations (M2M)'), + ), + migrations.AddField( + model_name='bookauthor', + name='lived_in_locations', + field=models.ManyToManyField(blank=True, related_name='lived_in_authors', to='hadis.transmitterlocation', verbose_name='Lived in Locations (M2M)'), + ), + migrations.AddField( + model_name='bookauthor', + name='origins_list', + field=models.ManyToManyField(blank=True, related_name='authors', to='hadis.transmitterorigin', verbose_name='Origins (M2M)'), + ), + migrations.AddField( + model_name='transmitters', + name='died_in_locations', + field=models.ManyToManyField(blank=True, related_name='died_in_transmitters', to='hadis.transmitterlocation', verbose_name='Died in Locations (M2M)'), + ), + migrations.AddField( + model_name='transmitters', + name='lived_in_locations', + field=models.ManyToManyField(blank=True, related_name='lived_in_transmitters', to='hadis.transmitterlocation', verbose_name='Lived in Locations (M2M)'), + ), + migrations.AddField( + model_name='transmitters', + name='origins_list', + field=models.ManyToManyField(blank=True, related_name='transmitters', to='hadis.transmitterorigin', verbose_name='Origins (M2M)'), + ), + migrations.RunPython(migrate_origins_and_locations, migrations.RunPython.noop), + ] diff --git a/apps/hadis/models/reference.py b/apps/hadis/models/reference.py index 8c71062..28a8b61 100644 --- a/apps/hadis/models/reference.py +++ b/apps/hadis/models/reference.py @@ -587,6 +587,24 @@ class BookAuthor(LowercaseSlugMixin, models.Model): # Geographic Information origin = models.JSONField(default=list, blank=True, verbose_name=_('Origin')) + origins_list = models.ManyToManyField( + 'hadis.TransmitterOrigin', + blank=True, + related_name='authors', + verbose_name=_('Origins (M2M)'), + ) + lived_in_locations = models.ManyToManyField( + 'hadis.TransmitterLocation', + blank=True, + related_name='lived_in_authors', + verbose_name=_('Lived in Locations (M2M)'), + ) + died_in_locations = models.ManyToManyField( + 'hadis.TransmitterLocation', + blank=True, + related_name='died_in_authors', + verbose_name=_('Died in Locations (M2M)'), + ) lived_in = models.JSONField(default=list, blank=True, verbose_name=_('Lived in')) died_in = models.JSONField(default=list, blank=True, verbose_name=_('Died in')) origin_city = models.ForeignKey( @@ -659,11 +677,11 @@ class BookAuthor(LowercaseSlugMixin, models.Model): def save(self, *args, **kwargs): if self.rutba_status_id and self.rutba_status: self.rutba = self.rutba_status.title or [] - if self.origin_city_id and self.origin_city: + if self.origin_city_id and self.origin_city and not self.origin: self.origin = self.origin_city.title or [] - if self.lived_in_city_id and self.lived_in_city: + if self.lived_in_city_id and self.lived_in_city and not self.lived_in: self.lived_in = self.lived_in_city.title or [] - if self.died_in_city_id and self.died_in_city: + if self.died_in_city_id and self.died_in_city and not self.died_in: self.died_in = self.died_in_city.title or [] for date_field in ('birth_year_hijri', 'death_year_hijri', 'age_at_death'): diff --git a/apps/hadis/models/transmitter.py b/apps/hadis/models/transmitter.py index 4518663..b96fddb 100644 --- a/apps/hadis/models/transmitter.py +++ b/apps/hadis/models/transmitter.py @@ -319,6 +319,70 @@ class MawlaStatus(LowercaseSlugMixin, models.Model): return None +class TransmitterOrigin(LowercaseSlugMixin, models.Model): + slug_source_field = 'title' + + title = models.JSONField(default=list, verbose_name=_('Title')) + slug = models.SlugField(max_length=255, verbose_name=_('slug'), blank=True, null=True, allow_unicode=True) + created_at = models.DateTimeField(auto_now_add=True, verbose_name=_('created at')) + updated_at = models.DateTimeField(auto_now=True, verbose_name=_('updated at')) + + class Meta: + ordering = ('-created_at', '-id') + verbose_name = _('Transmitter Origin') + verbose_name_plural = _('Transmitter Origins') + + def __str__(self): + if self.title and isinstance(self.title, list) and len(self.title) > 0 and isinstance(self.title[0], dict): + return self.title[0].get('text') or self.title[0].get('title') or str(self.id) + return str(self.id) + + def get_title(self, lang: str = 'en') -> Optional[str]: + if not self.title or not isinstance(self.title, list): + return None + for tr in self.title: + if isinstance(tr, dict) and tr.get('language_code') == lang: + return tr.get('text', '') or tr.get('title', '') + for tr in self.title: + if isinstance(tr, dict) and tr.get('language_code') == 'en': + return tr.get('text', '') or tr.get('title', '') + if isinstance(self.title[0], dict): + return self.title[0].get('text', '') or self.title[0].get('title', '') + return None + + +class TransmitterLocation(LowercaseSlugMixin, models.Model): + slug_source_field = 'title' + + title = models.JSONField(default=list, verbose_name=_('Title')) + slug = models.SlugField(max_length=255, verbose_name=_('slug'), blank=True, null=True, allow_unicode=True) + created_at = models.DateTimeField(auto_now_add=True, verbose_name=_('created at')) + updated_at = models.DateTimeField(auto_now=True, verbose_name=_('updated at')) + + class Meta: + ordering = ('-created_at', '-id') + verbose_name = _('Transmitter Location') + verbose_name_plural = _('Transmitter Locations') + + def __str__(self): + if self.title and isinstance(self.title, list) and len(self.title) > 0 and isinstance(self.title[0], dict): + return self.title[0].get('text') or self.title[0].get('title') or str(self.id) + return str(self.id) + + def get_title(self, lang: str = 'en') -> Optional[str]: + if not self.title or not isinstance(self.title, list): + return None + for tr in self.title: + if isinstance(tr, dict) and tr.get('language_code') == lang: + return tr.get('text', '') or tr.get('title', '') + for tr in self.title: + if isinstance(tr, dict) and tr.get('language_code') == 'en': + return tr.get('text', '') or tr.get('title', '') + if isinstance(self.title[0], dict): + return self.title[0].get('text', '') or self.title[0].get('title', '') + return None + + class TransmitterFeature(LowercaseSlugMixin, models.Model): slug_source_field = 'title' @@ -540,6 +604,24 @@ class Transmitters(LowercaseSlugMixin, models.Model): # Geographic Information origin = models.JSONField(default = list , verbose_name=_('Origin')) + origins_list = models.ManyToManyField( + 'hadis.TransmitterOrigin', + blank=True, + related_name='transmitters', + verbose_name=_('Origins (M2M)'), + ) + lived_in_locations = models.ManyToManyField( + 'hadis.TransmitterLocation', + blank=True, + related_name='lived_in_transmitters', + verbose_name=_('Lived in Locations (M2M)'), + ) + died_in_locations = models.ManyToManyField( + 'hadis.TransmitterLocation', + blank=True, + related_name='died_in_transmitters', + verbose_name=_('Died in Locations (M2M)'), + ) lived_in = models.JSONField(default = list , verbose_name=_('Lived in')) died_in = models.JSONField(default = list , verbose_name=_('Died in')) origin_city = models.ForeignKey( @@ -648,11 +730,11 @@ class Transmitters(LowercaseSlugMixin, models.Model): val_str = str(val).strip() setattr(self, date_field, val_str if val_str else None) - if self.origin_city_id and self.origin_city: + if self.origin_city_id and self.origin_city and not self.origin: self.origin = self.origin_city.title or [] - if self.lived_in_city_id and self.lived_in_city: + if self.lived_in_city_id and self.lived_in_city and not self.lived_in: self.lived_in = self.lived_in_city.title or [] - if self.died_in_city_id and self.died_in_city: + if self.died_in_city_id and self.died_in_city and not self.died_in: self.died_in = self.died_in_city.title or [] from utils.text_normalizer import build_search_blob diff --git a/apps/hadis/serializers/hadis.py b/apps/hadis/serializers/hadis.py index 8aca57f..0e18076 100644 --- a/apps/hadis/serializers/hadis.py +++ b/apps/hadis/serializers/hadis.py @@ -842,6 +842,7 @@ class TransmitterDetailSerializer(serializers.ModelSerializer): kunyas = serializers.SerializerMethodField() origin = serializers.SerializerMethodField() arabic_origin = serializers.SerializerMethodField() + origins = serializers.SerializerMethodField() mawla_status = serializers.SerializerMethodField() arabic_mawla_status = serializers.SerializerMethodField() @@ -858,6 +859,8 @@ class TransmitterDetailSerializer(serializers.ModelSerializer): arabic_lived_in = serializers.SerializerMethodField() died_in = serializers.SerializerMethodField() arabic_died_in = serializers.SerializerMethodField() + lived_in_locations = serializers.SerializerMethodField() + died_in_locations = serializers.SerializerMethodField() description = LocalizedField() companion_type = serializers.SerializerMethodField() arabic_companion_type = serializers.SerializerMethodField() @@ -881,10 +884,10 @@ class TransmitterDetailSerializer(serializers.ModelSerializer): fields = [ 'id', 'full_name', 'arabic_full_name', 'kunya', 'arabic_kunya', 'kunyas', 'known_as', 'arabic_known_as', 'nickname', 'arabic_nickname', - 'origin', 'arabic_origin', 'mawla_status', 'arabic_mawla_status', 'mawla_statuses', + 'origin', 'arabic_origin', 'origins', 'mawla_status', 'arabic_mawla_status', 'mawla_statuses', 'profession', 'arabic_profession', 'professions', 'physical_traits', 'arabic_physical_traits', 'features', - 'lived_in', 'arabic_lived_in', 'died_in', 'arabic_died_in', + 'lived_in', 'arabic_lived_in', 'lived_in_locations', 'died_in', 'arabic_died_in', 'died_in_locations', 'birth_year_hijri', 'death_year_hijri', 'age_at_death', 'birth_year_raw', 'death_year_raw', 'age_at_death_raw', 'reliability', @@ -937,22 +940,49 @@ class TransmitterDetailSerializer(serializers.ModelSerializer): return _serialize_transmitter_m2m_items(obj.features_list.all(), self.context.get('request')) def get_origin(self, obj): - return _resolve_transmitter_city_text(obj.origin_city, obj.origin, self.context.get('request'), arabic=False) + return _resolve_transmitter_m2m_text( + obj.origins_list.all(), obj.origin, self.context.get('request'), + arabic=False, secondary_fallback_json=getattr(obj.origin_city, 'title', None) if obj.origin_city_id else None + ) def get_arabic_origin(self, obj): - return _resolve_transmitter_city_text(obj.origin_city, obj.origin, self.context.get('request'), arabic=True) + return _resolve_transmitter_m2m_text( + obj.origins_list.all(), obj.origin, self.context.get('request'), + arabic=True, secondary_fallback_json=getattr(obj.origin_city, 'title', None) if obj.origin_city_id else None + ) + + def get_origins(self, obj): + return _serialize_transmitter_m2m_items(obj.origins_list.all(), self.context.get('request')) def get_lived_in(self, obj): - return _resolve_transmitter_city_text(obj.lived_in_city, obj.lived_in, self.context.get('request'), arabic=False) + return _resolve_transmitter_m2m_text( + obj.lived_in_locations.all(), obj.lived_in, self.context.get('request'), + arabic=False, secondary_fallback_json=getattr(obj.lived_in_city, 'title', None) if obj.lived_in_city_id else None + ) def get_arabic_lived_in(self, obj): - return _resolve_transmitter_city_text(obj.lived_in_city, obj.lived_in, self.context.get('request'), arabic=True) + return _resolve_transmitter_m2m_text( + obj.lived_in_locations.all(), obj.lived_in, self.context.get('request'), + arabic=True, secondary_fallback_json=getattr(obj.lived_in_city, 'title', None) if obj.lived_in_city_id else None + ) + + def get_lived_in_locations(self, obj): + return _serialize_transmitter_m2m_items(obj.lived_in_locations.all(), self.context.get('request')) def get_died_in(self, obj): - return _resolve_transmitter_city_text(obj.died_in_city, obj.died_in, self.context.get('request'), arabic=False) + return _resolve_transmitter_m2m_text( + obj.died_in_locations.all(), obj.died_in, self.context.get('request'), + arabic=False, secondary_fallback_json=getattr(obj.died_in_city, 'title', None) if obj.died_in_city_id else None + ) def get_arabic_died_in(self, obj): - return _resolve_transmitter_city_text(obj.died_in_city, obj.died_in, self.context.get('request'), arabic=True) + return _resolve_transmitter_m2m_text( + obj.died_in_locations.all(), obj.died_in, self.context.get('request'), + arabic=True, secondary_fallback_json=getattr(obj.died_in_city, 'title', None) if obj.died_in_city_id else None + ) + + def get_died_in_locations(self, obj): + return _serialize_transmitter_m2m_items(obj.died_in_locations.all(), self.context.get('request')) def get_companion_type(self, obj): request = self.context.get('request') @@ -1151,8 +1181,10 @@ class TransmitterSyncSerializer(serializers.ModelSerializer): 'arabic_known_as': get_arabic_localized_text(obj.known_as), 'nickname': get_localized_text(obj.nickname, request), 'arabic_nickname': get_arabic_localized_text(obj.nickname), - 'origin': _resolve_transmitter_city_text(obj.origin_city, obj.origin, request, arabic=False), - 'arabic_origin': _resolve_transmitter_city_text(obj.origin_city, obj.origin, request, arabic=True), + 'origin': _resolve_transmitter_m2m_text(obj.origins_list.all(), obj.origin, request, arabic=False, secondary_fallback_json=getattr(obj.origin_city, 'title', None) if obj.origin_city_id else None), + 'arabic_origin': _resolve_transmitter_m2m_text(obj.origins_list.all(), obj.origin, request, arabic=True, secondary_fallback_json=getattr(obj.origin_city, 'title', None) if obj.origin_city_id else None), + 'origins': _serialize_transmitter_m2m_items(obj.origins_list.all(), request), + 'mawla_status': _resolve_transmitter_m2m_text(obj.mawla_statuses.all(), obj.freed_slave_of, request, arabic=False), 'arabic_mawla_status': _resolve_transmitter_m2m_text(obj.mawla_statuses.all(), obj.freed_slave_of, request, arabic=True), 'mawla_statuses': _serialize_transmitter_m2m_items(obj.mawla_statuses.all(), request), @@ -1163,10 +1195,15 @@ class TransmitterSyncSerializer(serializers.ModelSerializer): 'physical_traits': _resolve_transmitter_m2m_text(obj.features_list.all(), obj.features, request, arabic=False), 'arabic_physical_traits': _resolve_transmitter_m2m_text(obj.features_list.all(), obj.features, request, arabic=True), 'features': _serialize_transmitter_m2m_items(obj.features_list.all(), request), - 'lived_in': _resolve_transmitter_city_text(obj.lived_in_city, obj.lived_in, request, arabic=False), - 'arabic_lived_in': _resolve_transmitter_city_text(obj.lived_in_city, obj.lived_in, request, arabic=True), - 'died_in': _resolve_transmitter_city_text(obj.died_in_city, obj.died_in, request, arabic=False), - 'arabic_died_in': _resolve_transmitter_city_text(obj.died_in_city, obj.died_in, request, arabic=True), + 'lived_in': _resolve_transmitter_m2m_text(obj.lived_in_locations.all(), obj.lived_in, request, arabic=False, secondary_fallback_json=getattr(obj.lived_in_city, 'title', None) if obj.lived_in_city_id else None), + 'arabic_lived_in': _resolve_transmitter_m2m_text(obj.lived_in_locations.all(), obj.lived_in, request, arabic=True, secondary_fallback_json=getattr(obj.lived_in_city, 'title', None) if obj.lived_in_city_id else None), + 'lived_in_locations': _serialize_transmitter_m2m_items(obj.lived_in_locations.all(), request), + 'died_in': _resolve_transmitter_m2m_text(obj.died_in_locations.all(), obj.died_in, request, arabic=False, secondary_fallback_json=getattr(obj.died_in_city, 'title', None) if obj.died_in_city_id else None), + 'arabic_died_in': _resolve_transmitter_m2m_text(obj.died_in_locations.all(), obj.died_in, request, arabic=True, secondary_fallback_json=getattr(obj.died_in_city, 'title', None) if obj.died_in_city_id else None), + 'died_in_locations': _serialize_transmitter_m2m_items(obj.died_in_locations.all(), request), + + + 'birth_year_hijri': format_transmitter_date(obj, 'birth', request), 'death_year_hijri': format_transmitter_date(obj, 'death', request), 'age_at_death': format_transmitter_date(obj, 'age', request), diff --git a/apps/hadis/serializers/reference_v2.py b/apps/hadis/serializers/reference_v2.py index 0c39a44..4be93f0 100644 --- a/apps/hadis/serializers/reference_v2.py +++ b/apps/hadis/serializers/reference_v2.py @@ -352,6 +352,38 @@ def _get_request_lang_v2(serializer_instance) -> str: return code if code in ("ru", "en", "ar") else "en" +def _resolve_author_m2m_text(items, city_obj, fallback_json, request, arabic=False): + parts = [] + for item in items: + txt = get_arabic_localized_text(item.title) if arabic else get_localized_text(item.title, request) + if txt and str(txt).strip(): + parts.append(str(txt).strip()) + if parts: + sep = '، ' if arabic else ', ' + return sep.join(parts) + if fallback_json: + val = get_arabic_localized_text(fallback_json) if arabic else get_localized_text(fallback_json, request) + if val: + return val + if city_obj and getattr(city_obj, 'title', None): + val = get_arabic_localized_text(city_obj.title) if arabic else get_localized_text(city_obj.title, request) + if val: + return val + return None + + +def _serialize_author_m2m_detail(items, request): + return [ + { + 'id': item.id, + 'slug': item.slug, + 'title': get_localized_text(item.title, request), + 'arabic_title': get_arabic_localized_text(item.title), + } + for item in items + ] + + def _resolve_author_city(city_obj, fallback_json, request, arabic=False): if city_obj and getattr(city_obj, 'title', None): val = get_arabic_localized_text(city_obj.title) if arabic else get_localized_text(city_obj.title, request) @@ -404,10 +436,13 @@ class _BaseBookAuthorV2Mixin(serializers.Serializer): features_detail = serializers.SerializerMethodField() origin = serializers.SerializerMethodField() arabic_origin = serializers.SerializerMethodField() + origins = serializers.SerializerMethodField() lived_in = serializers.SerializerMethodField() arabic_lived_in = serializers.SerializerMethodField() died_in = serializers.SerializerMethodField() arabic_died_in = serializers.SerializerMethodField() + lived_in_locations = serializers.SerializerMethodField() + died_in_locations = serializers.SerializerMethodField() related_narrator_slug = serializers.CharField(source='related_narrator.slug', read_only=True, allow_null=True) birth_year_hijri = serializers.SerializerMethodField() death_year_hijri = serializers.SerializerMethodField() @@ -454,22 +489,31 @@ class _BaseBookAuthorV2Mixin(serializers.Serializer): return _serialize_author_features_detail(obj, self.context.get('request')) def get_origin(self, obj): - return _resolve_author_city(obj.origin_city, obj.origin, self.context.get('request'), arabic=False) + return _resolve_author_m2m_text(obj.origins_list.all(), obj.origin_city, obj.origin, self.context.get('request'), arabic=False) def get_arabic_origin(self, obj): - return _resolve_author_city(obj.origin_city, obj.origin, self.context.get('request'), arabic=True) + return _resolve_author_m2m_text(obj.origins_list.all(), obj.origin_city, obj.origin, self.context.get('request'), arabic=True) + + def get_origins(self, obj): + return _serialize_author_m2m_detail(obj.origins_list.all(), self.context.get('request')) def get_lived_in(self, obj): - return _resolve_author_city(obj.lived_in_city, obj.lived_in, self.context.get('request'), arabic=False) + return _resolve_author_m2m_text(obj.lived_in_locations.all(), obj.lived_in_city, obj.lived_in, self.context.get('request'), arabic=False) def get_arabic_lived_in(self, obj): - return _resolve_author_city(obj.lived_in_city, obj.lived_in, self.context.get('request'), arabic=True) + return _resolve_author_m2m_text(obj.lived_in_locations.all(), obj.lived_in_city, obj.lived_in, self.context.get('request'), arabic=True) + + def get_lived_in_locations(self, obj): + return _serialize_author_m2m_detail(obj.lived_in_locations.all(), self.context.get('request')) def get_died_in(self, obj): - return _resolve_author_city(obj.died_in_city, obj.died_in, self.context.get('request'), arabic=False) + return _resolve_author_m2m_text(obj.died_in_locations.all(), obj.died_in_city, obj.died_in, self.context.get('request'), arabic=False) def get_arabic_died_in(self, obj): - return _resolve_author_city(obj.died_in_city, obj.died_in, self.context.get('request'), arabic=True) + return _resolve_author_m2m_text(obj.died_in_locations.all(), obj.died_in_city, obj.died_in, self.context.get('request'), arabic=True) + + def get_died_in_locations(self, obj): + return _serialize_author_m2m_detail(obj.died_in_locations.all(), self.context.get('request')) class BookAuthorListSerializer(_BaseBookAuthorV2Mixin, serializers.ModelSerializer): @@ -482,7 +526,7 @@ class BookAuthorListSerializer(_BaseBookAuthorV2Mixin, serializers.ModelSerializ 'known_as', 'arabic_known_as', 'scholarity', 'arabic_scholarity', 'tabaqa', 'arabic_tabaqa', 'rutba', 'rutba_detail', 'features', 'arabic_features', 'features_detail', - 'origin', 'arabic_origin', 'lived_in', 'arabic_lived_in', 'died_in', 'arabic_died_in', + 'origin', 'arabic_origin', 'origins', 'lived_in', 'arabic_lived_in', 'lived_in_locations', 'died_in', 'arabic_died_in', 'died_in_locations', 'birth_year_hijri', 'death_year_hijri', 'age_at_death', 'birth_year_canonical', 'death_year_canonical', 'age_at_death_canonical', 'birth_year_miladi', 'death_year_miladi', @@ -500,7 +544,7 @@ class BookAuthorDetailSerializer(_BaseBookAuthorV2Mixin, serializers.ModelSerial 'known_as', 'arabic_known_as', 'scholarity', 'arabic_scholarity', 'tabaqa', 'arabic_tabaqa', 'rutba', 'rutba_detail', 'features', 'arabic_features', 'features_detail', - 'origin', 'arabic_origin', 'lived_in', 'arabic_lived_in', 'died_in', 'arabic_died_in', + 'origin', 'arabic_origin', 'origins', 'lived_in', 'arabic_lived_in', 'lived_in_locations', 'died_in', 'arabic_died_in', 'died_in_locations', 'birth_year_hijri', 'death_year_hijri', 'age_at_death', 'birth_year_canonical', 'death_year_canonical', 'age_at_death_canonical', 'birth_year_miladi', 'death_year_miladi', @@ -569,10 +613,13 @@ class BookAuthorSyncSerializer(_BaseBookAuthorV2Mixin, serializers.ModelSerializ 'features_detail', 'origin', 'arabic_origin', + 'origins', 'lived_in', 'arabic_lived_in', 'died_in', 'arabic_died_in', + 'lived_in_locations', + 'died_in_locations', 'birth_year_hijri', 'death_year_hijri', 'age_at_death', diff --git a/apps/hadis/serializers/serializers_admin.py b/apps/hadis/serializers/serializers_admin.py index 3172882..a2c7008 100644 --- a/apps/hadis/serializers/serializers_admin.py +++ b/apps/hadis/serializers/serializers_admin.py @@ -22,7 +22,7 @@ from ..models import ( Transmitters, TransmitterReliability, TransmitterRelative, NarratorLayer, OpinionStatus, ScholarlyOpinion, TransmitterOpinion, TransmitterOriginalText, - City, Country, Kunya, MawlaStatus, TransmitterFeature, TransmitterProfession, SahabiStatus, Madhhab, RelationType, YearValue, NarratorDate, + City, Country, Kunya, MawlaStatus, TransmitterOrigin, TransmitterLocation, TransmitterFeature, TransmitterProfession, SahabiStatus, Madhhab, RelationType, YearValue, NarratorDate, CorrectionReference, CorrectionReferenceImage, InterpretationReference, InterpretationReferenceImage, @@ -4247,6 +4247,52 @@ class AdminBookPublisherSerializer(serializers.ModelSerializer): +class AdminTransmitterOriginSerializer(serializers.ModelSerializer): + title = serializers.JSONField() + + class Meta: + model = TransmitterOrigin + fields = ["id", "title", "slug", "created_at", "updated_at"] + read_only_fields = ["id", "slug", "created_at", "updated_at"] + + +class AdminTransmitterLocationSerializer(serializers.ModelSerializer): + title = serializers.JSONField() + + class Meta: + model = TransmitterLocation + fields = ["id", "title", "slug", "created_at", "updated_at"] + read_only_fields = ["id", "slug", "created_at", "updated_at"] + + +def _merge_m2m_titles_to_json(items): + if not items: + return [] + by_lang = {} + lang_order = [] + for item in items: + title_list = getattr(item, "title", None) or [] + if not isinstance(title_list, list): + continue + for entry in title_list: + if not isinstance(entry, dict): + continue + lc = str(entry.get("language_code") or "").strip() + txt = str(entry.get("text") or entry.get("title") or "").strip() + if not lc or not txt: + continue + if lc not in by_lang: + by_lang[lc] = [] + lang_order.append(lc) + if txt not in by_lang[lc]: + by_lang[lc].append(txt) + result = [] + for lc in lang_order: + sep = "، " if lc == "ar" else ", " + result.append({"language_code": lc, "text": sep.join(by_lang[lc])}) + return result + + class AdminMawlaStatusSerializer(serializers.ModelSerializer): title = serializers.JSONField() @@ -4410,6 +4456,9 @@ class AdminTransmitterListSerializer(serializers.ModelSerializer): kunyas_detail = AdminKunyaSerializer(source="kunyas", many=True, read_only=True) mawla_statuses_detail = AdminMawlaStatusSerializer(source="mawla_statuses", many=True, read_only=True) + origins_detail = AdminTransmitterOriginSerializer(source="origins_list", many=True, read_only=True) + lived_in_locations_detail = AdminTransmitterLocationSerializer(source="lived_in_locations", many=True, read_only=True) + died_in_locations_detail = AdminTransmitterLocationSerializer(source="died_in_locations", many=True, read_only=True) freed_slave_of = serializers.JSONField(required=False, default=list) mawla_statuses = serializers.PrimaryKeyRelatedField( queryset=MawlaStatus.objects.all(), @@ -4477,6 +4526,9 @@ class AdminTransmitterListSerializer(serializers.ModelSerializer): "freed_slave_of", "mawla_statuses", "mawla_statuses_detail", + "origins_detail", + "lived_in_locations_detail", + "died_in_locations_detail", "features_detail", @@ -4550,6 +4602,9 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): kunyas_detail = AdminKunyaSerializer(source="kunyas", many=True, read_only=True) mawla_statuses_detail = AdminMawlaStatusSerializer(source="mawla_statuses", many=True, read_only=True) + origins_detail = AdminTransmitterOriginSerializer(source="origins_list", many=True, read_only=True) + lived_in_locations_detail = AdminTransmitterLocationSerializer(source="lived_in_locations", many=True, read_only=True) + died_in_locations_detail = AdminTransmitterLocationSerializer(source="died_in_locations", many=True, read_only=True) freed_slave_of = serializers.JSONField(required=False, default=list) mawla_statuses = serializers.PrimaryKeyRelatedField( queryset=MawlaStatus.objects.all(), @@ -4656,6 +4711,24 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): ) died_in_city_detail = AdminCitySerializer(source="died_in_city", read_only=True) + origins_list = serializers.PrimaryKeyRelatedField( + queryset=TransmitterOrigin.objects.all(), + many=True, + required=False, + ) + origins_detail = AdminTransmitterOriginSerializer(source="origins_list", many=True, read_only=True) + lived_in_locations = serializers.PrimaryKeyRelatedField( + queryset=TransmitterLocation.objects.all(), + many=True, + required=False, + ) + lived_in_locations_detail = AdminTransmitterLocationSerializer(source="lived_in_locations", many=True, read_only=True) + died_in_locations = serializers.PrimaryKeyRelatedField( + queryset=TransmitterLocation.objects.all(), + many=True, + required=False, + ) + died_in_locations_detail = AdminTransmitterLocationSerializer(source="died_in_locations", many=True, read_only=True) description = serializers.JSONField() @@ -4727,6 +4800,9 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): "freed_slave_of", "mawla_statuses", "mawla_statuses_detail", + "origins_detail", + "lived_in_locations_detail", + "died_in_locations_detail", "features", @@ -4805,6 +4881,12 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): "died_in_city", "died_in_city_detail", + "origins_list", + "origins_detail", + "lived_in_locations", + "lived_in_locations_detail", + "died_in_locations", + "died_in_locations_detail", "description", @@ -4841,6 +4923,7 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): "birth_year_preview", "death_year_preview", "age_at_death_preview", "origin_city_detail", "lived_in_city_detail", "died_in_city_detail", + "origins_detail", "lived_in_locations_detail", "died_in_locations_detail", "kunyas_detail", "mawla_statuses_detail", "features_detail", "professions_detail", @@ -5200,6 +5283,20 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): + if "madhhabs" in data: + for m2m_key in ("origins_list", "lived_in_locations", "died_in_locations"): + if m2m_key in data and isinstance(data[m2m_key], str): + try: + data[m2m_key] = json.loads(data[m2m_key]) + except ValueError: + pass + else: + for m2m_key in ("origins_list", "lived_in_locations", "died_in_locations"): + if m2m_key in data and isinstance(data[m2m_key], str): + try: + data[m2m_key] = json.loads(data[m2m_key]) + except ValueError: + pass if "madhhabs" in data: val = data["madhhabs"] @@ -5272,6 +5369,9 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): kunyas_objs = validated_data.pop("kunyas", None) mawla_statuses_objs = validated_data.pop("mawla_statuses", None) + origins_objs = validated_data.pop("origins_list", None) + lived_in_objs = validated_data.pop("lived_in_locations", None) + died_in_objs = validated_data.pop("died_in_locations", None) features_objs = validated_data.pop("features_list", None) @@ -5307,13 +5407,20 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): instance.save(update_fields=['kunya']) if mawla_statuses_objs is not None: instance.mawla_statuses.set(mawla_statuses_objs) - if mawla_statuses_objs: - first_mawla = mawla_statuses_objs[0] - instance.freed_slave_of = first_mawla.title or [] - instance.save(update_fields=['freed_slave_of']) - else: - instance.freed_slave_of = [] - instance.save(update_fields=['freed_slave_of']) + instance.freed_slave_of = _merge_m2m_titles_to_json(mawla_statuses_objs) + instance.save(update_fields=['freed_slave_of']) + if origins_objs is not None: + instance.origins_list.set(origins_objs) + instance.origin = _merge_m2m_titles_to_json(origins_objs) + instance.save(update_fields=['origin']) + if lived_in_objs is not None: + instance.lived_in_locations.set(lived_in_objs) + instance.lived_in = _merge_m2m_titles_to_json(lived_in_objs) + instance.save(update_fields=['lived_in']) + if died_in_objs is not None: + instance.died_in_locations.set(died_in_objs) + instance.died_in = _merge_m2m_titles_to_json(died_in_objs) + instance.save(update_fields=['died_in']) if features_objs is not None: @@ -5360,26 +5467,19 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): instance.save(update_fields=['companion_type']) if madhhabs_objs is not None: - - instance.madhhabs.set(madhhabs_objs) - - for m in madhhabs_objs: - + single_madhhabs = list(madhhabs_objs)[:1] + instance.madhhabs.set(single_madhhabs) + if single_madhhabs: + m = single_madhhabs[0] if m.slug == "sunni": - instance.madhhab = "sunni" - - instance.save(update_fields=["madhhab"]) - - break - elif m.slug == "shia": - instance.madhhab = "shia" - - instance.save(update_fields=["madhhab"]) - - break + else: + instance.madhhab = "other" + else: + instance.madhhab = "unknown" + instance.save(update_fields=["madhhab"]) return instance @@ -5395,6 +5495,9 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): kunyas_objs = validated_data.pop("kunyas", None) mawla_statuses_objs = validated_data.pop("mawla_statuses", None) + origins_objs = validated_data.pop("origins_list", None) + lived_in_objs = validated_data.pop("lived_in_locations", None) + died_in_objs = validated_data.pop("died_in_locations", None) features_objs = validated_data.pop("features_list", None) @@ -5438,13 +5541,20 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): instance.save(update_fields=['kunya']) if mawla_statuses_objs is not None: instance.mawla_statuses.set(mawla_statuses_objs) - if mawla_statuses_objs: - first_mawla = mawla_statuses_objs[0] - instance.freed_slave_of = first_mawla.title or [] - instance.save(update_fields=['freed_slave_of']) - else: - instance.freed_slave_of = [] - instance.save(update_fields=['freed_slave_of']) + instance.freed_slave_of = _merge_m2m_titles_to_json(mawla_statuses_objs) + instance.save(update_fields=['freed_slave_of']) + if origins_objs is not None: + instance.origins_list.set(origins_objs) + instance.origin = _merge_m2m_titles_to_json(origins_objs) + instance.save(update_fields=['origin']) + if lived_in_objs is not None: + instance.lived_in_locations.set(lived_in_objs) + instance.lived_in = _merge_m2m_titles_to_json(lived_in_objs) + instance.save(update_fields=['lived_in']) + if died_in_objs is not None: + instance.died_in_locations.set(died_in_objs) + instance.died_in = _merge_m2m_titles_to_json(died_in_objs) + instance.save(update_fields=['died_in']) if features_objs is not None: @@ -5491,26 +5601,19 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): instance.save(update_fields=['companion_type']) if madhhabs_objs is not None: - - instance.madhhabs.set(madhhabs_objs) - - for m in madhhabs_objs: - + single_madhhabs = list(madhhabs_objs)[:1] + instance.madhhabs.set(single_madhhabs) + if single_madhhabs: + m = single_madhhabs[0] if m.slug == "sunni": - instance.madhhab = "sunni" - - instance.save(update_fields=["madhhab"]) - - break - elif m.slug == "shia": - instance.madhhab = "shia" - - instance.save(update_fields=["madhhab"]) - - break + else: + instance.madhhab = "other" + else: + instance.madhhab = "unknown" + instance.save(update_fields=["madhhab"]) return instance @@ -5651,6 +5754,24 @@ class AdminBookAuthorSerializer(serializers.ModelSerializer): ) died_in_city_detail = AdminCitySerializer(source="died_in_city", read_only=True) + origins_list = serializers.PrimaryKeyRelatedField( + queryset=TransmitterOrigin.objects.all(), + many=True, + required=False, + ) + origins_detail = AdminTransmitterOriginSerializer(source="origins_list", many=True, read_only=True) + lived_in_locations = serializers.PrimaryKeyRelatedField( + queryset=TransmitterLocation.objects.all(), + many=True, + required=False, + ) + lived_in_locations_detail = AdminTransmitterLocationSerializer(source="lived_in_locations", many=True, read_only=True) + died_in_locations = serializers.PrimaryKeyRelatedField( + queryset=TransmitterLocation.objects.all(), + many=True, + required=False, + ) + died_in_locations_detail = AdminTransmitterLocationSerializer(source="died_in_locations", many=True, read_only=True) @@ -5723,6 +5844,12 @@ class AdminBookAuthorSerializer(serializers.ModelSerializer): "died_in_city", "died_in_city_detail", + "origins_list", + "origins_detail", + "lived_in_locations", + "lived_in_locations_detail", + "died_in_locations", + "died_in_locations_detail", "book_references", @@ -5745,6 +5872,9 @@ class AdminBookAuthorSerializer(serializers.ModelSerializer): "lived_in_city_detail", "died_in_city_detail", + "origins_detail", + "lived_in_locations_detail", + "died_in_locations_detail", "features_detail", @@ -5828,6 +5958,20 @@ class AdminBookAuthorSerializer(serializers.ModelSerializer): mutable_data[field] = str(val).strip() + if "features_list" in mutable_data: + for m2m_key in ("origins_list", "lived_in_locations", "died_in_locations"): + if m2m_key in mutable_data and isinstance(mutable_data[m2m_key], str): + try: + mutable_data[m2m_key] = json.loads(mutable_data[m2m_key]) + except ValueError: + pass + else: + for m2m_key in ("origins_list", "lived_in_locations", "died_in_locations"): + if m2m_key in mutable_data and isinstance(mutable_data[m2m_key], str): + try: + mutable_data[m2m_key] = json.loads(mutable_data[m2m_key]) + except ValueError: + pass if "features_list" in mutable_data: val = mutable_data["features_list"] @@ -5895,6 +6039,9 @@ class AdminBookAuthorSerializer(serializers.ModelSerializer): book_references = validated_data.pop("book_references", None) features_objs = validated_data.pop("features_list", None) + origins_objs = validated_data.pop("origins_list", None) + lived_in_objs = validated_data.pop("lived_in_locations", None) + died_in_objs = validated_data.pop("died_in_locations", None) author = super().create(validated_data) @@ -5923,6 +6070,18 @@ class AdminBookAuthorSerializer(serializers.ModelSerializer): author.features = [] author.save(update_fields=['features']) + if origins_objs is not None: + author.origins_list.set(origins_objs) + author.origin = _merge_m2m_titles_to_json(origins_objs) + author.save(update_fields=['origin']) + if lived_in_objs is not None: + author.lived_in_locations.set(lived_in_objs) + author.lived_in = _merge_m2m_titles_to_json(lived_in_objs) + author.save(update_fields=['lived_in']) + if died_in_objs is not None: + author.died_in_locations.set(died_in_objs) + author.died_in = _merge_m2m_titles_to_json(died_in_objs) + author.save(update_fields=['died_in']) return author @@ -5935,6 +6094,9 @@ class AdminBookAuthorSerializer(serializers.ModelSerializer): book_references = validated_data.pop("book_references", None) features_objs = validated_data.pop("features_list", None) + origins_objs = validated_data.pop("origins_list", None) + lived_in_objs = validated_data.pop("lived_in_locations", None) + died_in_objs = validated_data.pop("died_in_locations", None) if remove_image and instance.image: @@ -5979,6 +6141,18 @@ class AdminBookAuthorSerializer(serializers.ModelSerializer): author.features = [] author.save(update_fields=['features']) + if origins_objs is not None: + author.origins_list.set(origins_objs) + author.origin = _merge_m2m_titles_to_json(origins_objs) + author.save(update_fields=['origin']) + if lived_in_objs is not None: + author.lived_in_locations.set(lived_in_objs) + author.lived_in = _merge_m2m_titles_to_json(lived_in_objs) + author.save(update_fields=['lived_in']) + if died_in_objs is not None: + author.died_in_locations.set(died_in_objs) + author.died_in = _merge_m2m_titles_to_json(died_in_objs) + author.save(update_fields=['died_in']) return author diff --git a/apps/hadis/urls.py b/apps/hadis/urls.py index 84a39dc..673d17e 100644 --- a/apps/hadis/urls.py +++ b/apps/hadis/urls.py @@ -63,6 +63,8 @@ from .views_admin import ( DovodiBookPublisherViewSet, DovodiKunyaViewSet, DovodiMawlaStatusViewSet, + DovodiTransmitterOriginViewSet, + DovodiTransmitterLocationViewSet, DovodiTransmitterFeatureViewSet, DovodiTransmitterProfessionViewSet, DovodiSahabiStatusViewSet, @@ -176,6 +178,10 @@ admin_router.register(r'publishers', DovodiBookPublisherViewSet, basename='admin admin_router.register(r'dovodi-kunyas', DovodiKunyaViewSet, basename='dovodi-kunyas') admin_router.register(r'dovodi-mawla-statuses', DovodiMawlaStatusViewSet, basename='dovodi-mawla-statuses') admin_router.register(r'mawla-statuses', DovodiMawlaStatusViewSet, basename='admin-mawla-statuses') +admin_router.register(r'dovodi-origins', DovodiTransmitterOriginViewSet, basename='dovodi-origins') +admin_router.register(r'origins', DovodiTransmitterOriginViewSet, basename='admin-origins') +admin_router.register(r'dovodi-transmitter-locations', DovodiTransmitterLocationViewSet, basename='dovodi-transmitter-locations') +admin_router.register(r'transmitter-locations', DovodiTransmitterLocationViewSet, basename='admin-transmitter-locations') admin_router.register(r'kunyas', DovodiKunyaViewSet, basename='admin-kunyas') admin_router.register(r'dovodi-transmitter-features', DovodiTransmitterFeatureViewSet, basename='dovodi-transmitter-features') admin_router.register(r'transmitter-features', DovodiTransmitterFeatureViewSet, basename='admin-transmitter-features') diff --git a/apps/hadis/views/category.py b/apps/hadis/views/category.py index 71e6a94..02f92ba 100644 --- a/apps/hadis/views/category.py +++ b/apps/hadis/views/category.py @@ -681,6 +681,9 @@ class HadisCategoryXMindView(APIView): 'transmitter__narrator_dates__year_value', 'transmitter__kunyas', 'transmitter__mawla_statuses', + 'transmitter__origins_list', + 'transmitter__lived_in_locations', + 'transmitter__died_in_locations', 'uncertain_transmitters__reliability', 'uncertain_transmitters__narrator_dates__year_value', ).order_by('order') @@ -886,12 +889,17 @@ class HadisCategoryXMindView(APIView): "arabic_known_as": self.get_arabic(tr.known_as) if tr else None, "nickname": self.get_localized(tr.nickname, lang) if tr else None, "arabic_nickname": self.get_arabic(tr.nickname) if tr else None, - "origin": self.get_localized(tr.origin_city.title if (tr.origin_city_id and tr.origin_city and tr.origin_city.title) else tr.origin, lang) if tr else None, - "arabic_origin": self.get_arabic(tr.origin_city.title if (tr.origin_city_id and tr.origin_city and tr.origin_city.title) else tr.origin) if tr else None, - "lived_in": self.get_localized(tr.lived_in_city.title if (tr.lived_in_city_id and tr.lived_in_city and tr.lived_in_city.title) else tr.lived_in, lang) if tr else None, - "arabic_lived_in": self.get_arabic(tr.lived_in_city.title if (tr.lived_in_city_id and tr.lived_in_city and tr.lived_in_city.title) else tr.lived_in) if tr else None, - "died_in": self.get_localized(tr.died_in_city.title if (tr.died_in_city_id and tr.died_in_city and tr.died_in_city.title) else tr.died_in, lang) if tr else None, - "arabic_died_in": self.get_arabic(tr.died_in_city.title if (tr.died_in_city_id and tr.died_in_city and tr.died_in_city.title) else tr.died_in) if tr else None, + "origin": (", ".join([t for t in [self.get_localized(m.title, lang) for m in tr.origins_list.all()] if t]) or self.get_localized(tr.origin_city.title if (tr.origin_city_id and tr.origin_city and tr.origin_city.title) else tr.origin, lang)) if tr else None, + "arabic_origin": ("، ".join([t for t in [self.get_arabic(m.title) for m in tr.origins_list.all()] if t]) or self.get_arabic(tr.origin_city.title if (tr.origin_city_id and tr.origin_city and tr.origin_city.title) else tr.origin)) if tr else None, + "lived_in": (", ".join([t for t in [self.get_localized(m.title, lang) for m in tr.lived_in_locations.all()] if t]) or self.get_localized(tr.lived_in_city.title if (tr.lived_in_city_id and tr.lived_in_city and tr.lived_in_city.title) else tr.lived_in, lang)) if tr else None, + "arabic_lived_in": ("، ".join([t for t in [self.get_arabic(m.title) for m in tr.lived_in_locations.all()] if t]) or self.get_arabic(tr.lived_in_city.title if (tr.lived_in_city_id and tr.lived_in_city and tr.lived_in_city.title) else tr.lived_in)) if tr else None, + "died_in": (", ".join([t for t in [self.get_localized(m.title, lang) for m in tr.died_in_locations.all()] if t]) or self.get_localized(tr.died_in_city.title if (tr.died_in_city_id and tr.died_in_city and tr.died_in_city.title) else tr.died_in, lang)) if tr else None, + "arabic_died_in": ("، ".join([t for t in [self.get_arabic(m.title) for m in tr.died_in_locations.all()] if t]) or self.get_arabic(tr.died_in_city.title if (tr.died_in_city_id and tr.died_in_city and tr.died_in_city.title) else tr.died_in)) if tr else None, + + + + + "mawla_status": (", ".join([t for t in [self.get_localized(m.title, lang) for m in tr.mawla_statuses.all()] if t]) or self.get_localized(tr.freed_slave_of, lang)) if tr else None, "arabic_mawla_status": ("، ".join([t for t in [self.get_arabic(m.title) for m in tr.mawla_statuses.all()] if t]) or self.get_arabic(tr.freed_slave_of)) if tr else None, "profession": (self.get_localized(tr.profession, lang) or self.get_localized(tr.occupation, lang)) if tr else None, diff --git a/apps/hadis/views/reference_v2.py b/apps/hadis/views/reference_v2.py index c51e45e..17e74f0 100644 --- a/apps/hadis/views/reference_v2.py +++ b/apps/hadis/views/reference_v2.py @@ -293,7 +293,7 @@ class BookAuthorListView(ListAPIView): queryset = ( BookAuthor.objects .select_related('related_narrator', 'rutba_status', 'origin_city', 'lived_in_city', 'died_in_city') - .prefetch_related('author_dates__year_value', 'features_list') + .prefetch_related('author_dates__year_value', 'features_list', 'origins_list', 'lived_in_locations', 'died_in_locations') .order_by('-created_at') ) serializer_class = BookAuthorListSerializer @@ -318,7 +318,7 @@ class BookAuthorDetailView(RetrieveAPIView): queryset = ( BookAuthor.objects .select_related('related_narrator', 'rutba_status', 'origin_city', 'lived_in_city', 'died_in_city') - .prefetch_related('author_dates__year_value', 'features_list') + .prefetch_related('author_dates__year_value', 'features_list', 'origins_list', 'lived_in_locations', 'died_in_locations') .all() ) serializer_class = BookAuthorDetailSerializer @@ -368,7 +368,7 @@ class BookAuthorSyncView(generics.ListAPIView): queryset = ( BookAuthor.objects .select_related('related_narrator', 'rutba_status', 'origin_city', 'lived_in_city', 'died_in_city') - .prefetch_related('book_references', 'author_dates__year_value', 'features_list') + .prefetch_related('book_references', 'author_dates__year_value', 'features_list', 'origins_list', 'lived_in_locations', 'died_in_locations') .order_by('id') ) serializer_class = BookAuthorSyncSerializer diff --git a/apps/hadis/views/transmitter.py b/apps/hadis/views/transmitter.py index 9761062..4ec8bea 100644 --- a/apps/hadis/views/transmitter.py +++ b/apps/hadis/views/transmitter.py @@ -35,7 +35,11 @@ class TransmitterView(ListAPIView): queryset = Transmitters.objects.select_related('reliability').prefetch_related( 'narrator_dates__year_value', 'kunyas', + 'kunyas', 'mawla_statuses', + 'origins_list', + 'lived_in_locations', + 'died_in_locations', 'madhhabs', ) @@ -119,7 +123,11 @@ class TransmitterDetailView(RetrieveAPIView): 'relatives__narrator', 'relatives__relation_type_ref', 'kunyas', + 'kunyas', 'mawla_statuses', + 'origins_list', + 'lived_in_locations', + 'died_in_locations', 'features_list', 'professions_list', 'madhhabs', @@ -212,9 +220,16 @@ class TransmitterSyncView(ListAPIView): 'narrator_dates__year_value', 'kunyas', + 'kunyas', 'mawla_statuses', + 'origins_list', + 'lived_in_locations', + 'died_in_locations', 'features_list', 'professions_list', + 'origins_list', + 'lived_in_locations', + 'died_in_locations', 'madhhabs', # 👇 ۲. اضافه کردن 'scholar' برای جلوگیری از کوئری اضافه در نظرات دانشمندان Prefetch('opinions', queryset=TransmitterOpinion.objects.select_related('status', 'scholar', 'opinion', 'opinion__status')), @@ -499,7 +514,11 @@ class NarratorTeachersView(ListAPIView): queryset = Transmitters.objects.filter(id__in=teacher_ids).select_related('reliability').prefetch_related( 'narrator_dates__year_value', 'kunyas', + 'kunyas', 'mawla_statuses', + 'origins_list', + 'lived_in_locations', + 'died_in_locations', ) search_query = self.request.query_params.get('search', None) @@ -551,7 +570,11 @@ class NarratorStudentsView(ListAPIView): queryset = Transmitters.objects.filter(id__in=student_ids).select_related('reliability').prefetch_related( 'narrator_dates__year_value', 'kunyas', + 'kunyas', 'mawla_statuses', + 'origins_list', + 'lived_in_locations', + 'died_in_locations', ) search_query = self.request.query_params.get('search', None) diff --git a/apps/hadis/views_admin.py b/apps/hadis/views_admin.py index 33dfdda..7752325 100644 --- a/apps/hadis/views_admin.py +++ b/apps/hadis/views_admin.py @@ -42,6 +42,8 @@ from .models import ( Kunya, MawlaStatus, + TransmitterOrigin, + TransmitterLocation, TransmitterFeature, TransmitterProfession, SahabiStatus, @@ -138,7 +140,10 @@ from .serializers.serializers_admin import ( AdminKunyaSerializer, AdminMawlaStatusSerializer, + AdminTransmitterOriginSerializer, + AdminTransmitterLocationSerializer, AdminTransmitterFeatureSerializer, + _merge_m2m_titles_to_json, AdminTransmitterProfessionSerializer, AdminSahabiStatusSerializer, AdminMadhhabSerializer, @@ -970,7 +975,7 @@ class AdminTransmitterViewSet(ModelViewSet): def get_queryset(self): - queryset = Transmitters.objects.select_related("reliability").prefetch_related("narrator_dates__year_value", "kunyas", "mawla_statuses", "features_list", "professions_list", "madhhabs") + queryset = Transmitters.objects.select_related("reliability").prefetch_related("narrator_dates__year_value", "kunyas", "mawla_statuses", "origins_list", "lived_in_locations", "died_in_locations", "features_list", "professions_list", "madhhabs") if getattr(self, "action", None) != "list": queryset = queryset.prefetch_related("relatives__relation_type_ref", "relatives__narrator") @@ -1922,7 +1927,7 @@ class AdminBookAuthorViewSet(ModelViewSet): .select_related("rutba_status") - .prefetch_related("author_dates__year_value") + .prefetch_related("author_dates__year_value", "features_list", "origins_list", "lived_in_locations", "died_in_locations") .all() @@ -3272,6 +3277,66 @@ class DovodiCityViewSet(ModelViewSet): return queryset +class DovodiTransmitterOriginViewSet(ModelViewSet): + serializer_class = AdminTransmitterOriginSerializer + permission_classes = [IsAuthenticated, IsSuperAdmin] + authentication_classes = [TokenAuthentication] + pagination_class = OptionalPagination + parser_classes = (JSONParser, MultiPartParser, FormParser) + + def get_queryset(self): + queryset = TransmitterOrigin.objects.all().order_by("slug") + search_query = self.request.query_params.get("search") + if search_query: + queryset = queryset.filter( + Q(title__icontains=search_query) + | Q(slug__icontains=search_query) + ) + return queryset + + def perform_update(self, serializer): + instance = serializer.save() + for tx in instance.transmitters.prefetch_related("origins_list").all(): + tx.origin = _merge_m2m_titles_to_json(tx.origins_list.all()) + tx.save(update_fields=["origin", "normalized_text"]) + for author in instance.book_authors.prefetch_related("origins_list").all(): + author.origin = _merge_m2m_titles_to_json(author.origins_list.all()) + author.save(update_fields=["origin"]) + + +class DovodiTransmitterLocationViewSet(ModelViewSet): + serializer_class = AdminTransmitterLocationSerializer + permission_classes = [IsAuthenticated, IsSuperAdmin] + authentication_classes = [TokenAuthentication] + pagination_class = OptionalPagination + parser_classes = (JSONParser, MultiPartParser, FormParser) + + def get_queryset(self): + queryset = TransmitterLocation.objects.all().order_by("slug") + search_query = self.request.query_params.get("search") + if search_query: + queryset = queryset.filter( + Q(title__icontains=search_query) + | Q(slug__icontains=search_query) + ) + return queryset + + def perform_update(self, serializer): + instance = serializer.save() + for tx in instance.lived_in_transmitters.prefetch_related("lived_in_locations").all(): + tx.lived_in = _merge_m2m_titles_to_json(tx.lived_in_locations.all()) + tx.save(update_fields=["lived_in", "normalized_text"]) + for tx in instance.died_in_transmitters.prefetch_related("died_in_locations").all(): + tx.died_in = _merge_m2m_titles_to_json(tx.died_in_locations.all()) + tx.save(update_fields=["died_in", "normalized_text"]) + for author in instance.lived_in_authors.prefetch_related("lived_in_locations").all(): + author.lived_in = _merge_m2m_titles_to_json(author.lived_in_locations.all()) + author.save(update_fields=["lived_in"]) + for author in instance.died_in_authors.prefetch_related("died_in_locations").all(): + author.died_in = _merge_m2m_titles_to_json(author.died_in_locations.all()) + author.save(update_fields=["died_in"]) + + class DovodiMawlaStatusViewSet(ModelViewSet): serializer_class = AdminMawlaStatusSerializer permission_classes = [IsAuthenticated, IsSuperAdmin]