Merge branch 'product-dev' into 'product-sit'

Product dev

See merge request rms/Backend/api-main-service!888

app/applicationlayer/download/accounts/views.py

@@ -5,13 +5,11 @@ from drf_renderer_xlsx.renderers import XLSXRenderer
 from app.entities.models import (
     User
 )
-# from app.applicationlayer.form_listing_ import headers
 from app.applicationlayer.download.accounts.serializers import headers
 from django.db.models import CharField, Value
 from django.db.models import Q
 from rest_framework.response import Response
 from rest_framework.permissions import AllowAny
-# from cms.applicationlayer.utilities import logged_user
 from rest_framework.exceptions import ParseError
 from rest_framework import status
 
@@ -24,28 +22,21 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     permission_classes = (AllowAny,)
     
     def list(self, request, *args, **kwargs):
-
-        # id_number = self.request.user
-        # comment
-        data = User.objects.all().exclude(id=1)
-        user_type = data.values_list('user_type', flat=True)[0]
-        
-        print("this")
-        print(user_type)
+        #comment this line
+        user_type = self.request.user.user_type
+        company = self.request.user.department.company.code
+        department = self.request.user.department.code
         
         if user_type == 'CUA':
-            code = data.values_list('department__company', flat=True)[0]
             data = User.objects.filter(
-                department__company=code).exclude(id=1)
+                department__company=company).exclude(id=1)
         elif user_type == 'DUA':
-            code = data.values_list('department', flat=True)[0]
             data = User.objects.filter(
-                department=code).exclude(id=1)
+                department=department).exclude(id=1)
         elif user_type == 'SU':
             data = User.objects.all().exclude(id=1)
         elif user_type == 'OUA':
             data = User.objects.all().exclude(id=1)
-            
         else:
             return Response(
                         {"message": "Logged user is unauthorize to access this section"},