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

* commit '46c4cce0':
  {dev bugfixed} on validation of user type equals to user
  {dev bugfix} removed usage of parse error on account validation

app/helper/decorators.py

@@ -47,7 +47,7 @@ class rms:
     enums_company = enums.UserTypeEnum.COMPANY_USER_ADMIN.value
     enums_department = enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.value
     enums_user = enums.UserTypeEnum.USER.value
-    access_error = "Logged user is not allowed to access this endpoint."
+    access_error = "Logged user is unauthorize to make another user"
     department_error = 'Department should be same with the logged user'
     company_error = 'Company should be same with the logged user'
 
@@ -67,14 +67,20 @@ class rms:
     def user_create(function):
         @wraps(function)
         def wrapper(self, request, *args, **kwargs):
+            print(rms.user_type(self))
             if rms.user_type(self) == rms.enums_user:
-                raise ParseError(
-                    rms.access_error
+                # raise ParseError(
+                #     rms.access_error
+                # )
+                return Response(
+                    {"message": rms.access_error},
+                    status=status.HTTP_400_BAD_REQUEST
                 )
             elif rms.user_type(self) == rms.enums_department:
                 if request.data['department'] != rms.user(self).department.code:
-                    raise ParseError(
-                        rms.department_error
+                    return Response(
+                        {"message": rms.department_error},
+                        status=status.HTTP_400_BAD_REQUEST
                     )
             elif rms.user_type(self) == rms.enums_company:
                 user_company = rms.user(self).department.company
@@ -83,8 +89,10 @@ class rms:
                     Q(company=user_company)
                 )
                 if not request_department:
-                    raise ParseError(rms.company_error)
-
+                    return Response(
+                        {"message": rms.company_error},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
             return function(self, request, *args, **kwargs)
         return wrapper
 
@@ -98,9 +106,12 @@ class rms:
             if username.count() >= 1:
                 return Response(
                     {
-                        "message": f"username {username.first().username} is already taken",
-                    },status=status.HTTP_400_BAD_REQUEST
+                        "message": f"username {username.first().username} is already taken"
+                    },
+                    status=status.HTTP_400_BAD_REQUEST
                 )
+            # rms.user_create(self, request, *args, **kwargs)
+            
             return function(self, request, *args, **kwargs)
         return wrapper