add new fields to rancher

apps/herd/migrations/0016_rancher_activity_rancher_heavy_livestock_number_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.0 on 2025-08-19 05:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('herd', '0015_alter_herd_postal'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rancher',
+            name='activity',
+            field=models.CharField(choices=[('I', 'Industrial'), ('V', 'Village'), ('N', 'Nomadic')], max_length=1, null=True),
+        ),
+        migrations.AddField(
+            model_name='rancher',
+            name='heavy_livestock_number',
+            field=models.BigIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='rancher',
+            name='light_livestock_number',
+            field=models.BigIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='rancher',
+            name='rancher_type',
+            field=models.CharField(choices=[('N', 'Natural'), ('L', 'Legal')], default='N', help_text='N is natural & L is legal', max_length=1),
+        ),
+        migrations.AddField(
+            model_name='rancher',
+            name='union_code',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name='rancher',
+            name='union_name',
+            field=models.CharField(max_length=50, null=True),
+        ),
+    ]

apps/herd/models.py

@@ -82,6 +82,30 @@ class Herd(BaseModel):
 
 class Rancher(BaseModel):
     ranching_farm = models.CharField(max_length=150, null=True)
+    union_name = models.CharField(max_length=50, null=True)
+    union_code = models.CharField(max_length=50, null=True)
+    activity_types = (
+        ("I", "Industrial"),
+        ("V", "Village"),
+        ("N", "Nomadic")
+    )
+    activity = models.CharField(
+        choices=activity_types,
+        max_length=1,
+        null=True
+    )
+    rancher_types = (
+        ('N', 'Natural'),
+        ('L', 'Legal')
+    )
+    rancher_type = models.CharField(
+        max_length=1,
+        choices=rancher_types,
+        default='N',
+        help_text="N is natural & L is legal"
+    )
+    heavy_livestock_number = models.BigIntegerField(default=0)
+    light_livestock_number = models.BigIntegerField(default=0)
     herd_code = models.CharField(max_length=100, null=True)
     first_name = models.CharField(max_length=150, null=True)
     last_name = models.CharField(max_length=150, null=True)

apps/herd/pos/api/v1/api.py

@@ -0,0 +1,154 @@
+from apps.herd.web.api.v1.serializers import HerdSerializer, RancherSerializer
+from apps.core.mixins.search_mixin import DynamicSearchMixin
+from apps.livestock.web.api.v1.serializers import LiveStockSerializer
+from rest_framework.exceptions import APIException
+from rest_framework.permissions import AllowAny
+from rest_framework.response import Response
+from rest_framework.decorators import action
+from common.tools import CustomOperations
+from rest_framework import viewsets
+from apps.herd.models import Herd, Rancher
+from django.db import transaction
+from rest_framework import status
+
+
+class HerdViewSet(viewsets.ModelViewSet):
+    """ Herd ViewSet """
+
+    queryset = Herd.objects.all()
+    serializer_class = HerdSerializer
+    permission_classes = [AllowAny]
+
+    @transaction.atomic
+    def create(self, request, *args, **kwargs):
+        """ create herd with user """
+
+        if 'rancher' in request.data.keys():
+            rancher = CustomOperations().custom_create(
+                request=request,
+                view=RancherViewSet(),
+                data=request.data['rancher']
+            )
+            request.data.update({'rancher': rancher['id']})
+
+        serializer = self.serializer_class(data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        else:
+            return Response(serializer.errors, status=status.HTTP_403_FORBIDDEN)
+
+    @action(
+        methods=['get'],
+        detail=False,
+        url_name='my_herds',
+        url_path='my_herds',
+        name='my_herds'
+    )
+    @transaction.atomic
+    def my_herds(self, request):
+        """ get current user herds """
+        serializer = self.serializer_class(self.queryset.filter(owner=request.user.id), many=True)
+        if serializer.data:
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        else:
+            return Response(status=status.HTTP_204_NO_CONTENT)
+
+    @action(
+        methods=['post'],
+        detail=True,
+        url_path='trash',
+        url_name='trash',
+        name='trash'
+    )
+    @transaction.atomic
+    def trash(self, request, pk=None):
+        """ Sent herd to trash """
+        try:
+            herd = self.queryset.get(id=pk)
+            herd.trash = True
+            herd.save()
+            return Response(status=status.HTTP_200_OK)
+        except APIException as e:
+            return Response(e, status=status.HTTP_204_NO_CONTENT)
+
+    @action(
+        methods=['post'],
+        detail=True,
+        url_path='delete',
+        url_name='delete',
+        name='delete'
+    )
+    @transaction.atomic
+    def delete(self, request, pk=None):
+        """ full delete of herd """
+        try:
+            herd = self.queryset.get(id=pk)
+            herd.delete()
+            return Response(status=status.HTTP_200_OK)
+        except APIException as e:
+            return Response(e, status=status.HTTP_204_NO_CONTENT)
+
+    @action(
+        methods=['get'],
+        detail=True,
+        url_path='live_stocks',
+        url_name='live_stocks',
+        name='live_stocks'
+    )
+    def live_stocks(self, request, pk=None):
+        """ list of herd live_stocks"""
+
+        herd = self.get_object()
+        queryset = herd.live_stock_herd.all()  # get herd live_stocks
+
+        # paginate queryset
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = LiveStockSerializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+
+class RancherViewSet(viewsets.ModelViewSet, DynamicSearchMixin):
+    queryset = Rancher.objects.all()
+    serializer_class = RancherSerializer
+    search_fields = [
+        "ranching_farm",
+        "first_name",
+        "last_name",
+        "mobile",
+        "national_code",
+        "birthdate",
+        "nationality",
+        "address",
+        "province__name",
+        "city__name",
+    ]
+
+    def list(self, request, *args, **kwargs):
+        """ list of ranchers """
+
+        search = self.filter_query(self.queryset.order_by('-modify_date'))  # search & filter
+        page = self.paginate_queryset(search)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+    @action(
+        methods=['get'],
+        detail=True,
+        url_path='herds',
+        url_name='herds',
+        name='herds'
+    )
+    def herds_by_rancher(self, request, pk=None):
+        """ list of rancher herds """
+
+        rancher = self.get_object()
+        queryset = rancher.herd.all().order_by('-modify_date')  # get rancher herds
+
+        # paginate queryset
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = HerdSerializer(page, many=True)
+            return self.get_paginated_response(serializer.data)

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

@@ -0,0 +1,53 @@
+from apps.authentication.api.v1.serializers.serializer import (
+    UserSerializer,
+    OrganizationSerializer,
+    ProvinceSerializer,
+    CitySerializer
+)
+from rest_framework import serializers
+from apps.herd.models import Herd, Rancher
+
+
+class HerdSerializer(serializers.ModelSerializer):
+    """ Herd Serializer """
+    class Meta:
+        model = Herd
+        fields = '__all__'
+
+    def to_representation(self, instance):
+        """ Customize serializer output """
+        representation = super().to_representation(instance)
+        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:
+                representation['contractor'] = OrganizationSerializer(instance.contractor).data
+            representation['rancher'] = RancherSerializer(instance.rancher).data
+
+        return representation
+
+
+class RancherSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Rancher
+        fields = '__all__'
+
+    def to_representation(self, instance):
+        """ customize output of serializer """
+
+        representation = super().to_representation(instance)
+
+        representation['province'] = {
+            'id': instance.province.id,
+            'name': instance.province.name
+        }
+
+        representation['city'] = {
+            'id': instance.city.id,
+            'name': instance.city.name
+        }
+
+        return representation

apps/herd/pos/api/v1/urls.py

@@ -0,0 +1,11 @@
+from django.urls import path, include
+from rest_framework.routers import DefaultRouter
+from . import api
+
+router = DefaultRouter()
+router.register(r'herd', api.HerdViewSet, basename='herd')
+router.register(r'rancher', api.RancherViewSet, basename='rancher')
+
+urlpatterns = [
+    path('api/v1/', include(router.urls))
+]

apps/herd/urls.py

@@ -5,5 +5,6 @@ from django.urls import path, include
 
 urlpatterns = [
     path('web/', include('apps.herd.web.api.v1.urls')),
+    path('pos/', include('apps.herd.pos.api.v1.urls')),
     path('excel/', include('apps.herd.services.excel.urls')),
 ]