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

* commit '12a93c89':
  added code on current user

app/applicationlayer/management/user/serializers.py

@@ -62,6 +62,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     def get_department(self, user):
         data = {
             "id": user.department.id,
+            "code": user.department.code
             "name": user.department.name
         }
         return data
@@ -69,6 +70,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     def get_company(self, user):
         data = {
             "id": user.department.company.id,
+            "code": user.department.company.code
             "name": user.department.company.name
         }
         return data
@@ -94,25 +96,29 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         rms = models.Application.objects.filter(id=1).values().first()
 
         for data in app:
-            if data.id == 1:
-                if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
-                    rms_module = models.Module.objects.filter(
-                        Q(application=rms['code']) &
-                        Q(parent=0)
-                    )
-                elif user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                    rms_module = models.Module.objects.filter(
-                        code="MODULE-20190919-0000006"
-                    )
-            else:
-                rms_module = data.modules.all()
+            # if data.id == 1:
+            #     if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
+            #         rms_module = models.Module.objects.filter(
+            #             Q(application=rms['code']) &
+            #             Q(parent=0)
+            #         )
+            #     elif user.user_type.upper() != enums.UserTypeEnum.USER.value:
+            #         rms_module = models.Module.objects.filter(
+            #             code="MODULE-20190919-0000006"
+            #         )
+            # else:
+            #     rms_module = data.modules.all()
+            # if user.user_type.upper() != enums.UserTypeEnum.USER.value:
+            #     rms_module2 = models.Module.objects.filter(code="MODULE-20190919-0000006")
+            #     datas = rms_module.union(rms_module, rms_module2)
+            # else:
+                # datas = rms_module
+            mod = data.modules.all()
             if user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                rms_module2 = models.Module.objects.filter(code="MODULE-20190919-0000006")
-                datas = rms_module.union(rms_module, rms_module2)
-            else:
-                datas = rms_module
+                user_module = models.Module.objects.filter(code="MODULE-20190919-0000006")
+                mod = mod.union(mod, user_module)
             
-            mod = ModuleSerializer(data=datas, many=True)
+            mod = ModuleSerializer(data=mod, many=True)
             mod.is_valid()
 
             app_body = {}