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

* commit 'f10766e7':
  modify return of user type depend on the requirements of user creation

app/applicationlayer/master/user_type/views.py

@@ -16,28 +16,29 @@ class UserTypeViewSet(APIView):
             "code": "200",
             "status": "success",
             "message": "list of user types",
-            "results": [
+            "results": 
+            # [
                 {
-                    'Super user': enums_super,
-                    'Overall user admin': enums_OUA,
-                    "Company user admin": enums_company, 
-                    "Department user admin": enums_department,
-                    "user": enums_user
+                    str(enums.UserTypeEnum.SUPER_USER.name) : enums_super,
+                    str(enums.UserTypeEnum.OVERALL_USER_ADMIN.name) : enums_OUA,
+                    str(enums.UserTypeEnum.COMPANY_USER_ADMIN.name) : enums_company, 
+                    str(enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.name) : enums_department,
+                    str(enums.UserTypeEnum.USER.name) : enums_user
                 }
-            ]
+            # ]
         }
 
-        if self.request.user.user_type == enums_OUA:
-            del data['Super user']
-            del data['Overall user admin']
-        elif self.request.user.user_type == enums_company:
-            del data['Super user']
-            del data['Overall user admin']
-            del data['Company user admin']
-        elif self.request.user.user_type == enums_department:
-            del data['Super User']
-            del data['Overall user admin']
-            del data['Company user admin']
-            del data['Department user admin']
+        # if self.request.user.user_type == enums_OUA:
+        #     del data['Super user']
+        #     del data['Overall user admin']
+        # elif self.request.user.user_type == enums_company:
+        #     del data['Super user']
+        #     del data['Overall user admin']
+        #     del data['Company user admin']
+        if self.request.user.user_type != enums_super:
+            del data['results'][str(enums.UserTypeEnum.SUPER_USER.name)]
+            del data['results'][str(enums.UserTypeEnum.OVERALL_USER_ADMIN.name)]
+            del data['results'][str(enums.UserTypeEnum.COMPANY_USER_ADMIN.name)]
+            del data['results'][str(enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.name)]
 
         return Response(data)