From fceca282ce579bbec7b806a04b21a5beb3836cf8 Mon Sep 17 00:00:00 2001 From: mohsentaba Date: Sat, 31 Oct 2026 16:33:18 +0330 Subject: [PATCH] feat(hadis): add relational MawlaStatus model and M2M support for transmitters --- ...mawlastatus_transmitters_mawla_statuses.py | 82 +++++++++++++++++++ apps/hadis/models/transmitter.py | 41 +++++++++- apps/hadis/serializers/hadis.py | 37 +++++++-- apps/hadis/serializers/serializers_admin.py | 70 +++++++++++++++- apps/hadis/urls.py | 3 + apps/hadis/views/category.py | 6 +- apps/hadis/views/transmitter.py | 6 ++ apps/hadis/views_admin.py | 23 +++++- 8 files changed, 254 insertions(+), 14 deletions(-) create mode 100644 apps/hadis/migrations/0072_mawlastatus_transmitters_mawla_statuses.py diff --git a/apps/hadis/migrations/0072_mawlastatus_transmitters_mawla_statuses.py b/apps/hadis/migrations/0072_mawlastatus_transmitters_mawla_statuses.py new file mode 100644 index 0000000..342b216 --- /dev/null +++ b/apps/hadis/migrations/0072_mawlastatus_transmitters_mawla_statuses.py @@ -0,0 +1,82 @@ +# Generated by Django 4.2.30 on 2026-10-31 16:15 + +from django.db import migrations, models +from django.utils.text import slugify + + +def migrate_freed_slave_of_to_mawla_status(apps, schema_editor): + Transmitters = apps.get_model('hadis', 'Transmitters') + MawlaStatus = apps.get_model('hadis', 'MawlaStatus') + + 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 + + cache = {} + for ms in MawlaStatus.objects.all(): + primary = _extract_primary_text(ms.title) + if primary: + cache[primary.lower()] = ms + + for tx in Transmitters.objects.all(): + raw = tx.freed_slave_of + if not raw or not isinstance(raw, list): + continue + primary = _extract_primary_text(raw) + if not primary: + continue + key = primary.lower() + ms_obj = cache.get(key) + if not ms_obj: + base_slug = slugify(primary, allow_unicode=True)[:240] or 'mawla' + slug = base_slug + counter = 1 + while MawlaStatus.objects.filter(slug=slug).exists(): + slug = f"{base_slug}-{counter}" + counter += 1 + ms_obj = MawlaStatus.objects.create(title=raw, slug=slug) + cache[key] = ms_obj + tx.mawla_statuses.add(ms_obj) + + +class Migration(migrations.Migration): + + dependencies = [ + ('hadis', '0071_quranayah_transliteration'), + ] + + operations = [ + migrations.CreateModel( + name='MawlaStatus', + 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': 'Mawla Status', + 'verbose_name_plural': 'Mawla Statuses', + 'ordering': ('-created_at', '-id'), + }, + ), + migrations.AddField( + model_name='transmitters', + name='mawla_statuses', + field=models.ManyToManyField(blank=True, related_name='transmitters', to='hadis.mawlastatus', verbose_name='Mawla Statuses (M2M)'), + ), + migrations.RunPython(migrate_freed_slave_of_to_mawla_status, migrations.RunPython.noop), + ] diff --git a/apps/hadis/models/transmitter.py b/apps/hadis/models/transmitter.py index 0ab683e..4518663 100644 --- a/apps/hadis/models/transmitter.py +++ b/apps/hadis/models/transmitter.py @@ -287,6 +287,38 @@ class Kunya(LowercaseSlugMixin, models.Model): return None +class MawlaStatus(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 = _('Mawla Status') + verbose_name_plural = _('Mawla Statuses') + + 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' @@ -483,6 +515,12 @@ class Transmitters(LowercaseSlugMixin, models.Model): siblings = models.ManyToManyField('self', blank=True, verbose_name=_('Siblings')) freed_slave_of = models.JSONField(default=list, blank=True, verbose_name=_('Freed Slave Of')) + mawla_statuses = models.ManyToManyField( + 'hadis.MawlaStatus', + blank=True, + related_name='transmitters', + verbose_name=_('Mawla Statuses (M2M)') + ) occupation = models.JSONField(default=list, blank=True, verbose_name=_('Occupation')) features = models.JSONField(default=list, blank=True, verbose_name=_('Features')) features_list = models.ManyToManyField( @@ -622,7 +660,8 @@ class Transmitters(LowercaseSlugMixin, models.Model): self.full_name, self.kunya, self.known_as, - self.nickname + self.nickname, + self.freed_slave_of ) super().save(*args, **kwargs) diff --git a/apps/hadis/serializers/hadis.py b/apps/hadis/serializers/hadis.py index 5c661ec..8aca57f 100644 --- a/apps/hadis/serializers/hadis.py +++ b/apps/hadis/serializers/hadis.py @@ -481,6 +481,9 @@ class TransmitterSerializer(serializers.ModelSerializer): kunya = serializers.SerializerMethodField() arabic_kunya = serializers.SerializerMethodField() kunyas = serializers.SerializerMethodField() + mawla_status = serializers.SerializerMethodField() + arabic_mawla_status = serializers.SerializerMethodField() + mawla_statuses = serializers.SerializerMethodField() known_as = LocalizedField() arabic_known_as = ArabicLocalizedField(source='known_as') nickname = LocalizedField() @@ -501,7 +504,7 @@ class TransmitterSerializer(serializers.ModelSerializer): 'id', 'full_name', 'arabic_full_name', 'slug', 'birth_year_hijri', 'death_year_hijri', 'age_at_death', 'birth_year_raw', 'death_year_raw', 'age_at_death_raw', - 'kunya', 'arabic_kunya', 'kunyas', 'known_as', 'arabic_known_as', 'nickname', 'arabic_nickname', + 'kunya', 'arabic_kunya', 'kunyas', 'mawla_status', 'arabic_mawla_status', 'mawla_statuses', 'known_as', 'arabic_known_as', 'nickname', 'arabic_nickname', 'reliability', 'madhhab', 'madhhabs', 'generation', 'share_link', 'gender' ] @@ -514,6 +517,15 @@ class TransmitterSerializer(serializers.ModelSerializer): def get_kunyas(self, obj): return _serialize_transmitter_m2m_items(obj.kunyas.all(), self.context.get('request')) + def get_mawla_status(self, obj): + return _resolve_transmitter_m2m_text(obj.mawla_statuses.all(), obj.freed_slave_of, self.context.get('request'), arabic=False) + + def get_arabic_mawla_status(self, obj): + return _resolve_transmitter_m2m_text(obj.mawla_statuses.all(), obj.freed_slave_of, self.context.get('request'), arabic=True) + + def get_mawla_statuses(self, obj): + return _serialize_transmitter_m2m_items(obj.mawla_statuses.all(), self.context.get('request')) + def get_madhhabs(self, obj): return _serialize_transmitter_m2m_items(obj.madhhabs.all(), self.context.get('request'), include_description=True) @@ -831,8 +843,10 @@ class TransmitterDetailSerializer(serializers.ModelSerializer): origin = serializers.SerializerMethodField() arabic_origin = serializers.SerializerMethodField() - mawla_status = LocalizedField(source='freed_slave_of') - arabic_mawla_status = ArabicLocalizedField(source='freed_slave_of') + mawla_status = serializers.SerializerMethodField() + arabic_mawla_status = serializers.SerializerMethodField() + mawla_statuses = serializers.SerializerMethodField() + profession = serializers.SerializerMethodField() arabic_profession = serializers.SerializerMethodField() professions = serializers.SerializerMethodField() @@ -867,7 +881,7 @@ 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', + 'origin', 'arabic_origin', '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', @@ -889,6 +903,15 @@ class TransmitterDetailSerializer(serializers.ModelSerializer): def get_kunyas(self, obj): return _serialize_transmitter_m2m_items(obj.kunyas.all(), self.context.get('request')) + def get_mawla_status(self, obj): + return _resolve_transmitter_m2m_text(obj.mawla_statuses.all(), obj.freed_slave_of, self.context.get('request'), arabic=False) + + def get_arabic_mawla_status(self, obj): + return _resolve_transmitter_m2m_text(obj.mawla_statuses.all(), obj.freed_slave_of, self.context.get('request'), arabic=True) + + def get_mawla_statuses(self, obj): + return _serialize_transmitter_m2m_items(obj.mawla_statuses.all(), self.context.get('request')) + def get_profession(self, obj): return _resolve_transmitter_m2m_text( obj.professions_list.all(), obj.profession, self.context.get('request'), @@ -1130,8 +1153,10 @@ class TransmitterSyncSerializer(serializers.ModelSerializer): '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), - 'mawla_status': get_localized_text(obj.freed_slave_of, request), - 'arabic_mawla_status': get_arabic_localized_text(obj.freed_slave_of), + '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), + 'profession': _resolve_transmitter_m2m_text(obj.professions_list.all(), obj.profession, request, arabic=False, secondary_fallback_json=obj.occupation), 'arabic_profession': _resolve_transmitter_m2m_text(obj.professions_list.all(), obj.profession, request, arabic=True, secondary_fallback_json=obj.occupation), 'professions': _serialize_transmitter_m2m_items(obj.professions_list.all(), request), diff --git a/apps/hadis/serializers/serializers_admin.py b/apps/hadis/serializers/serializers_admin.py index 3b82375..3172882 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, TransmitterFeature, TransmitterProfession, SahabiStatus, Madhhab, RelationType, YearValue, NarratorDate, + City, Country, Kunya, MawlaStatus, TransmitterFeature, TransmitterProfession, SahabiStatus, Madhhab, RelationType, YearValue, NarratorDate, CorrectionReference, CorrectionReferenceImage, InterpretationReference, InterpretationReferenceImage, @@ -4247,6 +4247,15 @@ class AdminBookPublisherSerializer(serializers.ModelSerializer): +class AdminMawlaStatusSerializer(serializers.ModelSerializer): + title = serializers.JSONField() + + class Meta: + model = MawlaStatus + fields = ["id", "title", "slug", "created_at", "updated_at"] + read_only_fields = ["id", "slug", "created_at", "updated_at"] + + class AdminKunyaSerializer(serializers.ModelSerializer): title = serializers.JSONField() @@ -4400,6 +4409,13 @@ class AdminTransmitterListSerializer(serializers.ModelSerializer): reliability_detail = AdminTransmitterReliabilitySerializer(source="reliability", read_only=True) kunyas_detail = AdminKunyaSerializer(source="kunyas", many=True, read_only=True) + mawla_statuses_detail = AdminMawlaStatusSerializer(source="mawla_statuses", many=True, read_only=True) + freed_slave_of = serializers.JSONField(required=False, default=list) + mawla_statuses = serializers.PrimaryKeyRelatedField( + queryset=MawlaStatus.objects.all(), + many=True, + required=False, + ) features_detail = AdminTransmitterFeatureSerializer(source="features_list", many=True, read_only=True) @@ -4458,6 +4474,9 @@ class AdminTransmitterListSerializer(serializers.ModelSerializer): "nickname", "kunyas_detail", + "freed_slave_of", + "mawla_statuses", + "mawla_statuses_detail", "features_detail", @@ -4530,6 +4549,13 @@ 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) + freed_slave_of = serializers.JSONField(required=False, default=list) + mawla_statuses = serializers.PrimaryKeyRelatedField( + queryset=MawlaStatus.objects.all(), + many=True, + required=False, + ) features = serializers.JSONField(required=False, default=list) @@ -4698,6 +4724,9 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): "kunyas", "kunyas_detail", + "freed_slave_of", + "mawla_statuses", + "mawla_statuses_detail", "features", @@ -4813,7 +4842,8 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): "origin_city_detail", "lived_in_city_detail", "died_in_city_detail", - "kunyas_detail", "features_detail", "professions_detail", + "kunyas_detail", + "mawla_statuses_detail", "features_detail", "professions_detail", ] @@ -5109,6 +5139,20 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): if "kunyas" in data: + val = data["kunyas"] + if isinstance(val, str): + try: + data["kunyas"] = json.loads(val) + except ValueError: + pass + + if "mawla_statuses" in data: + val = data["mawla_statuses"] + if isinstance(val, str): + try: + data["mawla_statuses"] = json.loads(val) + except ValueError: + pass val = data["kunyas"] @@ -5227,6 +5271,7 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): relatives_data = validated_data.pop("relatives_data", None) kunyas_objs = validated_data.pop("kunyas", None) + mawla_statuses_objs = validated_data.pop("mawla_statuses", None) features_objs = validated_data.pop("features_list", None) @@ -5255,12 +5300,20 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): instance.kunya = first_kunya.title or [] instance.save(update_fields=['kunya']) - else: instance.kunya = [] 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']) if features_objs is not None: @@ -5341,6 +5394,7 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): relatives_data = validated_data.pop("relatives_data", None) kunyas_objs = validated_data.pop("kunyas", None) + mawla_statuses_objs = validated_data.pop("mawla_statuses", None) features_objs = validated_data.pop("features_list", None) @@ -5377,12 +5431,20 @@ class AdminTransmitterDetailSerializer(serializers.ModelSerializer): instance.kunya = first_kunya.title or [] instance.save(update_fields=['kunya']) - else: instance.kunya = [] 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']) if features_objs is not None: diff --git a/apps/hadis/urls.py b/apps/hadis/urls.py index 13d9e4d..84a39dc 100644 --- a/apps/hadis/urls.py +++ b/apps/hadis/urls.py @@ -62,6 +62,7 @@ from .views_admin import ( DovodiCountryViewSet, DovodiBookPublisherViewSet, DovodiKunyaViewSet, + DovodiMawlaStatusViewSet, DovodiTransmitterFeatureViewSet, DovodiTransmitterProfessionViewSet, DovodiSahabiStatusViewSet, @@ -173,6 +174,8 @@ admin_router.register(r'countries', DovodiCountryViewSet, basename='admin-countr admin_router.register(r'dovodi-publishers', DovodiBookPublisherViewSet, basename='dovodi-publishers') admin_router.register(r'publishers', DovodiBookPublisherViewSet, basename='admin-publishers') 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'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 44e7a77..71e6a94 100644 --- a/apps/hadis/views/category.py +++ b/apps/hadis/views/category.py @@ -679,6 +679,8 @@ class HadisCategoryXMindView(APIView): 'narrator_layer' ).prefetch_related( 'transmitter__narrator_dates__year_value', + 'transmitter__kunyas', + 'transmitter__mawla_statuses', 'uncertain_transmitters__reliability', 'uncertain_transmitters__narrator_dates__year_value', ).order_by('order') @@ -890,8 +892,8 @@ class HadisCategoryXMindView(APIView): "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, - "mawla_status": self.get_localized(tr.freed_slave_of, lang) if tr else None, - "arabic_mawla_status": self.get_arabic(tr.freed_slave_of) 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, "arabic_profession": (self.get_arabic(tr.profession) or self.get_arabic(tr.occupation)) if tr else None, "physical_traits": self.get_localized(tr.features, lang) if tr else None, diff --git a/apps/hadis/views/transmitter.py b/apps/hadis/views/transmitter.py index f21e136..9761062 100644 --- a/apps/hadis/views/transmitter.py +++ b/apps/hadis/views/transmitter.py @@ -35,6 +35,7 @@ class TransmitterView(ListAPIView): queryset = Transmitters.objects.select_related('reliability').prefetch_related( 'narrator_dates__year_value', 'kunyas', + 'mawla_statuses', 'madhhabs', ) @@ -118,6 +119,7 @@ class TransmitterDetailView(RetrieveAPIView): 'relatives__narrator', 'relatives__relation_type_ref', 'kunyas', + 'mawla_statuses', 'features_list', 'professions_list', 'madhhabs', @@ -209,6 +211,8 @@ class TransmitterSyncView(ListAPIView): .prefetch_related( 'narrator_dates__year_value', 'kunyas', + + 'mawla_statuses', 'features_list', 'professions_list', 'madhhabs', @@ -495,6 +499,7 @@ class NarratorTeachersView(ListAPIView): queryset = Transmitters.objects.filter(id__in=teacher_ids).select_related('reliability').prefetch_related( 'narrator_dates__year_value', 'kunyas', + 'mawla_statuses', ) search_query = self.request.query_params.get('search', None) @@ -546,6 +551,7 @@ class NarratorStudentsView(ListAPIView): queryset = Transmitters.objects.filter(id__in=student_ids).select_related('reliability').prefetch_related( 'narrator_dates__year_value', 'kunyas', + 'mawla_statuses', ) search_query = self.request.query_params.get('search', None) diff --git a/apps/hadis/views_admin.py b/apps/hadis/views_admin.py index 9f92d1a..33dfdda 100644 --- a/apps/hadis/views_admin.py +++ b/apps/hadis/views_admin.py @@ -41,6 +41,7 @@ from .models import ( BookPublisher, Kunya, + MawlaStatus, TransmitterFeature, TransmitterProfession, SahabiStatus, @@ -136,6 +137,7 @@ from .serializers.serializers_admin import ( AdminBookPublisherSerializer, AdminKunyaSerializer, + AdminMawlaStatusSerializer, AdminTransmitterFeatureSerializer, AdminTransmitterProfessionSerializer, AdminSahabiStatusSerializer, @@ -968,7 +970,7 @@ class AdminTransmitterViewSet(ModelViewSet): def get_queryset(self): - queryset = Transmitters.objects.select_related("reliability").prefetch_related("narrator_dates__year_value") + queryset = Transmitters.objects.select_related("reliability").prefetch_related("narrator_dates__year_value", "kunyas", "mawla_statuses", "features_list", "professions_list", "madhhabs") if getattr(self, "action", None) != "list": queryset = queryset.prefetch_related("relatives__relation_type_ref", "relatives__narrator") @@ -983,6 +985,7 @@ class AdminTransmitterViewSet(ModelViewSet): Q(full_name__icontains=search_query) | Q(kunya__icontains=search_query) + | Q(freed_slave_of__icontains=search_query) | Q(known_as__icontains=search_query) @@ -3269,6 +3272,24 @@ class DovodiCityViewSet(ModelViewSet): return queryset +class DovodiMawlaStatusViewSet(ModelViewSet): + serializer_class = AdminMawlaStatusSerializer + permission_classes = [IsAuthenticated, IsSuperAdmin] + authentication_classes = [TokenAuthentication] + pagination_class = OptionalPagination + parser_classes = (JSONParser, MultiPartParser, FormParser) + + def get_queryset(self): + queryset = MawlaStatus.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 + + class DovodiKunyaViewSet(ModelViewSet): serializer_class = AdminKunyaSerializer permission_classes = [IsAuthenticated, IsSuperAdmin]