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

fix - mydevices

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-11 12:36:04 +03:30
parent f8bbda203f
commit 9d7c065819
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.local
View File

@@ -7,7 +7,7 @@ ENV_NAME=DEV
# Database secrets # Database secrets
DB_HOST=31.7.78.133 DB_HOST=31.7.78.133
DB_PORT=14352 DB_PORT=14352
DB_NAME=Production DB_NAME=Development
DB_USERNAME=postgres DB_USERNAME=postgres
DB_PASSWORD=pfLIVXupbDetvFMt2gUvxLXUL9b4HIOHaPcKXsBEZ1i8zl0iLUjmhUfXlGfJKcTV DB_PASSWORD=pfLIVXupbDetvFMt2gUvxLXUL9b4HIOHaPcKXsBEZ1i8zl0iLUjmhUfXlGfJKcTV

7
apps/core/visibility_registry.py
View File

@@ -7,7 +7,7 @@ VISIBILITY_MAP = {
'quotadistribution': ['assigner_organization', 'assigned_organization'], 'quotadistribution': ['assigner_organization', 'assigned_organization'],
'inventoryentry': 'organization', 'inventoryentry': 'organization',
'inventoryquotasaletransaction': 'seller_organization', 'inventoryquotasaletransaction': 'seller_organization',
'device': 'organization', 'device': 'assignment__client__organization',
# 'deviceactivationcode': 'organization', # 'deviceactivationcode': 'organization',
# 'deviceversion': 'organization', # 'deviceversion': 'organization',
@@ -21,9 +21,10 @@ VISIBILITY_MAP = {
VISIBILITY_MAP_BY_ORG_KEY = { VISIBILITY_MAP_BY_ORG_KEY = {
'device': { 'device': {
'PSP': 'organization', 'PSP': 'organization',
# 'CO': 'assignment__client__organization', 'CO': 'assignment__client__organization',
'CI': 'assignment__client__organization', 'CI': 'assignment__client__organization',
'PR': 'assignment__client__organization', 'U': 'assignment__client__organization',
'AGC': 'assignment__client__organization', 'AGC': 'assignment__client__organization',
'EMP': 'assignment__client__organization',
}, },
} }

22
apps/pos_device/web/api/v1/viewsets/device.py
View File

@@ -4,7 +4,7 @@ from datetime import timedelta
from django.db import transaction from django.db import transaction
from django.utils.timezone import now from django.utils.timezone import now
from rest_framework import status from rest_framework import status, filters
from rest_framework import viewsets from rest_framework import viewsets
from rest_framework.decorators import action from rest_framework.decorators import action
from rest_framework.exceptions import APIException from rest_framework.exceptions import APIException
@@ -70,6 +70,15 @@ class ProviderCompanyViewSet(SoftDeleteMixin, viewsets.ModelViewSet): # noqa
class DeviceViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin): class DeviceViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin):
queryset = pos_models.Device.objects.all() queryset = pos_models.Device.objects.all()
serializer_class = device_serializer.DeviceSerializer serializer_class = device_serializer.DeviceSerializer
filter_backends = [filters.SearchFilter]
search_fields = [
'device_identity',
'acceptor',
'terminal',
'mac',
'serial',
'organization__name',
]
def create(self, request, *args, **kwargs): def create(self, request, *args, **kwargs):
""" Custom create of pos devices """ """ Custom create of pos devices """
@@ -105,7 +114,16 @@ class DeviceViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, AdminFi
visibility_by_org_scope=True visibility_by_org_scope=True
) if organization.free_visibility_by_scope else self.get_queryset() ) if organization.free_visibility_by_scope else self.get_queryset()
queryset = apply_visibility_filter_by_org_type(devices, organization) # filter by Jihad & admin of system
if organization.type.key == 'J':
queryset = devices.filter(assignment__client__organization__province=organization.province)
elif not organization.type.key == 'ADM':
queryset = apply_visibility_filter_by_org_type(devices, organization)
else:
queryset = devices
# filter by search
queryset = self.filter_queryset(queryset)
# paginate devices # paginate devices
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)