fix the value of application on id, add checking on creating user

app/applicationlayer/management/account/serializer.py

@@ -15,7 +15,7 @@ class UserSerializer(serializers.ModelSerializer):
         ret['department'] = model_to_dict(instance.department)
         ret['company'] = model_to_dict(instance.department.company)
         # print(instance.application.all())
-        application = [data['id'] for data in instance.application.values('id')]
+        application = [data['id'] for data in instance.application.values()]
         ret['application'] = application
 
         return ret

app/applicationlayer/management/account/views.py

@@ -30,6 +30,7 @@ class UserViewSet(viewsets.ModelViewSet):
     queryset = User.objects.all()
     serializer_class = serializer.UserSerializer
     pagination_class = CustomPagination
+    # lookup_field = 'code'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = UserFilterSet
     ordering_fields = '__all__'
@@ -110,6 +111,13 @@ class UserViewSet(viewsets.ModelViewSet):
         )
 
 
+    @decorators.rms.user_list
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)
+
+
     @rms.user_create
     @error_safe
     @transaction.atomic

app/helper/decorators.py

@@ -77,7 +77,6 @@ class rms:
                     rms.access_error
                 )
             elif rms.user_type(self) == rms.enums_department:
-                print(request.data)
                 if request.data['department'] != rms.user(self).department.id:
                     raise ParseError(
                         rms.department_error
@@ -109,9 +108,13 @@ class rms:
     def department_crate(function):
         @wraps(function)
         def wrapper(self, request, *args, **kwargs):
-            if rms.user_type(self) == rms.enums_super:
-                pass
-            elif rms.user_type(self) != rms.enums_super or rms.user_type(self) != rms.enums_company:
+            # if rms.user_type(self) == rms.enums_super:
+            #     pass
+            # elif rms.user_type(self) != rms.enums_super or rms.user_type(self) != rms.enums_company:
+            #     raise ParseError(
+            #         rms.access_error
+            #     )
+            if rms.user_type(self) != rms.enums_super:
                 raise ParseError(
                     rms.access_error
                 )
@@ -187,13 +190,12 @@ class rms:
                 self.queryset = self.queryset.filter(
                     department=id
                 )
-                
+
             elif rms.user_type(self) == rms.enums_company:
                 id = rms.user(self).department.company.id
                 self.queryset = self.queryset.filter(
                     department__company=id
                 )
-                print(self.queryset.query)
             elif rms.user_type(self) == rms.enums_super:
                 pass
             else: