fix --> bug of transaction dashboard on free visibility scope

apps/livestock/migrations/0017_livestockspecies_value.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0 on 2026-01-24 11:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('livestock', '0016_temporarylivestock'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='livestockspecies',
+            name='value',
+            field=models.IntegerField(default=0),
+        ),
+    ]

apps/livestock/migrations/0018_livestockspecies_en_name_alter_livestockspecies_name.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0 on 2026-01-24 11:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('livestock', '0017_livestockspecies_value'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='livestockspecies',
+            name='en_name',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='livestockspecies',
+            name='name',
+            field=models.CharField(max_length=50, null=True),
+        ),
+    ]

apps/livestock/models.py

@@ -7,7 +7,9 @@ from apps.tag import models as tag_models
 
 class LiveStockSpecies(BaseModel):  # noqa
     """ species of live stocks like Kurdi, Luri, etc """  # noqa
-    name = models.CharField(max_length=50)
+    name = models.CharField(max_length=50, null=True)
+    en_name = models.CharField(max_length=50, null=True)
+    value = models.IntegerField(default=0)
 
     def __str__(self):
         return f'{self.name}'

apps/livestock/web/api/v1/serializers.py

@@ -1,6 +1,7 @@
 from rest_framework import serializers
-from apps.livestock import models as livestock_models
+
 from apps.herd.web.api.v1.serializers import HerdSerializer
+from apps.livestock import models as livestock_models
 from apps.tag.web.api.v1.serializers import TagSerializer
 
 
@@ -28,7 +29,9 @@ class LiveStockSpeciesSerializer(serializers.ModelSerializer):
         model = livestock_models.LiveStockSpecies
         fields = [
             'id',
-            'name'
+            'name',
+            'en_name',
+            'value',
         ]
 
 

apps/pos_device/exceptions.py

@@ -2,6 +2,23 @@ from rest_framework import status
 from rest_framework.exceptions import APIException
 
 
+class DeviceException(APIException):
+    status_code = status.HTTP_400_BAD_REQUEST
+    default_detail = "خطا در اطلاعات پلاک"  # noqa
+    default_code = 'error'
+
+    def __init__(self, message=None, status_code=None, code=None):
+        if status_code is not None:
+            self.status_code = status_code
+
+        detail = {
+            "message": message,
+            "status_code": status_code
+        }
+
+        super().__init__(detail)
+
+
 class DeviceAlreadyAssigned(APIException):
     status_code = status.HTTP_403_FORBIDDEN
     default_detail = "این دستگاه قبلا به این کلاینت تخصیص داده شده است"  # noqa

apps/pos_device/migrations/0081_alter_device_serial.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0 on 2026-01-26 06:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pos_device', '0080_bankaccountdevicelink'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='device',
+            name='serial',
+            field=models.TextField(null=True),
+        ),
+    ]

apps/pos_device/models.py

@@ -36,7 +36,7 @@ class Device(BaseModel):
     acceptor = models.CharField(max_length=50, null=True)
     terminal = models.CharField(max_length=50, null=True)
     mac = models.CharField(max_length=50, null=True)
-    serial = models.TextField(null=True, unique=True)
+    serial = models.TextField(null=True)
     password = models.CharField(max_length=25, null=True)
     multi_device = models.BooleanField(default=False)
     server_in = models.BooleanField(default=False)

apps/pos_device/web/api/v1/serilaizers/device.py

@@ -3,6 +3,7 @@ from rest_framework.serializers import ModelSerializer
 from apps.authentication.api.v1.serializers.serializer import BankAccountSerializer
 from apps.pos_device import exceptions as pos_exceptions
 from apps.pos_device import models as pos_models
+from apps.pos_device.exceptions import DeviceException
 from apps.pos_device.web.api.v1.serilaizers import client as client_serializer
 from apps.product.web.api.v1.serializers.quota_distribution_serializers import QuotaDistributionSerializer
 
@@ -18,6 +19,19 @@ class DeviceSerializer(ModelSerializer):
         model = pos_models.Device
         fields = '__all__'
 
+    def validate(self, attrs):
+        serial = attrs['serial']
+
+        if not self.instance:
+            if self.Meta.model.objects.filter(serial=serial).exists():
+                raise DeviceException("دستگاه یا این شماره سریال از قبل ثبت شده است.", status_code=403)  # noqa
+
+        if self.instance:
+            if serial != self.instance.serial and self.Meta.model.objects.filter(serial=serial).exists():
+                raise DeviceException("دستگاهی با این شماره سریال وجود دارد.", status_code=403)  # noqa
+
+        return attrs
+
     def to_representation(self, instance):
         """ custom output of serializer """
         representation = super().to_representation(instance)

apps/tag/apps.py

@@ -4,3 +4,6 @@ from django.apps import AppConfig
 class TagConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'apps.tag'
+
+    def ready(self):
+        import apps.tag.signals.tag_distribution_signals  # noqa

apps/tag/migrations/0042_tagdistribution_parent_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.0 on 2026-01-27 09:18
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tag', '0041_tagbatch_total_remaining_tags'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tagdistribution',
+            name='parent',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='child', to='tag.tagdistribution'),
+        ),
+        migrations.AddField(
+            model_name='tagdistribution',
+            name='remaining_number',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='tagdistribution',
+            name='total_tag_count',
+            field=models.IntegerField(default=0),
+        ),
+    ]

apps/tag/models.py

@@ -91,6 +91,12 @@ class TagBatch(BaseModel):
 
 
 class TagDistribution(BaseModel):
+    parent = models.ForeignKey(
+        'self',
+        on_delete=models.CASCADE,
+        related_name='child',
+        null=True
+    )
     dist_identity = models.CharField(max_length=20, default="0", unique=True, null=True)
     batch = models.ForeignKey(
         TagBatch,
@@ -112,7 +118,9 @@ class TagDistribution(BaseModel):
         null=True
     )
     species_code = models.IntegerField(default=0)
+    total_tag_count = models.IntegerField(default=0)
     distributed_number = models.IntegerField(default=0)
+    remaining_number = models.IntegerField(default=0)
     is_closed = models.BooleanField(default=False)
 
     def __str__(self):

apps/tag/services/tag_batch_service.py

@@ -0,0 +1,69 @@
+from django.db.models import Sum, Q, Count, QuerySet, OuterRef, Subquery, IntegerField
+from django.db.models.functions import Coalesce
+
+from apps.authentication.models import Organization
+from apps.authentication.services.service import get_all_org_child
+from apps.tag.models import TagBatch
+
+
+class TagBatchService:
+    """
+    services of tag batch
+    """
+
+    def tag_batch_main_dashboard(self, org: Organization = None, batch: QuerySet[TagBatch] = None):
+        """
+        dashboard data of batch main page
+        """
+
+        qs = TagBatch.objects.select_related('organization') if not batch else batch
+
+        if org.type.key != 'ADM':
+            child_orgs = get_all_org_child(org)  # noqa
+            child_orgs.append(org)
+            qs = qs.filter(organization__in=child_orgs)
+
+        base_data = qs.aggregate(
+            batch_count=Count('id', distinct=True),
+            total_distributed_tags=Coalesce(Sum('total_distributed_tags'), 0),
+            total_remaining_tags=Coalesce(Sum('total_remaining_tags'), 0),
+            has_distributed_batches_number=Count(
+                'id',
+                distinct=True,
+                filter=Q(status__in=[
+                    'distributed',
+                ])
+            )
+        )
+        base_data.update(qs.aggregate(tag_count_created_by_batch=Count('tag')))
+
+        tag_count_subquery = (
+            TagBatch.objects
+            .filter(id=OuterRef('id'))
+            .annotate(cnt=Count('tag'))
+            .values('cnt')
+        )
+
+        species_data = (
+            qs
+            .annotate(
+                tag_count=Subquery(tag_count_subquery, output_field=IntegerField())
+            )
+            .values('species_code')
+            .annotate(
+                batch_count=Count('id', distinct=True),
+                total_distributed_tags=Coalesce(Sum('total_distributed_tags'), 0),
+                total_remaining_tags=Coalesce(Sum('total_remaining_tags'), 0),
+                tag_count_created_by_batch=Coalesce(Sum('tag_count'), 0),
+                has_distributed_batches_number=Count(
+                    'id',
+                    distinct=True,
+                    filter=Q(status='distributed')
+                )
+            )
+            .order_by('species_code')
+        )
+
+        base_data['batch_data_by_species'] = list(species_data)
+
+        return base_data

apps/tag/services/tag_distribution_services.py

@@ -4,8 +4,10 @@ from django.db import transaction
 from django.db.models import Sum, Q
 from django.db.models.aggregates import Count
 from django.db.models.functions import Coalesce
+from rest_framework.exceptions import PermissionDenied
 
 from apps.authentication.models import Organization
+from apps.livestock.models import LiveStockSpecies
 from apps.tag.exceptions import TagException
 from apps.tag.models import Tag, TagBatch, TagDistribution, TagDistributionBatch
 from common.generics import generate_unique_code
@@ -16,7 +18,7 @@ class TagDistributionService:
     service of distribute tags in organizations
     """
 
-    def create_distribution(self, org: Organization = None, data: dict = None):
+    def create_distribution_from_batch(self, org: Organization = None, data: dict = None):
         """
         distribute tags with batch
         """
@@ -56,7 +58,8 @@ class TagDistributionService:
                     assigner_org=org,
                     assigned_org=assigned_org,
                     species_code=distribution.get('species_code'),
-                    distributed_number=distribution.get('count'),
+                    total_tag_count=distribution.get('count'),
+                    remaining_number=distribution.get('count'),
                     dist_identity=generate_unique_code(f"{random.randint(1000, 9999)}"),
                 )
 
@@ -72,6 +75,7 @@ class TagDistributionService:
 
             # create distribution batch
             distributions_batch = TagDistributionBatch.objects.create(
+                parent=TagDistributionBatch.objects.get(id=data.get('parent')) if data.get('parent') else None,
                 assigner_org=org,
                 assigned_org=assigned_org,
                 total_tag_count=total_counted_tags,
@@ -82,17 +86,20 @@ class TagDistributionService:
 
         return {'tag_distributions': distributions, 'distributions_batch': distributions_batch}
 
-    def edit_distribution(self, dist_batch: TagDistributionBatch = None, data: dict = None, org: Organization = None):
+    def edit_distribution_from_batch(
+            self, dist_batch: TagDistributionBatch = None,
+            data: dict = None,
+            org: Organization = None
+    ):
         """
         edit record of distributed tags
         """
 
         #  clear and hard delete of distributions
-        distributions = dist_batch.distributions.all()
+        dist_batch_distributions = dist_batch.distributions.all()
-        for dist in distributions:  # free distributed tags from reserve
+        for dist in dist_batch_distributions:  # free distributed tags from reserve
             dist.tag.all().update(status='F')
-        dist_batch.distributions.clear()
+        dist_batch_distributions.delete()
-        distributions.delete()
 
         # create new distributions and update batch
         total_counted_tags = 0
@@ -129,7 +136,8 @@ class TagDistributionService:
                 assigner_org=org,
                 assigned_org=assigned_org,
                 species_code=distribution.get('species_code'),
-                distributed_number=distribution.get('count'),
+                total_tag_count=distribution.get('count'),
+                remaining_number=distribution.get('count'),
                 dist_identity=generate_unique_code(f"{random.randint(1000, 9999)}"),
             )
 
@@ -147,10 +155,168 @@ class TagDistributionService:
         dist_batch.assigned_org = assigned_org
         dist_batch.total_tag_count = total_counted_tags
         dist_batch.distribution_type = distribution_type  # noqa
+        dist_batch.save(update_fields=['assigned_org', 'total_tag_count', 'distribution_type'])
         dist_batch.distributions.add(*distributions)
 
         return {'tag_distributions': distributions, 'distributions_batch': dist_batch}
 
+    def create_distribution_from_distribution(
+            self, org: Organization = None,
+            tag_batch: TagDistributionBatch = None,
+            data: dict = None
+    ):
+        """
+        create a distribution from distribution to target organization
+        """
+        with transaction.atomic():
+            distributions = []
+            total_counted_tags = 0
+
+            assigned_org = Organization.objects.get(id=data['assigned_org'])
+            parent_batch = TagDistributionBatch.objects.get(
+                id=data['parent_distribution_batch']
+            )
+
+            if parent_batch.assigned_org != org and org.type.key != 'ADM':
+                raise PermissionDenied("دسترسی غیرمجاز")  # noqa
+
+            for dist_data in data['dists']:
+                species = dist_data['species_code']
+                count = dist_data['count']
+                parent_tag_distribution = TagDistribution.objects.get(
+                    id=dist_data['parent_tag_distribution']
+                )
+                batch = TagBatch.objects.get(batch_identity=dist_data.get('batch_identity'))
+
+                tags = Tag.objects.filter(
+                    distributions__tag_distribution_batch=parent_batch,
+                    species_code=species,
+                    status='R',
+                )
+
+                if tags.count() < count:
+                    raise TagException("پلاک کافی برای این گونه وجود ندارد", 403)  # noqa
+
+                dist = TagDistribution.objects.create(
+                    parent=parent_tag_distribution,
+                    batch=batch,
+                    assigner_org=org,
+                    assigned_org=assigned_org,
+                    species_code=species,
+                    total_tag_count=count,
+                    remaining_number=count,
+                    dist_identity=generate_unique_code(
+                        f"{random.randint(1000, 9999)}"
+                    ),
+                )
+
+                selected_tags = tags.order_by('create_date')[:count]
+                dist.tag.add(*selected_tags)
+
+                distributions.append(dist)
+                total_counted_tags += count
+
+            dist_batch = TagDistributionBatch.objects.create(
+                parent=parent_batch,
+                assigner_org=org,
+                assigned_org=assigned_org,
+                total_tag_count=total_counted_tags,
+                distribution_type='batch',
+                dist_batch_identity=generate_unique_code(
+                    f"{random.randint(1000, 9999)}"
+                )
+            )
+
+            dist_batch.distributions.add(*distributions)
+
+            return {
+                'tag_distributions': distributions,
+                'distributions_batch': dist_batch
+            }
+
+    def edit_distribution_from_distribution(
+            self, org: Organization = None,
+            tag_batch: TagDistributionBatch = None,
+            data: dict = None
+
+    ):
+        with transaction.atomic():
+
+            if tag_batch.assigner_org != org:
+                raise PermissionDenied("اجازه ویرایش این توزیع را ندارید")
+
+            for dist in tag_batch.distributions.all():
+                dist.tag.all().update(
+                    status='R',
+                    organization=org
+                )
+
+            old_distributions = tag_batch.distributions.all()
+            tag_batch.distributions.clear()
+            old_distributions.delete()
+
+            assigned_org = Organization.objects.get(id=data['assigned_org'])
+            parent_batch = tag_batch.parent
+
+            distributions = []
+            total_counted_tags = 0
+
+            for dist_data in data['dists']:
+                species = dist_data['species_code']
+                parent_tag_distribution = TagDistribution.objects.get(
+                    id=dist_data['parent_tag_distribution']
+                )
+                batch = TagBatch.objects.get(batch_identity=dist_data.get('batch_identity'))
+                count = dist_data['count']
+
+                tags = Tag.objects.filter(
+                    distributions__tag_distribution_batch=parent_batch,
+                    species_code=species,
+                    status='R',
+                )
+
+                if tags.count() < count:
+                    raise TagException(
+                        "پلاک کافی برای این گونه وجود ندارد",  # noqa
+                        403
+                    )
+
+                dist = TagDistribution.objects.create(
+                    parent=parent_tag_distribution,
+                    batch=batch,
+                    assigner_org=org,
+                    assigned_org=assigned_org,
+                    species_code=species,
+                    total_tag_count=count,
+                    remaining_number=count,
+                    dist_identity=generate_unique_code(
+                        f"{random.randint(1000, 9999)}"
+                    ),
+                )
+
+                selected_tags = tags.order_by('create_date')[:count]
+                dist.tag.add(*selected_tags)
+
+                distributions.append(dist)
+                total_counted_tags += count
+
+            # 5️⃣ update distribution batch
+            tag_batch.assigned_org = assigned_org
+            tag_batch.total_tag_count = total_counted_tags
+            tag_batch.is_closed = False
+            tag_batch.save(update_fields=[
+                'assigned_org',
+                'total_tag_count',
+                'is_closed'
+            ])
+
+            tag_batch.distributions.add(*distributions)
+
+            return {
+                'tag_distributions': distributions,
+                'distributions_batch': tag_batch
+            }
+
     def distribution_batch_main_dashboard(self, org: Organization, is_closed: str = 'false'):
         """
         distribution batch main page dashboard detail
@@ -159,16 +325,18 @@ class TagDistributionService:
         is_closed = False if is_closed == 'false' else True
 
         if org.type.key == 'ADM':
-            distributions_batch = TagDistributionBatch.objects.prefetch_related(
+            distribution_query = (Q(is_closed=is_closed))
-                'distributions'
-            ).filter(is_closed=is_closed)
         else:
-            distributions_batch = TagDistributionBatch.objects.filter(
+            distribution_query = (
                 Q(assigner_org=org) |
                 Q(assigned_org=org),
-                is_closed=is_closed,
+                Q(is_closed=is_closed)
             )
 
+        distributions_batch = TagDistributionBatch.objects.prefetch_related(
+            'distributions'
+        ).filter(distribution_query)
+
         data = distributions_batch.aggregate(
             count=Count('id'),
             total_sent_tag_count=Coalesce(Sum('total_tag_count', filter=Q(assigner_org=org)), 0),
@@ -179,4 +347,24 @@ class TagDistributionService:
             remaining_tag_count=Sum('remaining_tag_count'),
         )
 
+        #  distributions item list detail
+        items_list = []
+        distributions = TagDistribution.objects.filter(
+            distribution_query
+        )
+
+        species = LiveStockSpecies.objects.values('value')
+
+        for spec in species:
+            dist_data = distributions.aggregate(
+                dist_count=Count('id', filter=Q(species_code=spec.get('value'))),
+                tag_count=Coalesce(
+                    Sum('distributed_number', filter=Q(species_code=spec.get('value'))), 0
+                )
+            )
+            dist_data.update({'species_code': spec.get('value')})  # add species code to data
+            items_list.append(dist_data)
+
+        data.update({'items': items_list})
+
         return data

apps/tag/services/tag_services.py

@@ -9,6 +9,14 @@ from apps.tag.exceptions import TagException
 from apps.tag.models import Tag, TagBatch
 from apps.tag.tools import tag_code_serial_scanning
 
+SPECIES_MAP = {
+    'cow': 1,
+    'buffalo': 2,
+    'camel': 3,
+    'sheep': 4,
+    'goat': 5,
+}
+
 
 class TagService:
     """
@@ -54,6 +62,7 @@ class TagService:
             species_code=data.get('species_code'),
             serial_from=serial_start_range,
             serial_to=serial_end_range,
+            total_remaining_tags=request_number if request_number > 0 else 1,
             status='created',
         )
 
@@ -96,6 +105,7 @@ class TagService:
         batch.species_code = data.get('species_code')
         batch.serial_from = serial_start_range
         batch.serial_to = serial_end_range
+        batch.total_remaining_tags = request_number
         batch.save(update_fields=['request_number', 'species_code', 'serial_from', 'serial_to'])
 
         # recreate tags for batch

apps/tag/signals/tag_distribution_signals.py

@@ -0,0 +1,173 @@
+from django.db.models.signals import m2m_changed
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from apps.tag.models import TagDistribution, TagDistributionBatch, Tag
+
+
+@receiver(m2m_changed, sender=TagDistribution.tag.through)
+def update_batch_on_distribution_change(
+        sender, instance: TagDistribution, action, **kwargs
+):
+    if action not in ['post_add', 'post_remove', 'post_clear']:
+        return
+
+    if not instance.batch:
+        return
+
+    batch = instance.batch
+
+    distributions = TagDistribution.objects.filter(batch=batch)
+
+    distributed_tags = Tag.objects.filter(
+        distributions__batch=batch
+    ).distinct().count()
+
+    batch.total_distributed_tags = distributed_tags
+    batch.total_remaining_tags = (
+            int(batch.request_number) - distributed_tags
+    )
+
+    batch.status = (
+        'distributed'
+        if batch.total_remaining_tags == 0
+        else 'created'
+    )
+
+    batch.save(update_fields=[
+        'total_distributed_tags',
+        'total_remaining_tags',
+        'status'
+    ])
+
+
+@receiver(post_save, sender=TagDistributionBatch)
+def calculate_tag_distribution_detail(sender, instance: TagDistributionBatch, **kwargs):
+    """
+    calculate distribution & remaining distributed tags
+    """
+
+    if getattr(instance, 'flag', False):
+        return
+
+    tag_dist_batch = instance
+    parent = tag_dist_batch.parent
+    if parent:
+        # parent.total_distributed_tag_count += tag_dist_batch.total_tag_count
+        parent.remaining_tag_count = 20
+        print(parent.remaining_tag_count)
+        parent.save(update_fields=['remaining_tag_count'])
+
+    tag_dist_batch.remaining_tag_count = tag_dist_batch.total_tag_count
+    instance.flag = True
+    tag_dist_batch.save(update_fields=['remaining_tag_count'])
+
+# @receiver(m2m_changed, sender=TagDistribution.tag.through)
+# def on_tags_added_to_distribution(sender, instance, action, pk_set, **kwargs):
+#     if action != 'post_add':
+#         return
+#
+#     if not pk_set:
+#         return
+#
+#     with transaction.atomic():
+#
+#         Tag.objects.filter(
+#             id__in=pk_set
+#         ).update(
+#             status='R',
+#             organization=instance.assigned_org
+#         )
+#
+#         total = instance.tag.count()
+#
+#         instance.total_tag_count = total
+#         instance.distributed_number = total - instance.remaining_number
+#         instance.remaining_number = total - instance.distributed_number
+#         instance.save(update_fields=[
+#             'total_tag_count',
+#             'distributed_number',
+#             'remaining_number'
+#         ])
+#
+#         if instance.batch:
+#             batch = instance.batch
+#
+#             distributed_tags = Tag.objects.filter(
+#                 batches=batch,
+#                 status__in=['R', 'A']
+#             ).count()
+#
+#             total_tags = batch.tag.count()
+#
+#             batch.total_distributed_tags = distributed_tags
+#             batch.total_remaining_tags = total_tags - distributed_tags
+#             batch.status = (
+#                 'distributed'
+#                 if batch.total_remaining_tags == 0
+#                 else 'created'
+#             )
+#
+#             batch.save(update_fields=[
+#                 'total_distributed_tags',
+#                 'total_remaining_tags',
+#                 'status'
+#             ])
+#
+#
+# @receiver(m2m_changed, sender=TagDistribution.tag.through)
+# def on_tags_removed_from_distribution(sender, instance, action, pk_set, **kwargs):
+#     if action not in ['post_remove', 'post_clear']:
+#         return
+#
+#     if action == 'post_clear':
+#         pk_set = list(instance.tag.values_list('id', flat=True))
+#
+#     if not pk_set:
+#         return
+#
+#     with transaction.atomic():
+#
+#         Tag.objects.filter(id__in=pk_set).update(
+#             status='R',
+#             organization=instance.assigner_org
+#         )
+#
+#         total = instance.tag.count()
+#         instance.total_tag_count = total
+#         instance.distributed_number = total
+#         instance.remaining_number = 0
+#         instance.save(update_fields=[
+#             'total_tag_count',
+#             'distributed_number',
+#             'remaining_number'
+#         ])
+#
+#         if instance.batch:
+#             batch = instance.batch
+#             distributed_tags = Tag.objects.filter(
+#                 batches=batch,
+#                 status__in=['R', 'A']
+#             ).count()
+#             total_tags = batch.tag.count()
+#             batch.total_distributed_tags = distributed_tags
+#             batch.total_remaining_tags = total_tags - distributed_tags
+#             batch.status = 'distributed' if batch.total_remaining_tags == 0 else 'created'
+#             batch.save(update_fields=[
+#                 'total_distributed_tags',
+#                 'total_remaining_tags',
+#                 'status'
+#             ])
+#
+#         for dist_batch in instance.tag_distribution_batch.all():
+#             total_dist = dist_batch.distributions.aggregate(
+#                 total=Count('tag')
+#             ).get('total', 0)
+#             dist_batch.total_distributed_tag_count = total_dist
+#             dist_batch.remaining_tag_count = dist_batch.total_tag_count - total_dist
+#             dist_batch.is_closed = dist_batch.remaining_tag_count == 0
+#             dist_batch.save(update_fields=[
+#                 'total_distributed_tag_count',
+#                 'remaining_tag_count',
+#                 'is_closed'
+#             ])

apps/tag/web/api/v1/api.py

@@ -16,6 +16,7 @@ from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin
 from apps.tag import exceptions as tag_exceptions
 from apps.tag import models as tag_models
 from apps.tag.models import TagBatch
+from apps.tag.services.tag_batch_service import TagBatchService
 from apps.tag.services.tag_distribution_services import TagDistributionService
 from apps.tag.services.tag_services import TagService
 from common.helpers import get_organization_by_user
@@ -34,6 +35,7 @@ class TagViewSet(BaseViewSet, TagService, SoftDeleteMixin, DynamicSearchMixin, v
     filter_backends = [SearchFilter]
     search_fields = [
         'serial',
+        'status',
         'tag_code',
         'organization__name',
         'organization__type__key',
@@ -69,7 +71,6 @@ class TagViewSet(BaseViewSet, TagService, SoftDeleteMixin, DynamicSearchMixin, v
 
         org = get_organization_by_user(request.user)  # noqa
         serial_start_range, serial_end_range = request.data.pop('serial_range')  # serial_range is like [500, 550]
-        print(serial_start_range, serial_end_range)
         data = request.data.copy()
 
         # create tag & batch
@@ -127,7 +128,7 @@ class TagViewSet(BaseViewSet, TagService, SoftDeleteMixin, DynamicSearchMixin, v
         """
         get tags by batch id
         """
-        tags = self.queryset.filter(tags__id=pk)
+        tags = self.queryset.filter(batches__id=pk)
 
         page = self.paginate_queryset(tags)
         if page is not None:  # noqa
@@ -305,7 +306,7 @@ class AllocatedTagsViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
     serializer_class = AllocatedTagsSerializer
 
 
-class TagBatchViewSet(BaseViewSet, SoftDeleteMixin, DynamicSearchMixin, viewsets.ModelViewSet):
+class TagBatchViewSet(BaseViewSet, SoftDeleteMixin, DynamicSearchMixin, TagBatchService, viewsets.ModelViewSet):
     queryset = TagBatch.objects.all()
     serializer_class = TagBatchSerializer
     filter_backends = [SearchFilter]
@@ -323,6 +324,11 @@ class TagBatchViewSet(BaseViewSet, SoftDeleteMixin, DynamicSearchMixin, viewsets
 
         queryset = self.get_queryset(visibility_by_org_scope=True).order_by('-create_date')
 
+        params = self.request.query_params  # noqa
+
+        if params.get('species_code'):
+            queryset = queryset.filter(species_code=int(params.get('species_code')))
+
         # filter queryset
         queryset = self.filter_query(self.filter_queryset(queryset))
 
@@ -332,6 +338,44 @@ class TagBatchViewSet(BaseViewSet, SoftDeleteMixin, DynamicSearchMixin, viewsets
             return self.get_paginated_response(serializer.data)
         return Response(self.serializer_class(queryset).data)
 
+    @action(
+        methods=['get'],
+        detail=False,
+        url_name='main_dashboard',
+        url_path='main_dashboard',
+        name='main_dashboard',
+    )
+    def main_dashboard(self, request):
+        """
+        dashboard of tag batches main page
+        """
+        org = get_organization_by_user(request.user)
+
+        dashboard_data = self.tag_batch_main_dashboard(org=org)
+
+        return Response(dashboard_data, status=status.HTTP_200_OK)
+
+    @action(
+        methods=['get'],
+        detail=True,
+        url_name='inner_dashboard',
+        url_path='inner_dashboard',
+        name='inner_dashboard',
+    )
+    def inner_dashboard(self, request, pk=None):
+        """
+        dashboard of tag batches inner page by id
+        """
+
+        org = get_organization_by_user(request.user)
+
+        dashboard_data = self.tag_batch_main_dashboard(
+            org=org,
+            batch=self.queryset.filter(id=self.get_object().id)
+        )
+
+        return Response(dashboard_data, status=status.HTTP_200_OK)
+
     def destroy(self, request, pk=None, *args, **kwargs):
         """
         soft delete batch with tag items
@@ -384,7 +428,7 @@ class TagDistributionViewSet(
         org = get_organization_by_user(request.user)
         data = request.data.copy()
 
-        distribution_data = self.create_distribution(
+        distribution_data = self.create_distribution_from_batch(
             org=org,
             data=data
         )
@@ -401,7 +445,57 @@ class TagDistributionViewSet(
         data = request.data.copy()
         dist_batch = tag_models.TagDistributionBatch.objects.get(id=pk)
 
-        distribution_data = self.edit_distribution(org=org, data=data, dist_batch=dist_batch)
+        distribution_data = self.edit_distribution_from_batch(org=org, data=data, dist_batch=dist_batch)
+
+        serializer = self.serializer_class(distribution_data.get('tag_distributions'), many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    @action(
+        methods=['post'],
+        detail=True,
+        url_path='distribute_distribution',
+        url_name='distribute_distribution',
+        name='distribute_distribution',
+    )
+    def create_distribute_from_distribution(self, request, pk=None):
+        """
+        distribute from a tag distribution
+        """
+
+        data = request.data.copy()
+        org = get_organization_by_user(request.user)
+        dist_batch = tag_models.TagDistributionBatch.objects.get(id=pk)
+
+        distribution_data = self.create_distribution_from_distribution(
+            org=org,
+            tag_batch=dist_batch,
+            data=data
+        )
+
+        serializer = self.serializer_class(distribution_data.get('tag_distributions'), many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    @action(
+        methods=['put'],
+        detail=True,
+        url_path='distribute_distribution',
+        url_name='distribute_distribution',
+        name='distribute_distribution',
+    )
+    def update_distribute_from_distribution(self, request, pk=None):
+        """
+        update created distribution from distribution
+        """
+
+        data = request.data.copy()
+        org = get_organization_by_user(request.user)
+        dist_batch = tag_models.TagDistributionBatch.objects.get(id=pk)
+
+        distribution_data = self.edit_distribution_from_distribution(
+            org=org,
+            tag_batch=dist_batch,
+            data=data
+        )
 
         serializer = self.serializer_class(distribution_data.get('tag_distributions'), many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -495,6 +589,15 @@ class TagDistributionBatchViewSet(
             return self.get_paginated_response(serializer.data)
         return Response(self.serializer_class(queryset).data)
 
+    def retrieve(self, request, pk=None, *args, **kwargs):
+        """
+        detail of distribution batch
+        """
+
+        distribution_batch = self.get_object()
+        serializer = self.serializer_class(distribution_batch)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
     @action(
         methods=['post'],
         detail=True,

apps/tag/web/api/v1/serializers.py

@@ -205,6 +205,8 @@ class TagDistributionBatchSerializer(serializers.ModelSerializer):
             'batch_identity': dist.batch.batch_identity if dist.batch else None,
             'species_code': dist.species_code,
             'distributed_number': dist.distributed_number,
+            'total_tag_count': dist.total_tag_count,
+            'remaining_number': dist.remaining_number,
             'serial_from': dist.batch.serial_from if dist.batch else None,
             'serial_to': dist.batch.serial_to if dist.batch else None,
         } for dist in instance.distributions.all()]

apps/warehouse/services/transaction_dashboard_service.py

@@ -12,7 +12,14 @@ from apps.warehouse.models import InventoryQuotaSaleTransaction, InventoryQuotaS
 class TransactionDashboardService:
 
     @staticmethod
-    def get_dashboard(org: Organization, start_date: str = None, end_date: str = None, status: str = None):
+    def get_dashboard(
+            org: Organization,
+            free_visibility_tr_objects=None,
+            free_visibility_tr_item_objects=None,
+            start_date: str = None,
+            end_date: str = None,
+            status: str = None
+    ):
 
         orgs_child = get_all_org_child(org=org)
         orgs_child.append(org)
@@ -23,13 +30,18 @@ class TransactionDashboardService:
             items = InventoryQuotaSaleItem.objects.all().select_related("gov_product", "free_product")
 
         else:
-            transactions = InventoryQuotaSaleTransaction.objects.filter(
+            if free_visibility_tr_objects:
-                seller_organization__in=orgs_child
+                transactions = free_visibility_tr_objects
-            )
+                items = InventoryQuotaSaleItem.objects.filter(
-
+                    transaction__in=transactions
-            items = InventoryQuotaSaleItem.objects.filter(
+                ).select_related("gov_product", "free_product")
-                transaction__seller_organization__in=orgs_child
+            else:
-            ).select_related("gov_product", "free_product")
+                transactions = InventoryQuotaSaleTransaction.objects.filter(
+                    seller_organization__in=orgs_child
+                )
+                items = InventoryQuotaSaleItem.objects.filter(
+                    transaction__seller_organization__in=orgs_child
+                ).select_related("gov_product", "free_product")
 
         # filter queryset (transactions & items) by date
         if start_date and end_date:

apps/warehouse/web/api/v1/api.py

@@ -280,13 +280,31 @@ class InventoryQuotaSaleTransactionViewSet(
         transaction_status = query_param.get('status') if 'status' in query_param.keys() else None
 
         org = get_organization_by_user(request.user)
-        # filer by date & transaction status
+        if org.free_visibility_by_scope:
-        transaction_dashboard_data = self.get_dashboard(
+
-            org,
+            tr_objects = self.get_queryset(visibility_by_org_scope=True)
-            start_date=start_date,
+
-            end_date=end_date,
+            tr_item_view = InventoryQuotaSaleItemViewSet()
-            status=transaction_status
+            tr_item_view.request = request
-        )
+            tr_item_view.kwargs = {'pk': None}
+            tr_item_objects = tr_item_view.get_queryset(visibility_by_org_scope=True)
+
+            transaction_dashboard_data = self.get_dashboard(
+                org,
+                free_visibility_tr_objects=tr_objects,
+                free_visibility_tr_item_objects=tr_item_objects,
+                start_date=start_date,
+                end_date=end_date,
+                status=transaction_status,
+            )
+        else:
+            # filer by date & transaction status
+            transaction_dashboard_data = self.get_dashboard(
+                org,
+                start_date=start_date,
+                end_date=end_date,
+                status=transaction_status,
+            )
 
         return Response(transaction_dashboard_data, status=status.HTTP_200_OK)