diff --git a/apps/hadis/serializers/hadis.py b/apps/hadis/serializers/hadis.py index 729d1dc..913195b 100644 --- a/apps/hadis/serializers/hadis.py +++ b/apps/hadis/serializers/hadis.py @@ -1298,7 +1298,7 @@ class TransmitterSyncSerializer(serializers.ModelSerializer): class HadisTransmitterSerializer(serializers.ModelSerializer): """Serializer for HadisTransmitter with transmitter details""" - transmitter = TransmitterShortSerializer(read_only=True) + transmitter = serializers.SerializerMethodField() uncertain_transmitters = TransmitterShortSerializer(many=True, read_only=True) layer = serializers.SerializerMethodField() status = serializers.SerializerMethodField() @@ -1309,7 +1309,12 @@ class HadisTransmitterSerializer(serializers.ModelSerializer): 'id', 'order', 'is_gap', 'is_uncertain', 'layer', 'transmitter', 'uncertain_transmitters', 'status' ] - + def get_transmitter(self, obj): + if getattr(obj, 'is_uncertain', False) and len(list(obj.uncertain_transmitters.all())) > 0: + return None + if obj.transmitter: + return TransmitterShortSerializer(obj.transmitter, context=self.context).data + return None def get_layer(self, obj): """Get narrator layer slug""" diff --git a/apps/hadis/serializers/serializers_admin.py b/apps/hadis/serializers/serializers_admin.py index 4e48e8e..26eb7ab 100644 --- a/apps/hadis/serializers/serializers_admin.py +++ b/apps/hadis/serializers/serializers_admin.py @@ -7649,12 +7649,41 @@ class AdminHadisTransmitterSerializer(serializers.ModelSerializer): ] + validators = [] + + extra_kwargs = { + "order": {"required": False}, + "chain_index": {"required": False}, + } + def create(self, validated_data): + from django.db.models import Max uncertain_transmitters = validated_data.pop("uncertain_transmitters", None) + hadis = validated_data.get("hadis") + chain_index = validated_data.get("chain_index", 0) + order = validated_data.get("order", None) + + if hadis is not None: + conflict_exists = ( + "order" not in self.initial_data + or order is None + or HadisTransmitter.objects.filter( + hadis=hadis, + chain_index=chain_index, + order=order, + ).exists() + ) + if conflict_exists: + max_order = HadisTransmitter.objects.filter( + hadis=hadis, + chain_index=chain_index, + ).aggregate(max_order=Max("order"))["max_order"] + validated_data["order"] = (max_order + 1) if max_order is not None else 0 + instance = super().create(validated_data) if uncertain_transmitters is not None: @@ -7666,9 +7695,35 @@ class AdminHadisTransmitterSerializer(serializers.ModelSerializer): def update(self, instance, validated_data): + from django.db.models import Max uncertain_transmitters = validated_data.pop("uncertain_transmitters", None) + hadis = validated_data.get("hadis", instance.hadis) + chain_index = validated_data.get("chain_index", instance.chain_index) + order = validated_data.get("order", instance.order) + + if hadis is not None: + conflict_exists = ( + HadisTransmitter.objects.filter( + hadis=hadis, + chain_index=chain_index, + order=order, + ) + .exclude(pk=instance.pk) + .exists() + ) + if conflict_exists: + max_order = ( + HadisTransmitter.objects.filter( + hadis=hadis, + chain_index=chain_index, + ) + .exclude(pk=instance.pk) + .aggregate(max_order=Max("order"))["max_order"] + ) + validated_data["order"] = (max_order + 1) if max_order is not None else 0 + instance = super().update(instance, validated_data) if uncertain_transmitters is not None: diff --git a/apps/hadis/views/category.py b/apps/hadis/views/category.py index 02f92ba..f8ae9f1 100644 --- a/apps/hadis/views/category.py +++ b/apps/hadis/views/category.py @@ -681,12 +681,15 @@ class HadisCategoryXMindView(APIView): 'transmitter__narrator_dates__year_value', 'transmitter__kunyas', 'transmitter__mawla_statuses', + 'transmitter__professions_list', + 'transmitter__features_list', 'transmitter__origins_list', 'transmitter__lived_in_locations', 'transmitter__died_in_locations', 'uncertain_transmitters__reliability', 'uncertain_transmitters__narrator_dates__year_value', - ).order_by('order') + 'uncertain_transmitters__kunyas', + ).order_by('order', 'id') hadiths = Hadis.objects.filter( Q(category=category) | Q(categories=category), @@ -754,7 +757,8 @@ class HadisCategoryXMindView(APIView): # Each narrative layer forms its own transmission branch layer_groups = defaultdict(list) for ht in hadis.transmitters.all(): - if ht.transmitter: + has_uncertain = bool(getattr(ht, 'is_uncertain', False) and len(list(ht.uncertain_transmitters.all())) > 0) + if ht.transmitter or has_uncertain: layer_key = ht.narrator_layer_id if ht.narrator_layer_id is not None else f"chain-{ht.chain_index}" layer_groups[layer_key].append(ht) @@ -778,16 +782,16 @@ class HadisCategoryXMindView(APIView): for layer_key, ht_list in sorted_layer_items: # Sort transmitters in reverse order so the chain goes from first narrator to last narrator reaching the hadith - ht_list.sort(key=lambda x: x.order, reverse=True) + ht_list.sort(key=lambda x: (x.order, x.id), reverse=True) curr = root_tree curr["leaf_hadiths"].add(hadis.id) for ht in ht_list: - tr = ht.transmitter is_uncertain = getattr(ht, 'is_uncertain', False) cand_objs = list(ht.uncertain_transmitters.all()) if is_uncertain else [] is_node_uncertain = bool(is_uncertain and len(cand_objs) > 0) + tr = None if is_node_uncertain else ht.transmitter if is_node_uncertain: cand_ids = tuple(sorted([ut.id for ut in cand_objs])) @@ -797,7 +801,7 @@ class HadisCategoryXMindView(APIView): tr_key = ("narrator", tr.id if tr else ht.id) if tr_key not in curr["children_map"]: - rel_obj = (tr.reliability if tr else None) or ht.status + rel_obj = ht.status or (tr.reliability if tr else None) rel_data = None if rel_obj: rel_data = { @@ -834,6 +838,8 @@ class HadisCategoryXMindView(APIView): "slug": getattr(ut_rel, 'slug', None), "description": self.get_localized(getattr(ut_rel, 'description', None), lang), } + ut_kunya = (", ".join([t for t in [self.get_localized(m.title, lang) for m in ut.kunyas.all()] if t]) or self.get_localized(ut.kunya, lang)) + ut_arabic_kunya = ("، ".join([t for t in [self.get_arabic(m.title) for m in ut.kunyas.all()] if t]) or self.get_arabic(ut.kunya)) uncertain_candidates.append({ "id": ut.id, "transmitter_id": ut.id, @@ -843,8 +849,8 @@ class HadisCategoryXMindView(APIView): "title": self.get_localized(ut.full_name, lang) or ut.slug, "full_name": self.get_localized(ut.full_name, lang), "arabic_full_name": self.get_arabic(ut.full_name), - "kunya": self.get_localized(ut.kunya, lang), - "arabic_kunya": self.get_arabic(ut.kunya), + "kunya": ut_kunya, + "arabic_kunya": ut_arabic_kunya, "known_as": self.get_localized(ut.known_as, lang), "arabic_known_as": self.get_arabic(ut.known_as), "nickname": self.get_localized(ut.nickname, lang), @@ -875,6 +881,8 @@ class HadisCategoryXMindView(APIView): tr_node_data = { "id": node_id_str, + "order": ht.order, + "is_gap": bool(ht.is_gap), "transmitter_id": tr.id if tr else (uncertain_candidates[0]["id"] if uncertain_candidates else None), "node_type": node_type_str, "tag": node_type_str, @@ -883,8 +891,8 @@ class HadisCategoryXMindView(APIView): "title": "Uncertain narrator" if is_node_uncertain else (self.get_localized(tr.full_name, lang) or tr.slug if tr else "Narrator"), "full_name": "Uncertain narrator" if is_node_uncertain else (self.get_localized(tr.full_name, lang) if tr else "Narrator"), "arabic_full_name": self.get_arabic(tr.full_name) if tr else None, - "kunya": self.get_localized(tr.kunya, lang) if tr else None, - "arabic_kunya": self.get_arabic(tr.kunya) if tr else None, + "kunya": (", ".join([t for t in [self.get_localized(m.title, lang) for m in tr.kunyas.all()] if t]) or self.get_localized(tr.kunya, lang)) if tr else None, + "arabic_kunya": ("، ".join([t for t in [self.get_arabic(m.title) for m in tr.kunyas.all()] if t]) or self.get_arabic(tr.kunya)) if tr else None, "known_as": self.get_localized(tr.known_as, lang) if tr else None, "arabic_known_as": self.get_arabic(tr.known_as) if tr else None, "nickname": self.get_localized(tr.nickname, lang) if tr else None, @@ -895,17 +903,12 @@ class HadisCategoryXMindView(APIView): "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, - "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, - "arabic_physical_traits": self.get_arabic(tr.features) if tr else None, + "profession": (", ".join([t for t in [self.get_localized(m.title, lang) for m in tr.professions_list.all()] if t]) or self.get_localized(tr.profession, lang) or self.get_localized(tr.occupation, lang)) if tr else None, + "arabic_profession": ("، ".join([t for t in [self.get_arabic(m.title) for m in tr.professions_list.all()] if t]) or self.get_arabic(tr.profession) or self.get_arabic(tr.occupation)) if tr else None, + "physical_traits": (", ".join([t for t in [self.get_localized(m.title, lang) for m in tr.features_list.all()] if t]) or self.get_localized(tr.features, lang)) if tr else None, + "arabic_physical_traits": ("، ".join([t for t in [self.get_arabic(m.title) for m in tr.features_list.all()] if t]) or self.get_arabic(tr.features)) if tr else None, "birth_year_hijri": tr.get_formatted_birth_year(lang=lang) if tr else None, "death_year_hijri": tr.get_formatted_death_year(lang=lang) if tr else None, "age_at_death": tr.get_formatted_age(lang=lang) if tr else None, diff --git a/apps/hadis/views_admin.py b/apps/hadis/views_admin.py index 29f3ad8..90f4fad 100644 --- a/apps/hadis/views_admin.py +++ b/apps/hadis/views_admin.py @@ -2682,19 +2682,31 @@ class AdminHadisTransmitterViewSet(ModelViewSet): with transaction.atomic(): + target_items = list( + HadisTransmitter.objects.filter(id__in=hadis_transmitter_ids).values("id", "hadis_id", "chain_index") + ) + affected_pairs = {(item["hadis_id"], item["chain_index"]) for item in target_items} # Pass 1: Set temporary positive offset order indices to avoid duplicate key violations (>= 0) - for index, ht_id in enumerate(hadis_transmitter_ids): - HadisTransmitter.objects.filter(id=ht_id).update(order=10000 + index) + # Pass 2: Shift any non-target items sharing the same (hadis_id, chain_index) after len(hadis_transmitter_ids) + base_after = len(hadis_transmitter_ids) + for h_id, c_idx in affected_pairs: + other_ids = list( + HadisTransmitter.objects.filter(hadis_id=h_id, chain_index=c_idx) + .exclude(id__in=hadis_transmitter_ids) + .order_by("order", "id") + .values_list("id", flat=True) + ) + for offset_idx, other_id in enumerate(other_ids): + HadisTransmitter.objects.filter(id=other_id).update(order=20000 + offset_idx) + for offset_idx, other_id in enumerate(other_ids): + HadisTransmitter.objects.filter(id=other_id).update(order=base_after + offset_idx) - - # Pass 2: Set final sequential order indices starting from 0 - + # Pass 3: Set final sequential order indices starting from 0 for index, ht_id in enumerate(hadis_transmitter_ids): - HadisTransmitter.objects.filter(id=ht_id).update(order=index)