MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix - quota list by is_closed

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-02 11:37:06 +03:30
parent bf72eaad17
commit b2e599db91
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/product/models.py
View File

@@ -418,7 +418,7 @@ class Quota(BaseModel):
if last: if last:
next_code = last.quota_id + 1 next_code = last.quota_id + 1
else: else:
next_code = 1001 next_code = 10001
return next_code return next_code
def calculate_final_price(self): def calculate_final_price(self):

6
apps/product/web/api/v1/viewsets/quota_api.py
View File

@@ -347,7 +347,8 @@ class QuotaViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicS
""" list of organization active quotas """ """ list of organization active quotas """
queryset = self.filter_query( queryset = self.filter_query(
self.get_queryset(visibility_by_org_scope=True)) # return by search param or all objects self.get_queryset(visibility_by_org_scope=True).filter(
is_closed=False)) # return by search param or all objects
# paginate queryset # paginate queryset
page = self.paginate_queryset( page = self.paginate_queryset(
@@ -369,7 +370,8 @@ class QuotaViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicS
""" list of organization closed quotas """ """ list of organization closed quotas """
queryset = self.filter_query( queryset = self.filter_query(
self.get_queryset(visibility_by_org_scope=True)) # return by search param or all objects self.get_queryset(visibility_by_org_scope=True).filter(
is_closed=True)) # return by search param or all objects
# paginate queryset # paginate queryset
page = self.paginate_queryset( page = self.paginate_queryset(

4
logs/django_requests.log
View File

@@ -664,3 +664,7 @@ AssertionError: .validate() should return the validated data
[2025-11-02 11:04:48,112] INFO django.utils.autoreload | IP: - | Path: - | Watching for file changes with StatReloader [2025-11-02 11:04:48,112] INFO django.utils.autoreload | IP: - | Path: - | Watching for file changes with StatReloader
[2025-11-02 11:05:16,197] INFO django.server | IP: - | Path: - | "GET /auth/api/v1/organization/child_organizations/ HTTP/1.1" 200 6938 [2025-11-02 11:05:16,197] INFO django.server | IP: - | Path: - | "GET /auth/api/v1/organization/child_organizations/ HTTP/1.1" 200 6938
[2025-11-02 11:33:14,043] INFO django.utils.autoreload | IP: - | Path: - | D:\Project\Rasaddam_Backend\apps\product\models.py changed, reloading. [2025-11-02 11:33:14,043] INFO django.utils.autoreload | IP: - | Path: - | D:\Project\Rasaddam_Backend\apps\product\models.py changed, reloading.
[2025-11-02 11:33:18,814] INFO django.utils.autoreload | IP: - | Path: - | Watching for file changes with StatReloader
[2025-11-02 11:35:44,882] INFO django.utils.autoreload | IP: - | Path: - | D:\Project\Rasaddam_Backend\apps\product\models.py changed, reloading.
[2025-11-02 11:35:52,593] INFO django.utils.autoreload | IP: - | Path: - | Watching for file changes with StatReloader
[2025-11-02 11:36:51,561] INFO django.utils.autoreload | IP: - | Path: - | D:\Project\Rasaddam_Backend\apps\product\web\api\v1\viewsets\quota_api.py changed, reloading.