push dam project on mnpc new git repo

.env.local

@@ -7,7 +7,7 @@ ENV_NAME=DEV
 # Database secrets
 DB_HOST=31.7.78.133
 DB_PORT=14352
-DB_NAME=Production
+DB_NAME=Development
 DB_USERNAME=postgres
 DB_PASSWORD=pfLIVXupbDetvFMt2gUvxLXUL9b4HIOHaPcKXsBEZ1i8zl0iLUjmhUfXlGfJKcTV
 

apps/authentication/migrations/0058_organization_ownership_code.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0 on 2026-01-05 07:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0057_organization_purchase_policy'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organization',
+            name='ownership_code',
+            field=models.IntegerField(default=0),
+        ),
+    ]

apps/authentication/migrations/0059_remove_organization_ownership_code.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.0 on 2026-01-05 07:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0058_organization_ownership_code'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='organization',
+            name='ownership_code',
+        ),
+    ]

apps/authentication/migrations/0060_organization_ownership_code.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0 on 2026-01-05 07:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0059_remove_organization_ownership_code'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organization',
+            name='ownership_code',
+            field=models.IntegerField(default=0),
+        ),
+    ]

apps/authentication/models.py

@@ -147,6 +147,7 @@ class Organization(BaseModel):
     has_pos = models.BooleanField(default=False)
     additional_data = models.JSONField(default=dict)
     service_area = models.ManyToManyField(City, related_name='service_area')
+    ownership_code = models.IntegerField(default=0)
 
     PURCHASE_POLICIES = (
         ('INTERNAL_ONLY', 'Internal Only'),

apps/authorization/api/v1/serializers.py

@@ -156,7 +156,11 @@ class UserRelationSerializer(serializers.ModelSerializer):
             if instance.user:
                 representation['user'] = auth_serializer.UserSerializer(instance.user).data
             if instance.organization:
-                representation['organization'] = {"id": instance.organization.id, "name": instance.organization.name}
+                representation['organization'] = {
+                    "id": instance.organization.id,
+                    "name": instance.organization.name,
+                    "ownership_code": instance.organization.ownership_code
+                }
             if instance.role:
                 representation['role'] = {
                     "id": instance.role.id, "role_name": instance.role.role_name, 'type': {

apps/core/visibility_registry.py

@@ -10,6 +10,7 @@ VISIBILITY_MAP = {
     'device': 'assignment__client__organization',
     'rancher': 'organization',
     'rancherorganizationlink': 'organization',  # noqa
+    'tagbatch': 'organization',  # noqa
 
     # 'deviceactivationcode': 'organization',
     # 'deviceversion': 'organization',

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

@@ -30,7 +30,6 @@ class HerdSerializer(serializers.ModelSerializer):
         if isinstance(instance, Herd):
             if instance.owner:
                 representation['owner'] = instance.owner.id
-            representation['cooperative'] = OrganizationSerializer(instance.cooperative).data
             representation['province'] = ProvinceSerializer(instance.province).data
             representation['city'] = CitySerializer(instance.city).data
             if instance.contractor:

apps/livestock/models.py

@@ -95,7 +95,7 @@ class LiveStock(BaseModel):
     archive = models.BooleanField(default=False)
 
     def __str__(self):
-        return f'{self.type.name}-{self.species.name}'
+        return f"{self.type.name if self.type else ''}-{self.species.name if self.species else ''}"
 
     def save(self, *args, **kwargs):
         return super(LiveStock, self).save(*args, **kwargs)

apps/tag/exceptions.py

@@ -1,8 +1,25 @@
-from rest_framework.exceptions import APIException
 from rest_framework import status
+from rest_framework.exceptions import APIException
 
 
 class SpeciesNumberCheckException(APIException):
     status_code = status.HTTP_403_FORBIDDEN
     default_detail = 'Entered species number is more than user free tags'
     default_code = 'more than free tags'
+
+
+class TagException(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)

apps/tag/migrations/0027_alter_tag_country_code_alter_tag_ownership_code_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.0 on 2026-01-05 07:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tag', '0026_temporarytags_sync_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tag',
+            name='country_code',
+            field=models.IntegerField(default=364, help_text='it is static 364, iran country code'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='ownership_code',
+            field=models.IntegerField(default=0, help_text='ownership code of organizations like: 51, 52, etc'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='serial',
+            field=models.CharField(help_text='7 digit number as serial on tag code', max_length=8),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='species_code',
+            field=models.IntegerField(default=0, help_text='code of livestock type like: 1->sheep'),
+        ),
+        migrations.AlterField(
+            model_name='tag',
+            name='static_code',
+            field=models.IntegerField(default=0, help_text='always a static number'),
+        ),
+    ]

apps/tag/migrations/0028_tagbatch.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.0 on 2026-01-07 07:13
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('authentication', '0060_organization_ownership_code'),
+        ('tag', '0027_alter_tag_country_code_alter_tag_ownership_code_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+
+    ]

apps/tag/migrations/0029_alter_tag_tag_code_tagbatch.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.0 on 2026-01-07 11:55
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0060_organization_ownership_code'),
+        ('tag', '0028_tagbatch'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tag',
+            name='tag_code',
+            field=models.CharField(max_length=20, null=True),
+        ),
+        migrations.CreateModel(
+            name='TagBatch',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_date', models.DateTimeField(auto_now_add=True)),
+                ('modify_date', models.DateTimeField(auto_now=True)),
+                ('creator_info', models.CharField(max_length=100, null=True)),
+                ('modifier_info', models.CharField(max_length=100, null=True)),
+                ('trash', models.BooleanField(default=False)),
+                ('request_number', models.CharField(default='0', max_length=50, null=True)),
+                ('species_code', models.IntegerField(default=0)),
+                ('serial_from', models.PositiveBigIntegerField(default=0)),
+                ('serial_to', models.PositiveBigIntegerField(default=0)),
+                ('status', models.CharField(choices=[('created', 'CREATED'), ('distributed', 'DISTRIBUTED')], default='created', max_length=20, null=True)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_createddby', to=settings.AUTH_USER_MODEL)),
+                ('modified_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_modifiedby', to=settings.AUTH_USER_MODEL)),
+                ('organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tag_batches', to='authentication.organization')),
+                ('tag', models.ManyToManyField(related_name='tags', to='tag.tag')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

apps/tag/models.py

@@ -1,22 +1,21 @@
 import random
 
-from crum import get_current_user
 from django.db import models
 from jdatetime import datetime
 
 from apps.authentication import models as auth_models
-from apps.authorization import models as authoriz_models
+from apps.authentication.models import Organization
 from apps.core.models import BaseModel
 from apps.tag.tools import tag_code_serial_scanning
 
 
 class Tag(BaseModel):
-    country_code = models.IntegerField(default=364)
-    static_code = models.IntegerField(default=0)
-    ownership_code = models.IntegerField(default=0)
-    species_code = models.IntegerField(default=0)
-    serial = models.CharField(max_length=8)
-    tag_code = models.CharField(max_length=20, unique=True, null=True)
+    country_code = models.IntegerField(default=364, help_text='it is static 364, iran country code')
+    static_code = models.IntegerField(default=0, help_text='always a static number')
+    ownership_code = models.IntegerField(default=0, help_text='ownership code of organizations like: 51, 52, etc')
+    species_code = models.IntegerField(default=0, help_text='code of livestock type like: 1->sheep')
+    serial = models.CharField(max_length=8, help_text='7 digit number as serial on tag code')
+    tag_code = models.CharField(max_length=20, null=True)
     organization = models.ForeignKey(
         auth_models.Organization,
         on_delete=models.CASCADE,
@@ -25,7 +24,8 @@ class Tag(BaseModel):
     )
     status_choices = (
         ('F', 'Free'),
-        ('A', 'Assigned')
+        ('R', 'Reserved'),
+        ('A', 'Assigned'),
     )
     status = models.CharField(max_length=20, default="F")
 
@@ -43,19 +43,69 @@ class Tag(BaseModel):
                             f"{self.ownership_code}" \
                             f"{self.species_code}" \
                             f"{self.serial}"
-        if not self.organization:
-            # set user organization for tag
-            user = get_current_user()
-            self.organization = (
-                authoriz_models.UserRelations.objects.select_related(
-                    'organization'
-                ).get(
-                    user=user
-                )).organization
-
         super(Tag, self).save(*args, **kwargs)
 
 
+class TagBatch(BaseModel):
+    organization = models.ForeignKey(
+        Organization,
+        on_delete=models.CASCADE,
+        related_name='tag_batches',
+        null=True
+    )
+    request_number = models.CharField(
+        max_length=50,
+        default="0",
+        null=True
+    )
+
+    tag = models.ManyToManyField(Tag, related_name='tags')
+    species_code = models.IntegerField(default=0)
+    serial_from = models.PositiveBigIntegerField(default=0)
+    serial_to = models.PositiveBigIntegerField(default=0)
+
+    status = models.CharField(
+        max_length=20,
+        choices=[
+            ('created', 'CREATED'),
+            ('distributed', 'DISTRIBUTED'),
+        ],
+        null=True,
+        default='created'
+    )
+    description = models.TextField(null=True, blank=True)
+
+    def __str__(self):
+        return f'{self.id}-{self.request_number}-{self.organization.name}'
+
+    def save(self, *args, **kwargs):
+        return super(TagBatch, self).save(*args, **kwargs)
+
+
+class TagDistribution(BaseModel):
+    batch = models.ForeignKey(
+        TagBatch,
+        on_delete=models.CASCADE,
+        related_name='distributions',
+        null=True
+    )
+    tag = models.ManyToManyField(Tag, related_name='distributions')
+    organization = models.ForeignKey(
+        Organization,
+        on_delete=models.CASCADE,
+        related_name='distributions',
+        null=True
+    )
+    species_code = models.IntegerField(default=0)
+    distributed_number = models.IntegerField(default=0)
+
+    def __str__(self):
+        return f'{self.id}-{self.distributed_number}-{self.organization.name}'
+
+    def save(self, *args, **kwargs):
+        return super(TagDistribution, self).save(*args, **kwargs)
+
+
 class TagAssignment(BaseModel):
     organization = models.ForeignKey(
         auth_models.Organization,

apps/tag/services/tag_services.py

@@ -0,0 +1,161 @@
+from django.db.models import Q
+from django.db.models.aggregates import Count
+
+from apps.authentication.models import Organization
+from apps.livestock.web.api.v1.serializers import LiveStockSerializer
+from apps.tag.exceptions import TagException
+from apps.tag.models import Tag, TagBatch
+from apps.tag.tools import tag_code_serial_scanning
+
+
+class TagService:
+    """
+    Different Services of Livestock Tags
+    """
+
+    def tag_code_compelition(self, tag_data: dict, serial, ownership_code, organization):
+        """
+        complete data of tag
+        """
+
+        tag_data.update({
+            'serial': serial,
+            'ownership_code': ownership_code,
+            'organization': organization,
+            'tag_code': f"{tag_data.get('country_code')}"
+                        f"{tag_data.get('static_code')}"
+                        f"{ownership_code}"
+                        f"{tag_data.get('species_code')}"
+                        f"{tag_code_serial_scanning(str(serial))}"
+        })
+
+        return tag_data
+
+    def create_tag(
+            self,
+            serial_start_range: int = None,
+            serial_end_range: int = None,
+            org: Organization = None,
+            data: dict = None
+    ):
+        """
+        create livestock tag with batch / batch item
+        """
+
+        # create tag batch
+        request_number = (serial_end_range - serial_start_range) + 1
+        batch = TagBatch.objects.create(
+            organization=org,
+            request_number=request_number if request_number > 0 else 1,
+            species_code=data.get('species_code'),
+            serial_from=serial_start_range,
+            serial_to=serial_end_range,
+            status='created',
+        )
+
+        tag_list = []
+        while serial_start_range <= serial_end_range:
+            tag_data = self.tag_code_compelition(
+                tag_data=data,
+                serial=serial_start_range,
+                organization=org,
+                ownership_code=org.ownership_code
+            )
+            tag_list.append(Tag(**tag_data))
+
+            if Tag.objects.filter(serial=serial_start_range, species_code=data.get('species_code')).exists():
+                raise TagException(f' پلاک با مشخصات مورد نظر {serial_start_range} وجود دارد ', status_code=403)  # noqa
+
+            serial_start_range += 1
+
+        created_tags = Tag.objects.bulk_create(tag_list)
+        batch.tag.add(*created_tags)
+
+        return created_tags
+
+    def update_batch_tag(
+            self,
+            serial_start_range: int = None,
+            serial_end_range: int = None,
+            org: Organization = None,
+            data: dict = None,
+            batch_id: int = None,
+    ):
+        """
+        update livestock tag with batch / batch item
+        """
+
+        # update tag batch
+        request_number = (serial_end_range - serial_start_range) + 1
+        batch = TagBatch.objects.get(id=batch_id)
+        batch.request_number = request_number
+        batch.species_code = data.get('species_code')
+        batch.serial_from = serial_start_range
+        batch.serial_to = serial_end_range
+        batch.save(update_fields=['request_number', 'species_code', 'serial_from', 'serial_to'])
+
+        # recreate tags for batch
+        tag_list = []
+        while serial_start_range <= serial_end_range:
+            tag_data = self.tag_code_compelition(
+                tag_data=data,
+                serial=serial_start_range,
+                organization=org,
+                ownership_code=org.ownership_code
+            )
+            tag_list.append(Tag(**tag_data))
+
+            if Tag.objects.filter(
+                    serial=serial_start_range,
+                    species_code=data.get('species_code')
+            ).exists() and not batch.tag.filter(
+                serial=serial_start_range
+            ).exists():
+                raise TagException(f' پلاک با مشخصات مورد نظر {serial_start_range} وجود دارد ', status_code=403)  # noqa
+
+            serial_start_range += 1
+
+        created_tags = Tag.objects.bulk_create(tag_list)
+        # hard delete of created tags for batch
+        batch.tag.all().delete()
+        batch.tag.add(*created_tags)
+
+        return created_tags
+
+    def tag_detail(self, by_id: int = None, by_queryset: bool = False):
+        """
+        get detail of a tag like: livestock, rancher, herd, etc
+        """
+
+        if by_id:
+            tag = Tag.objects.prefetch_related(
+                'livestock_tag'
+            ).get(id=by_id)
+
+            livestock = tag.livestock_tag.first()
+
+            result = LiveStockSerializer(livestock).data
+        else:
+            result = dict()
+
+        return result
+
+    def tag_dashboard(self):
+        """
+        dashboard of tags page
+        """
+
+        queryset = Tag.objects.all()
+        response = queryset.aggregate(
+            count=Count('id'),
+            cow_count=Count('id', filter=Q(species_code=1)),
+            buffalo_count=Count('id', filter=Q(species_code=2)),
+            camel_count=Count('id', filter=Q(species_code=3)),
+            sheep_count=Count('id', filter=Q(species_code=4)),
+            goat_count=Count('id', filter=Q(species_code=5)),
+            free_count=Count('id', filter=Q(status='F')),
+            assign_count=Count('id', filter=Q(status='A')),
+
+        )
+
+        return response

apps/tag/tools.py

@@ -6,15 +6,20 @@ def tag_code_serial_scanning(serial: str = None) -> typing.AnyStr:
     serial code is 8 number serial,
     set 4 first numbers to 0
     """
-    if len(str(serial)) == 4:
+    if len(str(serial)) == 1:
+        scanned_serial = "000000" + str(serial)
+    if len(str(serial)) == 2:
+        scanned_serial = "00000" + str(serial)
+    if len(str(serial)) == 3:
         scanned_serial = "0000" + str(serial)
-    if len(str(serial)) == 5:
+    if len(str(serial)) == 4:
         scanned_serial = "000" + str(serial)
-    if len(str(serial)) == 6:
+    if len(str(serial)) == 5:
         scanned_serial = "00" + str(serial)
-    if len(str(serial)) == 7:
+    if len(str(serial)) == 6:
         scanned_serial = "0" + str(serial)
+    if len(str(serial)) == 7:
+        scanned_serial = str(serial)
     else:
         pass
     return scanned_serial
-

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

@@ -1,64 +1,135 @@
-from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin
-from rest_framework import viewsets
-from apps.tag import models as tag_models
+import typing
+
+from django.db import transaction
 from rest_framework import status
+from rest_framework import viewsets
+from rest_framework.decorators import action
+from rest_framework.exceptions import APIException
+from rest_framework.filters import SearchFilter
 from rest_framework.response import Response
+
+from apps.authentication.api.v1.api import GeneralOTPViewSet
+from apps.authorization import models as authorize_models
+from apps.core.api import BaseViewSet
+from apps.core.mixins.search_mixin import DynamicSearchMixin
+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_services import TagService
+from common.helpers import get_organization_by_user
+from common.liara_tools import upload_to_liara
 from .serializers import (
     TagSerializer,
     TagAssignmentSerializer,
-    AllocatedTagsSerializer
+    AllocatedTagsSerializer, TagBatchSerializer
 )
-from rest_framework.decorators import action
-from django.db import transaction
-from rest_framework.exceptions import APIException
-from apps.tag import permissions as tag_permissions
-from apps.authorization import models as authorize_models
-from apps.authentication.api.v1.api import GeneralOTPViewSet
-from apps.tag.tools import tag_code_serial_scanning
-from apps.tag import exceptions as tag_exceptions
-from common.helpers import detect_file_extension
-from common.liara_tools import upload_to_liara
-from django.db import IntegrityError
-import typing
 
 
-def trash(queryset, pk):
-    """ sent object to trash """
-    obj = queryset.get(id=pk)
-    obj.trash = True
-    obj.save()
-
-
-def delete(queryset, pk):
-    """ full delete object """
-    obj = queryset.get(id=pk)
-    obj.delete()
-
-
-class TagViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
+class TagViewSet(BaseViewSet, TagService, SoftDeleteMixin, DynamicSearchMixin, viewsets.ModelViewSet):
     """ Tag View Set """
     queryset = tag_models.Tag.objects.all()
     serializer_class = TagSerializer
+    filter_backends = [SearchFilter]
+    search_fields = [
+        'serial',
+        'tag_code',
+        'organization__name',
+        'organization__type__key',
+        'livestock_tag__herd__rancher__ranching_farm',
+        'livestock_tag__herd__rancher__first_name',
+        'livestock_tag__herd__rancher__last_name',
+        'livestock_tag__herd__rancher__mobile',
+        'livestock_tag__herd__rancher__national_code',
+    ]
+
+    def list(self, request, *args, **kwargs):
+        """
+        list of tags with filter & search
+        """
+        param = self.request.query_params  # noqa
+        queryset = self.get_queryset(visibility_by_org_scope=True).order_by('-create_date')
+
+        if 'status' in param.keys():
+            queryset = queryset.filter(status=param.get('status', None))
+
+        # filter queryset
+        queryset = self.filter_query(queryset)
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:  # noqa
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+        return Response(self.serializer_class(queryset).data)
 
     @transaction.atomic
     def create(self, request: object, *args: list, **kwargs: dict) -> typing.Any:
         """ Create tag for livestocks """  # noqa
-        tag_objects = []
-        serial_start_range, serial_end_range = request.data['serial_range']  # serial_range is like [500, 550]
-        while serial_start_range <= serial_end_range:
-            try:
-                request.data.update({'serial': str(serial_start_range)})
-                serializer = self.serializer_class(data=request.data)
-                if serializer.is_valid(raise_exception=True):
-                    tag_objects.append(serializer.save())
-            except IntegrityError as e:  # if tag exists before
-                if 'unique constraint' in e.args[0]:
-                    return Response("tag exists", status.HTTP_406_NOT_ACCEPTABLE)
-            serial_start_range += 1
 
-        serializer = self.serializer_class(tag_objects, many=True)
+        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
+        created_tags = self.create_tag(
+            serial_start_range=serial_start_range,
+            serial_end_range=serial_end_range,
+            data=data,
+            org=org
+        )
+
+        serializer = self.serializer_class(created_tags, many=True)
         return Response(serializer.data, status.HTTP_201_CREATED)
 
+    def update(self, request, pk=None, *args, **kwargs):
+        """ update tag for livestocks """  # noqa
+
+        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]
+        data = request.data.copy()
+
+        # create tag & batch
+        created_tags = self.update_batch_tag(
+            serial_start_range=serial_start_range,
+            serial_end_range=serial_end_range,
+            data=data,
+            org=org,
+            batch_id=int(pk)
+        )
+
+        serializer = self.serializer_class(created_tags, many=True)
+        return Response(serializer.data, status.HTTP_201_CREATED)
+
+    @action(
+        methods=['get'],
+        detail=True,
+        url_path='tag_detail',
+        url_name='tag_detail',
+        name='tag_detail',
+    )
+    def get_tag_detail(self, request, pk=None):
+        """
+        show detail of a tag
+        """
+        response = self.tag_detail(by_id=pk)
+        return Response(response)
+
+    @action(
+        methods=['get'],
+        detail=False,
+        url_path='tag_dashboard',
+        url_name='tag_dashboard',
+        name='tag_dashboard'
+    )
+    def get_tag_dashboard(self, request):
+        """
+        dashboard of tags page
+        """
+
+        response = self.tag_dashboard()
+        return Response(response)
+
     @action(
         methods=['get'],
         detail=False,
@@ -77,39 +148,8 @@ class TagViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
         except APIException as e:
             return Response(e, status.HTTP_204_NO_CONTENT)
 
-    @action(
-        methods=['put'],
-        detail=True,
-        url_path='trash',
-        url_name='trash',
-        name='trash',
-    )
-    @transaction.atomic
-    def trash(self, request, pk=None):
-        """ Sent Tag to trash """
-        try:
-            trash(self.queryset, pk)
-        except APIException as e:
-            return Response(e, status.HTTP_204_NO_CONTENT)
 
-    @action(
-        methods=['post'],
-        detail=True,
-        url_name='delete',
-        url_path='delete',
-        name='delete'
-    )
-    @transaction.atomic
-    def delete(self, request, pk=None):
-        """ Full delete of Tag object """
-        try:
-            delete(self.queryset, pk)
-            return Response(status=status.HTTP_200_OK)
-        except APIException as e:
-            return Response(e, status=status.HTTP_204_NO_CONTENT)
-
-
-class TagAssignmentViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
+class TagAssignmentViewSet(BaseViewSet, SoftDeleteMixin, DynamicSearchMixin, viewsets.ModelViewSet):
     """ assignment of tags """
     queryset = tag_models.TagAssignment.objects.all()
     user_relations_queryset = authorize_models.UserRelations.objects.all()
@@ -239,69 +279,47 @@ class TagAssignmentViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
             else:
                 return Response(check_response.status_code, status=status.HTTP_403_FORBIDDEN)
 
-    @action(
-        methods=['put'],
-        detail=True,
-        url_path='trash',
-        url_name='trash',
-        name='trash',
-    )
-    @transaction.atomic
-    def trash(self, request, pk=None):
-        """ Sent TagAssigment to trash """
-        try:
-            trash(self.queryset, pk)
-        except APIException as e:
-            return Response(e, status.HTTP_204_NO_CONTENT)
-
-    @action(
-        methods=['post'],
-        detail=True,
-        url_name='delete',
-        url_path='delete',
-        name='delete'
-    )
-    @transaction.atomic
-    def delete(self, request, pk=None):
-        """ Full delete of TagAssignment object """
-        try:
-            delete(self.queryset, pk)
-            return Response(status=status.HTTP_200_OK)
-        except APIException as e:
-            return Response(e, status=status.HTTP_204_NO_CONTENT)
-
 
 class AllocatedTagsViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
     queryset = tag_models.AllocatedTags.objects.all()
     serializer_class = AllocatedTagsSerializer
 
-    @action(
-        methods=['put'],
-        detail=True,
-        url_path='trash',
-        url_name='trash',
-        name='trash',
-    )
-    @transaction.atomic
-    def trash(self, request, pk=None):
-        """ Sent AllocatedTag to trash """
-        try:
-            trash(self.queryset, pk)
-        except APIException as e:
-            return Response(e, status.HTTP_204_NO_CONTENT)
 
-    @action(
-        methods=['post'],
-        detail=True,
-        url_name='delete',
-        url_path='delete',
-        name='delete'
-    )
-    @transaction.atomic
-    def delete(self, request, pk=None):
-        """ Full delete of AllocatedTag object """
-        try:
-            delete(self.queryset, pk)
-            return Response(status=status.HTTP_200_OK)
-        except APIException as e:
-            return Response(e, status=status.HTTP_204_NO_CONTENT)
+class TagBatchViewSet(BaseViewSet, SoftDeleteMixin, DynamicSearchMixin, viewsets.ModelViewSet):
+    queryset = TagBatch.objects.all()
+    serializer_class = TagBatchSerializer
+    filter_backends = [SearchFilter]
+    search_fields = [
+        "organization__name"
+        "request_number"
+        "tag__tag_code"
+        "species_code"
+    ]
+
+    def list(self, request, *args, **kwargs):
+        """
+        list of tag batches
+        """
+
+        queryset = self.get_queryset(visibility_by_org_scope=True).order_by('-create_date')
+
+        # filter queryset
+        queryset = self.filter_query(self.filter_queryset(queryset))
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:  # noqa
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+        return Response(self.serializer_class(queryset).data)
+
+    def destroy(self, request, pk=None, *args, **kwargs):
+        """
+        soft delete batch with tag items
+        """
+
+        batch = self.get_object()
+        batch.soft_delete()
+        for tag in batch.tag.all():
+            tag.soft_delete()
+
+        return Response(status=status.HTTP_200_OK)

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

@@ -1,6 +1,9 @@
-from apps.authentication.api.v1.serializers import serializer as auth_serializers
 from rest_framework import serializers
+
+from apps.authentication.api.v1.serializers import serializer as auth_serializers
 from apps.tag import models as tag_models
+from apps.tag.exceptions import TagException
+from apps.tag.models import TagBatch
 
 
 class TagSerializer(serializers.ModelSerializer):
@@ -25,6 +28,18 @@ class TagSerializer(serializers.ModelSerializer):
             }
         }
 
+    def validate(self, attrs):
+        """
+        Some validation on tags serialization
+        """
+        species_code = attrs.get('species_code', None)
+        serial_range = attrs.get('serial_range', None)
+
+        if self.Meta.model.objects.filter(species_code=species_code, serial__in=serial_range).exists():
+            raise TagException(f'پلاک با سریال مد نظر از قبل وجود دارد', status_code=403)  # noqa
+
+        return attrs
+
     def update(self, instance, validated_data):
         """ update tag information """
 
@@ -58,7 +73,11 @@ class TagSerializer(serializers.ModelSerializer):
         """ Customize output of serializer """
         representation = super().to_representation(instance)
         if isinstance(instance, tag_models.Tag):
-            representation['organization'] = auth_serializers.OrganizationSerializer(instance.organization).data
+            if instance.organization:
+                representation['organization'] = {
+                    'name': instance.organization.name,
+                    'id': instance.organization.id
+                }
         return representation
 
 
@@ -107,3 +126,20 @@ class AllocatedTagsSerializer(serializers.ModelSerializer):
         representation['status'] = instance.status
 
         return representation
+
+
+class TagBatchSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = TagBatch
+        fields = '__all__'
+
+    def to_representation(self, instance):
+        representation = super().to_representation(instance)
+
+        representation['tag'] = [{
+            'tag_code': tag.tag_code,
+            'species_code': tag.species_code,
+            'status': tag.status
+        } for tag in instance.tag.all()]
+
+        return representation

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

@@ -1,15 +1,17 @@
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
+
 from .api import (
     TagViewSet,
     TagAssignmentViewSet,
-    AllocatedTagsViewSet
+    AllocatedTagsViewSet, TagBatchViewSet
 )
 
 router = DefaultRouter()
 router.register(r'tag', TagViewSet, basename='tag')
 router.register(r'tag_assignment', TagAssignmentViewSet, basename='tag_assignment')
 router.register(r'allocated_tag', AllocatedTagsViewSet, basename='allocated_tag')
+router.register(r'tag_batch', TagBatchViewSet, basename='tag_batch')
 
 urlpatterns = [
     path('v1/', include(router.urls))

apps/warehouse/services/excel/excel_processing.py

@@ -3,11 +3,14 @@ from io import BytesIO
 
 from django.http import HttpResponse
 from openpyxl import Workbook
+from openpyxl.styles import Font
 from rest_framework import viewsets
 from rest_framework.decorators import action
 
 from apps.authentication.services.visibility_services import apply_visibility_filter
+from apps.core.mixins.search_mixin import ExcelDynamicSearchMixin
 from apps.warehouse import models as warehouse_models
+from apps.warehouse.web.api.v1 import serializers as warehouse_serializers
 from common.helper_excel import create_header, excel_description, create_header_freez, create_value, shamsi_date, \
     convert_str_to_date
 from common.helpers import get_organization_by_user
@@ -403,10 +406,118 @@ def calculate_share_totals(items):
 #         return response
 
 
-class WareHouseExcelViewSet(viewsets.ViewSet):
-    """
-    بهینه شده: اکسل تراکنش‌ها
-    """
+class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
+    queryset = warehouse_models.InventoryEntry.objects.all()
+    serializer_class = warehouse_serializers.InventoryEntrySerializer
+    search_fields = [
+        "distribution__distribution_id",
+        "organization__name",
+        "weight",
+        "balance",
+        "lading_number",
+        "is_confirmed",
+    ]
+    date_field = "create_date"
+
+    @action(
+        methods=['get'],
+        detail=False,
+        url_path='warehouse_excel',
+        url_name='warehouse_excel',
+        name='warehouse_excel'
+    )
+    def warehouse_excel(self, request):
+        output = BytesIO()
+        workbook = Workbook()
+        worksheet = workbook.active
+        worksheet.sheet_view.rightToLeft = True
+        worksheet.insert_rows(1)
+        queryset = self.filter_query(self.queryset)
+
+        entries = queryset.filter(organization=get_organization_by_user(request.user))
+        ser_data = self.serializer_class(entries, many=True).data
+
+        excel_options = [
+            "ردیف",
+            "تاریخ ورود به انبار",
+            "شماره سهمیه",
+            "وزن",
+            "بارنامه",
+            "محل دریافت",
+            "سند",
+            "توضیحات",
+        ]
+
+        header_list = [
+            "وزن",
+
+        ]
+
+        create_header(worksheet, header_list, 5, 2, height=25, border_style='thin')
+        excel_description(worksheet, 'B1', f'ورودی به انبار', row2='C3')
+        create_header_freez(worksheet, excel_options, 1, 6, 7, height=25, width=20)
+
+        l = 6
+        m = 1
+        if ser_data:
+            for data in ser_data:
+                document = data.get('document')
+                if document:
+                    if str(document).startswith(('http://', 'https://')):
+                        document_value = f'=HYPERLINK("{document}", "دانلود")'
+                    else:
+                        full_path = f"https://yourdomain.com/{document}"
+                        document_value = f'=HYPERLINK("{full_path}", "دانلود")'
+
+                else:
+                    document_value = 'ندارد'
+                list1 = [
+                    m,
+                    str(shamsi_date(convert_str_to_date(data['create_date']), in_value=True)) if data.get(
+                        'create_date') else '',
+                    str(data[
+                            'distribution'].get('distribution')) or '-',
+                    data.get('weight') or 0,
+                    data.get('lading_number') or '-',
+                    data.get('delivery_address') or '-',
+                    document_value,
+                    data.get('notes') or '',
+                ]
+                create_value(worksheet, list1, l + 1, 1, height=23, m=m)
+                if document:
+                    worksheet.cell(row=l + 1, column=7).font = Font(color="0563C1", underline='single', bold=True)
+                m += 1
+                l += 1
+
+        weight = sum((data['weight'] or 0) for data in ser_data)
+
+        value_list = [
+            weight
+        ]
+
+        create_value(worksheet, value_list, 3, 5, border_style='thin')
+
+        list2 = [
+            'مجموع==>',
+            '',
+            '',
+            weight,
+            '',
+            '',
+            '',
+            ''
+        ]
+        create_value(worksheet, list2, l + 3, 1, color='gray', height=23)
+        workbook.save(output)
+        output.seek(0)
+
+        response = HttpResponse(
+            content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+        response[
+            'Content-Disposition'] = f'attachment; filename="ورودی به انبار.xlsx"'.encode(
+            'utf-8')
+        response.write(output.getvalue())
+        return response
 
     @action(
         methods=['get'],
@@ -415,6 +526,14 @@ class WareHouseExcelViewSet(viewsets.ViewSet):
         url_name='inventory_sale_transaction_excel',
     )
     def inventory_sale_transaction_excel(self, request):
+        self.search_fields = [
+            'rancher_fullname', 'rancher_mobile', 'pos_device__device_identity',
+            'pos_device__acceptor', 'pos_device__terminal', 'pos_device__serial',
+            'transaction_id', 'seller_organization__name',
+            'quota_distribution__distribution_id', 'weight', 'delivery_address', 'transaction_price',
+            'price_paid', 'price_type', 'product_type', 'transactions_number', 'transaction_status',
+            'transaction_status_code', 'ref_num', 'terminal', 'payer_cart', 'transaction_date',
+        ]
         output = BytesIO()
         workbook = Workbook()
         worksheet = workbook.active
@@ -425,13 +544,13 @@ class WareHouseExcelViewSet(viewsets.ViewSet):
         queryset = warehouse_models.InventoryQuotaSaleTransaction.objects.all()
         queryset = apply_visibility_filter(queryset, org)
 
-        # فیلتر وضعیت
         status_param = request.query_params.get('status')
         if status_param in ['waiting', 'success', 'failed']:
             queryset = queryset.filter(transaction_status=status_param)
         queryset = queryset.order_by('-create_date')
 
-        # فقط فیلدهای مورد نیاز مستقیم از DB
+        queryset = self.filter_query(queryset).order_by('create_date')
+
         qs_values = queryset.values(
             'id',
             'transaction_id',
@@ -447,7 +566,6 @@ class WareHouseExcelViewSet(viewsets.ViewSet):
 
         transaction_ids = [t['id'] for t in qs_values]
 
-        # همه آیتم‌ها برای aggregate share totals
         items_qs = warehouse_models.InventoryQuotaSaleItem.objects.filter(
             transaction_id__in=transaction_ids
         ).values(
@@ -459,7 +577,6 @@ class WareHouseExcelViewSet(viewsets.ViewSet):
             'unit'
         )
 
-        # Aggregate share totals per transaction
         transaction_shares_map = defaultdict(list)
         share_names_set = set()
         for item in items_qs:
@@ -469,7 +586,6 @@ class WareHouseExcelViewSet(viewsets.ViewSet):
 
         share_names = list(share_names_set)
 
-        # تنظیمات اکسل
         excel_options = [
             "ردیف",
             "تعاونی دامدار",
@@ -520,19 +636,16 @@ class WareHouseExcelViewSet(viewsets.ViewSet):
             t_items = transaction_shares_map.get(t['id'], [])
             products_str = '، '.join([i['name'] for i in t_items]) if t_items else '-'
 
-            # جمع share totals هر تراکنش
             share_values = []
             for share_name in share_names:
-                # print(t_items, '\n', share_name)
                 for i in t_items:
                     share_total = sum(
                         share['price'] for share in i['item_share'] if share['name'] == share_name)
                     share_values.append(share_total)
                     share_column_totals[share_name] += share_total
 
-            # جمع کل
             total_price += t['price_paid'] or 0
-            total_weight += sum(i['unit_price'] or 0 for i in t_items)  # یا وزن واقعی اگر موجود باشه
+            total_weight += sum(i['unit_price'] or 0 for i in t_items)
             all_weight += total_weight
 
             list1 = [
@@ -545,9 +658,9 @@ class WareHouseExcelViewSet(viewsets.ViewSet):
                 str(shamsi_date(t['transaction_date'], in_value=True)) if t.get('transaction_date') else '',
                 products_str,
                 t.get('transaction_id', '-'),
-                '-',  # شماره کارت اگر موجود باشه
+                '-',  # card
                 t.get('price_paid', 0),
-                f'{total_weight}کیلوگرم',  # ماهیت وزن
+                f'{total_weight}کیلوگرم',
                 TRANSACTION_STATUS_MAP.get(t.get('transaction_status'), '-'),
             ]
             list1.extend(share_values)