add - whole system of inventory entry in organization quotas stat

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

@@ -10,7 +10,6 @@ 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.warehouse import models as warehouse_models
-from apps.warehouse.services.warehouse_allocation_service import WarehouseAllocationService
 from apps.warehouse.web.api.v1 import serializers as warehouse_serializers
 from common.generics import base64_to_image_file
 from common.helpers import get_organization_by_user
@@ -71,8 +70,6 @@ class InventoryEntryViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet,
 
         inventory_entry = serializer.save()
 
-        WarehouseAllocationService.allocate(entry=inventory_entry)
-
         # upload document for confirmation entry
         if 'document' in request.data.keys():
             self.upload_confirmation_document(request, inventory=inventory_entry.id)

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

@@ -1,11 +1,9 @@
-from django.db import models
-from rest_framework import serializers
+from rest_framework import serializers, status
 
 from apps.product.exceptions import QuotaExpiredTimeException
+from apps.product.models import OrganizationQuotaStats
 from apps.warehouse import models as warehouse_models
-from apps.warehouse.exceptions import (
-    InventoryEntryWeightException
-)
+from apps.warehouse.exceptions import WareHouseException
 
 
 class InventoryEntrySerializer(serializers.ModelSerializer):
@@ -16,7 +14,7 @@ class InventoryEntrySerializer(serializers.ModelSerializer):
             "create_date",
             "modify_date",
             "organization",
-            "distribution",
+            "quota",
             "weight",
             "balance",
             "lading_number",
@@ -30,32 +28,49 @@ class InventoryEntrySerializer(serializers.ModelSerializer):
         check if inventory entries weight is not more than
         distribution weight & check quota expired time
         """
-
-        distribution = attrs['distribution']
+        quota = attrs['quota']
+        org = attrs['organization']
 
         # check for quota expired time
-        if not distribution.quota.is_in_valid_time():
+        if not quota.is_in_valid_time():
             raise QuotaExpiredTimeException()
 
         # total inventory entries weight
-        total_entered = distribution.inventory_entry.filter(is_confirmed=True).aggregate(
-            total=models.Sum('weight')
-        )['total'] or 0
+        # total_entered = distribution.inventory_entry.filter(is_confirmed=True).aggregate(
+        #     total=models.Sum('weight')
+        # )['total'] or 0
+
+        org_quota_stat = OrganizationQuotaStats.objects.get(
+            organization=org,
+            quota=quota
+        )
+
+        total_entered_weight = org_quota_stat.inventory_received
+        remaining_weight_to_enter = org_quota_stat.remaining_amount
 
         # if instance exists, for update check weight with distribution weight
         if self.instance:
             if self.instance.weight == 0:
-                if total_entered + attrs['weight'] > distribution.weight:
-                    raise InventoryEntryWeightException()
+                if total_entered_weight + attrs['weight'] > remaining_weight_to_enter:
+                    raise WareHouseException(
+                        "وزن وارد شده برای ورود به انبار نباید از باقیمانده سهمیه بیشتر باشد",  # noqa
+                        status.HTTP_403_FORBIDDEN
+                    )
             elif self.instance.weight != 0:
-                if total_entered - self.instance.weight + attrs['weight'] > distribution.weight:
-                    raise InventoryEntryWeightException()
+                if total_entered_weight - self.instance.weight + attrs['weight'] > remaining_weight_to_enter:
+                    raise WareHouseException(
+                        "وزن وارد شده برای ورود به انبار نباید از باقیمانده سهمیه بیشتر باشد",  # noqa
+                        status.HTTP_403_FORBIDDEN
+                    )
 
         # if instance is not exists for create, check entry weight with distribution
         else:
-            if total_entered + attrs['weight'] > distribution.weight or \
-                    total_entered + attrs['weight'] > distribution.remaining_weight:
-                raise InventoryEntryWeightException()
+            if total_entered_weight + attrs['weight'] > remaining_weight_to_enter:
+                # total_entered + attrs['weight'] > distribution.remaining_weight:
+                raise WareHouseException(
+                    "وزن وارد شده برای ورود به انبار نباید از باقیمانده سهمیه بیشتر باشد",  # noqa
+                    status.HTTP_403_FORBIDDEN
+                )
 
         return attrs