Merge pull request #127 in RMS/api-main-service from red-develop to RMSv2

* commit '3885ad04':
  fixing listing of user and create under other user type

app/applicationlayer/management/user/serializers.py

@@ -115,8 +115,13 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
                 # datas = rms_module
             mod = data.modules.all()
             if user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                user_module = models.Module.objects.filter(code="MODULE-20190919-0000006")
-                mod = mod.union(mod, user_module)
+                if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
+                    user_module = models.Module.objects.filter(code="MODULE-20190919-0000006")
+                    mod = mod.union(mod, user_module)
+                else:
+                    mod = user_module = models.Module.objects.filter(code="MODULE-20190919-0000006")
+                
+                
             
             mod = ModuleSerializer(data=mod, many=True)
             mod.is_valid()

app/helper/decorators.py

@@ -187,14 +187,14 @@ class rms:
         def wrapper(self, request, *args, **kwargs):
 
             if rms.user_type(self) == rms.enums_department:
-                id = rms.user(self).department.id
+                id = rms.user(self).department.code
 
                 self.queryset = self.queryset.filter(
                     department=id
                 )
 
             elif rms.user_type(self) == rms.enums_company:
-                id = rms.user(self).department.company.id
+                id = rms.user(self).department.company.code
                 self.queryset = self.queryset.filter(
                     department__company=id
                 )