fix - quota exception in distribution limit & sale licence and visibility free by org

apps/product/exceptions.py

@@ -38,7 +38,15 @@ class QuotaExpiredTimeException(APIException):
     """if quota allowed time for distribute, sale, etc. is expired"""
 
     status_code = status.HTTP_400_BAD_REQUEST
-    default_detail = "زمان مجوز این سهمیه به پایان رسیده است"  # noqa
+    default_detail = "این سهمیه دارای محدودیت توزیع میباشد"  # noqa
+    default_code = 'error'
+
+
+class QuotaSaleTimeException(APIException):
+    """if quota allowed time for distribute, sale, etc. is expired"""
+
+    status_code = status.HTTP_400_BAD_REQUEST
+    default_detail = "اين سهمیه دارای محدودیت مجوز فروش میباشد"  # noqa
     default_code = 'error'
 
 

apps/product/models.py

@@ -446,6 +446,13 @@ class Quota(BaseModel):
         now = datetime.now()
         persian_date = jdatetime.datetime.fromgregorian(datetime=now)
 
+        return persian_date.month in self.distribution_mode
+
+    def is_in_sale_licence_time(self):
+        """ check if quota allowed time for sale and... is expired """
+        now = datetime.now()
+        persian_date = jdatetime.datetime.fromgregorian(datetime=now)
+
         return persian_date.month in self.sale_license
 
     def soft_delete(self):

apps/product/web/api/v1/viewsets/quota_api.py

@@ -1,22 +1,24 @@
-from apps.product.web.api.v1.serializers import quota_distribution_serializers
-from apps.product.services.services import get_products_in_warehouse
-from apps.product.web.api.v1.serializers import quota_serializers
-from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin
-from apps.product.exceptions import QuotaExpiredTimeException
-from apps.core.mixins.search_mixin import DynamicSearchMixin
-from apps.core.pagination import CustomPageNumberPagination
-from apps.product.web.api.v1.viewsets import product_api
-from common.helpers import get_organization_by_user
-from rest_framework.exceptions import APIException
-from apps.product import models as product_models
-from rest_framework.response import Response
-from rest_framework.decorators import action
-from common.tools import CustomOperations
-from rest_framework import viewsets, filters
-from rest_framework import status
+from datetime import datetime
+
 from django.db import transaction
 from django.db.models import Q
-from datetime import datetime
+from rest_framework import status
+from rest_framework import viewsets, filters
+from rest_framework.decorators import action
+from rest_framework.exceptions import APIException
+from rest_framework.response import Response
+
+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.core.pagination import CustomPageNumberPagination
+from apps.product import models as product_models
+from apps.product.exceptions import QuotaExpiredTimeException
+from apps.product.web.api.v1.serializers import quota_distribution_serializers
+from apps.product.web.api.v1.serializers import quota_serializers
+from apps.product.web.api.v1.viewsets import product_api
+from common.helpers import get_organization_by_user
+from common.tools import CustomOperations
 
 
 def trash(queryset, pk):  # noqa
@@ -32,7 +34,7 @@ def delete(queryset, pk):
     obj.delete()
 
 
-class QuotaViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin):  # noqa
+class QuotaViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin):  # noqa
     """ apis for product quota """
 
     queryset = product_models.Quota.objects.all()
@@ -344,18 +346,14 @@ class QuotaViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin):
     def active_quotas(self, request):
         """ list of organization active quotas """
 
-        queryset = self.filter_query(self.queryset)  # return by search param or all objects
-
-        organization = get_organization_by_user(request.user)
+        queryset = self.filter_query(
+            self.get_queryset(visibility_by_org_scope=True))  # return by search param or all objects
 
         # paginate queryset
         page = self.paginate_queryset(
-            queryset.filter(
-                Q(registerer_organization=organization),
-                Q(is_closed=False)
-            ).order_by('-modify_date')
+            queryset.order_by('-modify_date')
         )
-        if page is not None:
+        if page is not None:  # noqa
             serializer = self.get_serializer(page, many=True)
             return self.get_paginated_response(serializer.data)
 
@@ -370,18 +368,14 @@ class QuotaViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin):
     def closed_quotas(self, request):
         """ list of organization closed quotas """
 
-        queryset = self.filter_query(self.queryset)  # return by search param or all objects
-
-        organization = get_organization_by_user(request.user)
+        queryset = self.filter_query(
+            self.get_queryset(visibility_by_org_scope=True))  # return by search param or all objects
 
         # paginate queryset
         page = self.paginate_queryset(
-            queryset.filter(
-                Q(registerer_organization=organization),
-                Q(is_closed=True)
-            ).order_by('-modify_date')
+            queryset.order_by('-modify_date')
         )
-        if page is not None:
+        if page is not None:  # noqa
             serializer = self.get_serializer(page, many=True)
             return self.get_paginated_response(serializer.data)