From 6a4cb0f618fb4205bc0ff8b806ed313f61456b3f Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Sun, 2 Nov 2025 17:06:19 +0330 Subject: [PATCH] fix-my devices - import new mixin of visible orgs --- apps/core/visibility_registry.py | 1 + apps/pos_device/web/api/v1/viewsets/device.py | 9 +++-- ...lquotadistribution_description_and_more.py | 23 ++++++++++++ .../web/api/v1/viewsets/product_api.py | 36 ++++++++++--------- logs/django_requests.log | 4 +++ 5 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 apps/product/migrations/0081_alter_historicalquotadistribution_description_and_more.py diff --git a/apps/core/visibility_registry.py b/apps/core/visibility_registry.py index 4cac976..b0f1889 100644 --- a/apps/core/visibility_registry.py +++ b/apps/core/visibility_registry.py @@ -3,6 +3,7 @@ VISIBILITY_MAP = { 'organization': 'id', 'quota': ['registerer_organization', 'assigned_organizations'], 'quotastats': ['quota__registerer_organization', 'quota__assigned_organizations'], + 'productstats': 'organization', 'quotadistribution': ['assigner_organization', 'assigned_organization'], 'inventoryentry': 'organization', 'inventoryquotasaletransaction': 'organization', diff --git a/apps/pos_device/web/api/v1/viewsets/device.py b/apps/pos_device/web/api/v1/viewsets/device.py index 9316e8a..4f14ff4 100644 --- a/apps/pos_device/web/api/v1/viewsets/device.py +++ b/apps/pos_device/web/api/v1/viewsets/device.py @@ -18,6 +18,7 @@ from apps.authentication.api.v1.api import ( from apps.authentication.exceptions import OrganizationBankAccountException from apps.authorization.api.v1.serializers import UserRelationSerializer from apps.authorization.models import UserRelations +from apps.core.api import BaseViewSet from apps.core.mixins.admin_mixin import AdminFilterMixin from apps.core.mixins.search_mixin import DynamicSearchMixin from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin @@ -65,7 +66,7 @@ class ProviderCompanyViewSet(SoftDeleteMixin, viewsets.ModelViewSet): # noqa return self.get_paginated_response(serializer.data) -class DeviceViewSet(SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin): +class DeviceViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin): queryset = pos_models.Device.objects.all() serializer_class = device_serializer.DeviceSerializer @@ -94,9 +95,11 @@ class DeviceViewSet(SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin): @transaction.atomic def my_devices(self, request): """ list of company devices """ - + organization = get_organization_by_user(request.user) # using admin filter mixin to get query - devices = self.get_query(self.queryset) + devices = self.get_query(self.get_queryset( + visibility_by_org_scope=True + ) if organization.free_visibility_by_scope else self.get_queryset()) # paginate devices page = self.paginate_queryset(devices) diff --git a/apps/product/migrations/0081_alter_historicalquotadistribution_description_and_more.py b/apps/product/migrations/0081_alter_historicalquotadistribution_description_and_more.py new file mode 100644 index 0000000..4c108d9 --- /dev/null +++ b/apps/product/migrations/0081_alter_historicalquotadistribution_description_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 5.0 on 2025-11-02 12:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0080_quotafinalpricetypes_quotapricecalculationitems'), + ] + + operations = [ + migrations.AlterField( + model_name='historicalquotadistribution', + name='description', + field=models.TextField(blank=True, max_length=1000, null=True), + ), + migrations.AlterField( + model_name='quotadistribution', + name='description', + field=models.TextField(blank=True, max_length=1000, null=True), + ), + ] diff --git a/apps/product/web/api/v1/viewsets/product_api.py b/apps/product/web/api/v1/viewsets/product_api.py index a975c42..31d9bf3 100644 --- a/apps/product/web/api/v1/viewsets/product_api.py +++ b/apps/product/web/api/v1/viewsets/product_api.py @@ -1,19 +1,21 @@ import datetime -from apps.product.web.api.v1.serializers import product_serializers as product_serializers -from apps.product.web.api.v1.serializers import quota_serializers -from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin -from apps.core.mixins.search_mixin import DynamicSearchMixin -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 rest_framework import viewsets, filters -from common.tools import CustomOperations -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.product import models as product_models +from apps.product.web.api.v1.serializers import product_serializers as product_serializers +from apps.product.web.api.v1.serializers import quota_serializers +from common.helpers import get_organization_by_user def trash(queryset, pk): # noqa @@ -146,7 +148,7 @@ class ProductViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin) return Response(e, status=status.HTTP_204_NO_CONTENT) -class ProductStatsViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin): +class ProductStatsViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin): """ product statistics by its quotas """ queryset = product_models.ProductStats.objects.all() @@ -164,9 +166,11 @@ class ProductStatsViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchM try: organization = get_organization_by_user(request.user) - product_stats = self.queryset.filter(organization=organization).order_by('-modify_date') + product_stats = self.get_queryset( + visibility_by_org_scope=True + ) if organization.free_visibility_by_scope else self.get_queryset() - page = self.paginate_queryset(product_stats) # noqa + page = self.paginate_queryset(product_stats.order_by('-modify_date')) # noqa if page is not None: serializer = self.get_serializer(page, many=True) return self.get_paginated_response(serializer.data) diff --git a/logs/django_requests.log b/logs/django_requests.log index 669f2c4..4ad509a 100644 --- a/logs/django_requests.log +++ b/logs/django_requests.log @@ -690,3 +690,7 @@ AssertionError: .validate() should return the validated data [2025-11-02 15:33:11,579] INFO django.utils.autoreload | IP: - | Path: - | D:\Project\Rasaddam_Backend\apps\product\web\api\v1\serializers\quota_distribution_serializers.py changed, reloading. [2025-11-02 15:33:14,976] INFO django.utils.autoreload | IP: - | Path: - | Watching for file changes with StatReloader [2025-11-02 15:42:30,151] INFO django.utils.autoreload | IP: - | Path: - | D:\Project\Rasaddam_Backend\apps\product\models.py changed, reloading. +[2025-11-02 15:42:32,210] INFO django.utils.autoreload | IP: - | Path: - | Watching for file changes with StatReloader +[2025-11-02 16:38:11,296] INFO django.utils.autoreload | IP: - | Path: - | D:\Project\Rasaddam_Backend\apps\product\web\api\v1\viewsets\product_api.py changed, reloading. +[2025-11-02 16:38:16,320] INFO django.utils.autoreload | IP: - | Path: - | Watching for file changes with StatReloader +[2025-11-02 17:05:50,482] INFO django.utils.autoreload | IP: - | Path: - | D:\Project\Rasaddam_Backend\apps\pos_device\web\api\v1\viewsets\device.py changed, reloading.