maleo-identity 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

maleo_identity/client/controllers/http/organization.py

@@ -1,10 +1,14 @@
 from maleo_foundation.managers.client.base import BearerAuth
 from maleo_foundation.managers.client.maleo import MaleoClientHTTPController
 from maleo_foundation.models.transfers.results.client.controllers.http import BaseClientHTTPControllerResults
+from maleo_identity.models.transfers.parameters.general.organization_role import MaleoIdentityOrganizationRoleGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.general.organization import MaleoIdentityOrganizationGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.general.user_organization import MaleoIdentityUserOrganizationGeneralParametersTransfers
+from maleo_identity.models.transfers.parameters.general.user_organization_role import MaleoIdentityUserOrganizationRoleGeneralParametersTransfers
+from maleo_identity.models.transfers.parameters.client.organization_role import MaleoIdentityOrganizationRoleClientParametersTransfers
 from maleo_identity.models.transfers.parameters.client.organization import MaleoIdentityOrganizationClientParametersTransfers
 from maleo_identity.models.transfers.parameters.client.user_organization import MaleoIdentityUserOrganizationClientParametersTransfers
+from maleo_identity.models.transfers.parameters.client.user_organization_role import MaleoIdentityUserOrganizationRoleClientParametersTransfers
 
 class MaleoIdentityOrganizationHTTPController(MaleoClientHTTPController):
     async def get_organizations(self, parameters:MaleoIdentityOrganizationClientParametersTransfers.GetMultiple) -> BaseClientHTTPControllerResults:
@@ -77,6 +81,38 @@ class MaleoIdentityOrganizationHTTPController(MaleoClientHTTPController):
             response = await client.put(url=url, json=json, params=params, auth=auth)
             return BaseClientHTTPControllerResults(response=response)
 
+    async def get_organization_roles(self, parameters:MaleoIdentityOrganizationRoleClientParametersTransfers.GetMultipleFromOrganization) -> BaseClientHTTPControllerResults:
+        """Get organization's roles from MaleoIdentity"""
+        async with self._manager.get_client() as client:
+            #* Define URL
+            url = f"{self._manager.url.api}/v1/organizations/{parameters.organization_id}/roles/"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityOrganizationRoleClientParametersTransfers.GetMultipleFromOrganizationQuery.model_validate(parameters.model_dump()).model_dump(exclude_none=True)
+
+            #* Create auth
+            auth = BearerAuth(token=self._service_manager.token)
+
+            #* Send request and wait for response
+            response = await client.get(url=url, params=params, auth=auth)
+            return BaseClientHTTPControllerResults(response=response)
+
+    async def get_organization_role(self, parameters:MaleoIdentityOrganizationRoleGeneralParametersTransfers.GetSingle) -> BaseClientHTTPControllerResults:
+        """Get organization's role from MaleoIdentity"""
+        async with self._manager.get_client() as client:
+            #* Define URL
+            url = f"{self._manager.url.api}/v1/organizations/{parameters.organization_id}/roles/{parameters.key}"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityOrganizationRoleGeneralParametersTransfers.GetSingleQuery.model_validate(parameters.model_dump()).model_dump(exclude_none=True)
+
+            #* Create auth
+            auth = BearerAuth(token=self._service_manager.token)
+
+            #* Send request and wait for response
+            response = await client.get(url=url, params=params, auth=auth)
+            return BaseClientHTTPControllerResults(response=response)
+
     async def get_organization_users(self, parameters:MaleoIdentityUserOrganizationClientParametersTransfers.GetMultipleFromOrganization) -> BaseClientHTTPControllerResults:
         """Get organization's users from MaleoIdentity"""
         async with self._manager.get_client() as client:
@@ -94,7 +130,7 @@ class MaleoIdentityOrganizationHTTPController(MaleoClientHTTPController):
             return BaseClientHTTPControllerResults(response=response)
 
     async def get_organization_user(self, parameters:MaleoIdentityUserOrganizationGeneralParametersTransfers.GetSingle) -> BaseClientHTTPControllerResults:
-        """Get user's organization from MaleoIdentity"""
+        """Get organization's user from MaleoIdentity"""
         async with self._manager.get_client() as client:
             #* Define URL
             url = f"{self._manager.url.api}/v1/organizations/{parameters.organization_id}/users/{parameters.user_id}"
@@ -105,6 +141,38 @@ class MaleoIdentityOrganizationHTTPController(MaleoClientHTTPController):
             #* Create auth
             auth = BearerAuth(token=self._service_manager.token)
 
+            #* Send request and wait for response
+            response = await client.get(url=url, params=params, auth=auth)
+            return BaseClientHTTPControllerResults(response=response)
+
+    async def get_organization_user_roles(self, parameters:MaleoIdentityUserOrganizationRoleClientParametersTransfers.GetMultipleFromUserOrOrganization) -> BaseClientHTTPControllerResults:
+        """Get organization's user roles from MaleoIdentity"""
+        async with self._manager.get_client() as client:
+            #* Define URL
+            url = f"{self._manager.url.api}/v1/organizations/{parameters.organization_id}/users/{parameters.user_id}/roles/"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityUserOrganizationRoleClientParametersTransfers.GetMultipleFromUserOrOrganizationQuery.model_validate(parameters.model_dump()).model_dump(exclude_none=True)
+
+            #* Create auth
+            auth = BearerAuth(token=self._service_manager.token)
+
+            #* Send request and wait for response
+            response = await client.get(url=url, params=params, auth=auth)
+            return BaseClientHTTPControllerResults(response=response)
+
+    async def get_organization_user_role(self, parameters:MaleoIdentityUserOrganizationRoleGeneralParametersTransfers.GetSingle) -> BaseClientHTTPControllerResults:
+        """Get organization's user role from MaleoIdentity"""
+        async with self._manager.get_client() as client:
+            #* Define URL
+            url = f"{self._manager.url.api}/v1/organizations/{parameters.organization_id}/users/{parameters.user_id}/roles/{parameters.key}"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityUserOrganizationRoleGeneralParametersTransfers.GetSingleQuery.model_validate(parameters.model_dump()).model_dump(exclude_none=True)
+
+            #* Create auth
+            auth = BearerAuth(token=self._service_manager.token)
+
             #* Send request and wait for response
             response = await client.get(url=url, params=params, auth=auth)
             return BaseClientHTTPControllerResults(response=response)

maleo_identity/client/controllers/http/user.py

@@ -4,9 +4,11 @@ from maleo_foundation.models.transfers.results.client.controllers.http import Ba
 from maleo_identity.models.transfers.parameters.general.user import MaleoIdentityUserGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.general.user_organization import MaleoIdentityUserOrganizationGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.general.user_system_role import MaleoIdentityUserSystemRoleGeneralParametersTransfers
+from maleo_identity.models.transfers.parameters.general.user_organization_role import MaleoIdentityUserOrganizationRoleGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.client.user import MaleoIdentityUserClientParametersTransfers
 from maleo_identity.models.transfers.parameters.client.user_organization import MaleoIdentityUserOrganizationClientParametersTransfers
 from maleo_identity.models.transfers.parameters.client.user_system_role import MaleoIdentityUserSystemRoleClientParametersTransfers
+from maleo_identity.models.transfers.parameters.client.user_organization_role import MaleoIdentityUserOrganizationRoleClientParametersTransfers
 
 class MaleoIdentityUserHTTPController(MaleoClientHTTPController):
     async def get_users(self, parameters:MaleoIdentityUserClientParametersTransfers.GetMultiple) -> BaseClientHTTPControllerResults:
@@ -125,7 +127,7 @@ class MaleoIdentityUserHTTPController(MaleoClientHTTPController):
             return BaseClientHTTPControllerResults(response=response)
 
     async def get_user_organizations(self, parameters:MaleoIdentityUserOrganizationClientParametersTransfers.GetMultipleFromUser) -> BaseClientHTTPControllerResults:
-        """Get user's organizations from MaleoIdentity"""
+        """Get user's organization roles from MaleoIdentity"""
         async with self._manager.get_client() as client:
             #* Define URL
             url = f"{self._manager.url.api}/v1/users/{parameters.user_id}/organizations/"
@@ -141,7 +143,7 @@ class MaleoIdentityUserHTTPController(MaleoClientHTTPController):
             return BaseClientHTTPControllerResults(response=response)
 
     async def get_user_organization(self, parameters:MaleoIdentityUserOrganizationGeneralParametersTransfers.GetSingle) -> BaseClientHTTPControllerResults:
-        """Get user's organization from MaleoIdentity"""
+        """Get user's organization role from MaleoIdentity"""
         async with self._manager.get_client() as client:
             #* Define URL
             url = f"{self._manager.url.api}/v1/users/{parameters.user_id}/organizations/{parameters.organization_id}"
@@ -152,6 +154,38 @@ class MaleoIdentityUserHTTPController(MaleoClientHTTPController):
             #* Create auth
             auth = BearerAuth(token=self._service_manager.token)
 
+            #* Send request and wait for response
+            response = await client.get(url=url, params=params, auth=auth)
+            return BaseClientHTTPControllerResults(response=response)
+
+    async def get_user_organization_roles(self, parameters:MaleoIdentityUserOrganizationRoleClientParametersTransfers.GetMultipleFromUserOrOrganization) -> BaseClientHTTPControllerResults:
+        """Get user's organization roles from MaleoIdentity"""
+        async with self._manager.get_client() as client:
+            #* Define URL
+            url = f"{self._manager.url.api}/v1/users/{parameters.user_id}/organizations/{parameters.organization_id}/roles/"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityUserOrganizationRoleClientParametersTransfers.GetMultipleFromUserOrOrganizationQuery.model_validate(parameters.model_dump()).model_dump(exclude_none=True)
+
+            #* Create auth
+            auth = BearerAuth(token=self._service_manager.token)
+
+            #* Send request and wait for response
+            response = await client.get(url=url, params=params, auth=auth)
+            return BaseClientHTTPControllerResults(response=response)
+
+    async def get_user_organization_role(self, parameters:MaleoIdentityUserOrganizationRoleGeneralParametersTransfers.GetSingle) -> BaseClientHTTPControllerResults:
+        """Get user's organization role from MaleoIdentity"""
+        async with self._manager.get_client() as client:
+            #* Define URL
+            url = f"{self._manager.url.api}/v1/users/{parameters.user_id}/organizations/{parameters.organization_id}/roles/{parameters.key}"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityUserOrganizationRoleGeneralParametersTransfers.GetSingleQuery.model_validate(parameters.model_dump()).model_dump(exclude_none=True)
+
+            #* Create auth
+            auth = BearerAuth(token=self._service_manager.token)
+
             #* Send request and wait for response
             response = await client.get(url=url, params=params, auth=auth)
             return BaseClientHTTPControllerResults(response=response)

maleo_identity/client/services/organization.py

@@ -2,14 +2,22 @@ from maleo_foundation.managers.client.base import ClientService
 from maleo_foundation.utils.exceptions import BaseExceptions
 from maleo_identity.client.controllers import MaleoIdentityOrganizationControllers
 from maleo_identity.enums.general import MaleoIdentityGeneralEnums
+from maleo_identity.models.transfers.parameters.general.organization_role import MaleoIdentityOrganizationRoleGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.general.organization import MaleoIdentityOrganizationGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.general.user_organization import MaleoIdentityUserOrganizationGeneralParametersTransfers
+from maleo_identity.models.transfers.parameters.general.user_organization_role import MaleoIdentityUserOrganizationRoleGeneralParametersTransfers
+from maleo_identity.models.transfers.parameters.client.organization_role import MaleoIdentityOrganizationRoleClientParametersTransfers
 from maleo_identity.models.transfers.parameters.client.organization import MaleoIdentityOrganizationClientParametersTransfers
 from maleo_identity.models.transfers.parameters.client.user_organization import MaleoIdentityUserOrganizationClientParametersTransfers
+from maleo_identity.models.transfers.parameters.client.user_organization_role import MaleoIdentityUserOrganizationRoleClientParametersTransfers
+from maleo_identity.models.transfers.results.general.organization_role import MaleoIdentityOrganizationRoleGeneralResultsTransfers
 from maleo_identity.models.transfers.results.general.organization import MaleoIdentityOrganizationGeneralResultsTransfers
 from maleo_identity.models.transfers.results.general.user_organization import MaleoIdentityUserOrganizationGeneralResultsTransfers
+from maleo_identity.models.transfers.results.general.user_organization_role import MaleoIdentityUserOrganizationRoleGeneralResultsTransfers
+from maleo_identity.types.results.client.organization_role import MaleoIdentityOrganizationRoleClientResultsTypes
 from maleo_identity.types.results.client.organization import MaleoIdentityOrganizationClientResultsTypes
 from maleo_identity.types.results.client.user_organization import MaleoIdentityUserOrganizationClientResultsTypes
+from maleo_identity.types.results.client.user_organization_role import MaleoIdentityUserOrganizationRoleClientResultsTypes
 
 class MaleoIdentityOrganizationClientService(ClientService):
     def __init__(self, logger, controllers:MaleoIdentityOrganizationControllers):
@@ -164,7 +172,7 @@ class MaleoIdentityOrganizationClientService(ClientService):
                 message = "Invalid controller type"
                 description = "The provided controller type did not exists"
                 return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
-            #* Update organization's data using chosen controller
+            #* Retrieve organization's users using chosen controller
             if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
                 controller_result = await self._controllers.http.get_organization_users(parameters=parameters)
             else:
@@ -198,7 +206,7 @@ class MaleoIdentityOrganizationClientService(ClientService):
                 message = "Invalid controller type"
                 description = "The provided controller type did not exists"
                 return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
-            #* Update organization's data using chosen controller
+            #* Retrieve organization's user using chosen controller
             if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
                 controller_result = await self._controllers.http.get_organization_user(parameters=parameters)
             else:
@@ -210,4 +218,134 @@ class MaleoIdentityOrganizationClientService(ClientService):
                 return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail.model_validate(controller_result.content)
             else:
                 return MaleoIdentityUserOrganizationGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_organization_roles(
+        self,
+        parameters:MaleoIdentityOrganizationRoleClientParametersTransfers.GetMultipleFromOrganization,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityOrganizationRoleClientResultsTypes.GetMultiple:
+        """Retrieve organization's roles from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving organization's roles",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityOrganizationRoleGeneralResultsTransfers.Fail
+        )
+        async def _impl():
+            #* Validate chosen controller type
+            if not isinstance(controller_type, MaleoIdentityGeneralEnums.ClientControllerType):
+                message = "Invalid controller type"
+                description = "The provided controller type did not exists"
+                return MaleoIdentityOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Retrieve organization's roles using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_organization_roles(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityOrganizationRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                if controller_result.content["data"] is None:
+                    return MaleoIdentityOrganizationRoleGeneralResultsTransfers.NoData.model_validate(controller_result.content)
+                else:
+                    return MaleoIdentityOrganizationRoleGeneralResultsTransfers.MultipleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_organization_role(
+        self,
+        parameters:MaleoIdentityOrganizationRoleGeneralParametersTransfers.GetSingle,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityOrganizationRoleClientResultsTypes.GetSingle:
+        """Retrieve organization's role from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving organization's role",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityOrganizationRoleGeneralResultsTransfers.Fail
+        )
+        async def _impl():
+            #* Validate chosen controller type
+            if not isinstance(controller_type, MaleoIdentityGeneralEnums.ClientControllerType):
+                message = "Invalid controller type"
+                description = "The provided controller type did not exists"
+                return MaleoIdentityOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Retrieve organization's role using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_organization_role(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityOrganizationRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                return MaleoIdentityOrganizationRoleGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_organization_user_roles(
+        self,
+        parameters:MaleoIdentityUserOrganizationRoleClientParametersTransfers.GetMultipleFromUserOrOrganization,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityUserOrganizationRoleClientResultsTypes.GetMultiple:
+        """Retrieve organization's user roles from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving organization's user roles",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail
+        )
+        async def _impl():
+            #* Validate chosen controller type
+            if not isinstance(controller_type, MaleoIdentityGeneralEnums.ClientControllerType):
+                message = "Invalid controller type"
+                description = "The provided controller type did not exists"
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Retrieve organization's user roles using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_organization_user_roles(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                if controller_result.content["data"] is None:
+                    return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.NoData.model_validate(controller_result.content)
+                else:
+                    return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.MultipleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_organization_user_role(
+        self,
+        parameters:MaleoIdentityUserOrganizationRoleGeneralParametersTransfers.GetSingle,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityUserOrganizationClientResultsTypes.GetSingle:
+        """Retrieve organization's user role from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving organization's user role",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail
+        )
+        async def _impl():
+            #* Validate chosen controller type
+            if not isinstance(controller_type, MaleoIdentityGeneralEnums.ClientControllerType):
+                message = "Invalid controller type"
+                description = "The provided controller type did not exists"
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Retrieve organization's user role using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_organization_user_role(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
         return await _impl()

maleo_identity/client/services/user.py

@@ -6,15 +6,19 @@ from maleo_identity.enums.general import MaleoIdentityGeneralEnums
 from maleo_identity.models.transfers.parameters.general.user import MaleoIdentityUserGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.general.user_organization import MaleoIdentityUserOrganizationGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.general.user_system_role import MaleoIdentityUserSystemRoleGeneralParametersTransfers
+from maleo_identity.models.transfers.parameters.general.user_organization_role import MaleoIdentityUserOrganizationRoleGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.client.user import MaleoIdentityUserClientParametersTransfers
 from maleo_identity.models.transfers.parameters.client.user_organization import MaleoIdentityUserOrganizationClientParametersTransfers
 from maleo_identity.models.transfers.parameters.client.user_system_role import MaleoIdentityUserSystemRoleClientParametersTransfers
+from maleo_identity.models.transfers.parameters.client.user_organization_role import MaleoIdentityUserOrganizationRoleClientParametersTransfers
 from maleo_identity.models.transfers.results.general.user import MaleoIdentityUserGeneralResultsTransfers
 from maleo_identity.models.transfers.results.general.user_organization import MaleoIdentityUserOrganizationGeneralResultsTransfers
 from maleo_identity.models.transfers.results.general.user_system_role import MaleoIdentityUserSystemRoleGeneralResultsTransfers
+from maleo_identity.models.transfers.results.general.user_organization_role import MaleoIdentityUserOrganizationRoleGeneralResultsTransfers
 from maleo_identity.types.results.client.user import MaleoIdentityUserClientResultsTypes
 from maleo_identity.types.results.client.user_organization import MaleoIdentityUserOrganizationClientResultsTypes
 from maleo_identity.types.results.client.user_system_role import MaleoIdentityUserSystemRoleClientResultsTypes
+from maleo_identity.types.results.client.user_organization_role import MaleoIdentityUserOrganizationRoleClientResultsTypes
 
 class MaleoIdentityUserClientService(ClientService):
     def __init__(self, logger, controllers:MaleoIdentityUserControllers):
@@ -169,7 +173,7 @@ class MaleoIdentityUserClientService(ClientService):
                 message = "Invalid controller type"
                 description = "The provided controller type did not exists"
                 return MaleoIdentityUserGeneralResultsTransfers.Fail(message=message, description=description)
-            #* Retrieve user using chosen controller
+            #* Retrieve user's password using chosen controller
             if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
                 controller_result = await self._controllers.http.get_password(parameters=parameters)
             else:
@@ -200,7 +204,7 @@ class MaleoIdentityUserClientService(ClientService):
                 message = "Invalid controller type"
                 description = "The provided controller type did not exists"
                 return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
-            #* Retrieve users using chosen controller
+            #* Retrieve user's organizations using chosen controller
             if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
                 controller_result = await self._controllers.http.get_user_organizations(parameters=parameters)
             else:
@@ -234,7 +238,7 @@ class MaleoIdentityUserClientService(ClientService):
                 message = "Invalid controller type"
                 description = "The provided controller type did not exists"
                 return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
-            #* Retrieve user using chosen controller
+            #* Retrieve user's organization using chosen controller
             if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
                 controller_result = await self._controllers.http.get_user_organization(parameters=parameters)
             else:
@@ -265,7 +269,7 @@ class MaleoIdentityUserClientService(ClientService):
                 message = "Invalid controller type"
                 description = "The provided controller type did not exists"
                 return MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail(message=message, description=description)
-            #* Retrieve users using chosen controller
+            #* Retrieve user's system roles using chosen controller
             if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
                 controller_result = await self._controllers.http.get_user_system_roles(parameters=parameters)
             else:
@@ -299,7 +303,7 @@ class MaleoIdentityUserClientService(ClientService):
                 message = "Invalid controller type"
                 description = "The provided controller type did not exists"
                 return MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail(message=message, description=description)
-            #* Retrieve user using chosen controller
+            #* Retrieve user's system role using chosen controller
             if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
                 controller_result = await self._controllers.http.get_user_system_role(parameters=parameters)
             else:
@@ -311,4 +315,69 @@ class MaleoIdentityUserClientService(ClientService):
                 return MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
             else:
                 return MaleoIdentityUserSystemRoleGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_user_organization_roles(
+        self,
+        parameters:MaleoIdentityUserOrganizationRoleClientParametersTransfers.GetMultipleFromUserOrOrganization,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityUserOrganizationRoleClientResultsTypes.GetMultiple:
+        """Retrieve user's organization roles from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving user's organization roles",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail
+        )
+        async def _impl():
+            #* Validate chosen controller type
+            if not isinstance(controller_type, MaleoIdentityGeneralEnums.ClientControllerType):
+                message = "Invalid controller type"
+                description = "The provided controller type did not exists"
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Retrieve user's organization roles using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_user_organization_roles(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                if controller_result.content["data"] is None:
+                    return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.NoData.model_validate(controller_result.content)
+                else:
+                    return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.MultipleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_user_organization_role(
+        self,
+        parameters:MaleoIdentityUserOrganizationRoleGeneralParametersTransfers.GetSingle,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityUserOrganizationClientResultsTypes.GetSingle:
+        """Retrieve user's organization role from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving user's organization role",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail
+        )
+        async def _impl():
+            #* Validate chosen controller type
+            if not isinstance(controller_type, MaleoIdentityGeneralEnums.ClientControllerType):
+                message = "Invalid controller type"
+                description = "The provided controller type did not exists"
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Retrieve user's organization role using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_user_organization_role(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                return MaleoIdentityUserOrganizationRoleGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
         return await _impl()

maleo_identity/constants/__init__.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
 from .organization import MaleoIdentityOrganizationConstants
+from .organization_role import MaleoIdentityOrganizationRoleConstants
 from .user import MaleoIdentityUserConstants
+from .user_organization_role import MaleoIdentityUserOrganizationRoleConstants
+from .user_organization import MaleoIdentityUserOrganizationConstants
 from .user_profile import MaleoIdentityUserProfileConstants
 from .user_system_role import MaleoIdentityUserSystemRoleConstants
-from .user_organization import MaleoIdentityUserOrganizationConstants
 
 class MaleoIdentityConstants:
     Organization = MaleoIdentityOrganizationConstants
+    OrganizationRole = MaleoIdentityOrganizationRoleConstants
     User = MaleoIdentityUserConstants
+    UserOrganizationRole = MaleoIdentityUserOrganizationRoleConstants
+    UserOrganization = MaleoIdentityUserOrganizationConstants
     UserProfile = MaleoIdentityUserProfileConstants
-    UserSystemRole = MaleoIdentityUserSystemRoleConstants
-    UserOrganization = MaleoIdentityUserOrganizationConstants
+    UserSystemRole = MaleoIdentityUserSystemRoleConstants

maleo_identity/constants/organization_role.py

@@ -0,0 +1,20 @@
+from typing import Dict, List
+from maleo_identity.enums.organization import MaleoIdentityOrganizationEnums
+from maleo_identity.enums.organization_role import MaleoIdentityOrganizationRoleEnums
+
+class MaleoIdentityOrganizationRoleConstants:
+    EXPANDABLE_FIELDS_DEPENDENCIES_MAP:Dict[
+        MaleoIdentityOrganizationRoleEnums.ExpandableFields,
+        List[MaleoIdentityOrganizationRoleEnums.ExpandableFields]
+    ] = {
+        MaleoIdentityOrganizationRoleEnums.ExpandableFields.ORGANIZATION: [
+            MaleoIdentityOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE
+        ]
+    }
+
+    ORGANIZATION_EXPANDABLE_FIELDS_MAP:Dict[
+        MaleoIdentityOrganizationRoleEnums.ExpandableFields,
+        MaleoIdentityOrganizationEnums.ExpandableFields
+    ] = {
+        MaleoIdentityOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE: MaleoIdentityOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE
+    }

maleo_identity/constants/user_organization_role.py

@@ -0,0 +1,31 @@
+from typing import Dict, List
+from maleo_identity.enums.user import MaleoIdentityUserEnums
+from maleo_identity.enums.organization import MaleoIdentityOrganizationEnums
+from maleo_identity.enums.user_organization_role import MaleoIdentityUserOrganizationRoleEnums
+
+class MaleoIdentityUserOrganizationRoleConstants:
+    EXPANDABLE_FIELDS_DEPENDENCIES_MAP:Dict[
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields,
+        List[MaleoIdentityUserOrganizationRoleEnums.ExpandableFields]
+    ] = {
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.USER: [
+            MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.USER_TYPE
+        ],
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.ORGANIZATION: [
+            MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE
+        ]
+    }
+
+    USER_EXPANDABLE_FIELDS_MAP:Dict[
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields,
+        MaleoIdentityUserEnums.ExpandableFields
+    ] = {
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.USER_TYPE: MaleoIdentityUserEnums.ExpandableFields.USER_TYPE
+    }
+
+    ORGANIZATION_EXPANDABLE_FIELDS_MAP:Dict[
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields,
+        MaleoIdentityOrganizationEnums.ExpandableFields
+    ] = {
+        MaleoIdentityUserOrganizationRoleEnums.ExpandableFields.ORGANIZATION_TYPE: MaleoIdentityOrganizationEnums.ExpandableFields.ORGANIZATION_TYPE
+    }

maleo_identity/enums/__init__.py

@@ -1,15 +1,19 @@
 from __future__ import annotations
 from .general import MaleoIdentityGeneralEnums
+from .organization_role import MaleoIdentityOrganizationRoleEnums
+from .organization import MaleoIdentityOrganizationEnums
+from .user_organization_role import MaleoIdentityUserOrganizationRoleEnums
+from .user_organization import MaleoIdentityUserOrganizationEnums
 from .user_profile import MaleoIdentityUserProfileEnums
 from .user_system_role import MaleoIdentityUserSystemRoleEnums
-from .user_organization import MaleoIdentityUserOrganizationEnums
-from .organization import MaleoIdentityOrganizationEnums
 from .user import MaleoIdentityUserEnums
 
 class MaleoIdentityEnums:
     General = MaleoIdentityGeneralEnums
+    OrganizationRole = MaleoIdentityOrganizationRoleEnums
+    Organization = MaleoIdentityOrganizationEnums
+    UserOrganizationRole = MaleoIdentityOrganizationRoleEnums
+    UserOrganization = MaleoIdentityUserOrganizationEnums
     UserProfile = MaleoIdentityUserProfileEnums
     UserSystemRole = MaleoIdentityUserSystemRoleEnums
-    UserOrganization = MaleoIdentityUserOrganizationEnums
-    Organization = MaleoIdentityOrganizationEnums
     User = MaleoIdentityUserEnums

maleo_identity/enums/organization_role.py

@@ -0,0 +1,6 @@
+from enum import StrEnum
+
+class MaleoIdentityOrganizationRoleEnums:
+    class ExpandableFields(StrEnum):
+        ORGANIZATION = "organization"
+        ORGANIZATION_TYPE = "organization.organization_type"

maleo_identity/enums/user_organization_role.py

@@ -0,0 +1,8 @@
+from enum import StrEnum
+
+class MaleoIdentityUserOrganizationRoleEnums:
+    class ExpandableFields(StrEnum):
+        USER = "user"
+        USER_TYPE = "user.user_type"
+        ORGANIZATION = "organization"
+        ORGANIZATION_TYPE = "organization.organization_type"

maleo_identity/models/responses/__init__.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
+from .organization_role import MaleoIdentityOrganizationRoleResponses
 from .organization import MaleoIdentityOrganizationResponses
-from .user import MaleoIdentityUserResponses
+from .user_organization_role import MaleoIdentityUserOrganizationRoleResponses
+from .user_organization import MaleoIdentityUserOrganizationResponses
 from .user_profile import MaleoIdentityUserProfileResponses
 from .user_system_role import MaleoIdentityUserSystemRoleResponses
-from .user_organization import MaleoIdentityUserOrganizationResponses
+from .user import MaleoIdentityUserResponses
 
 class MaleoIdentityResponses:
+    OrganizationRole = MaleoIdentityOrganizationRoleResponses
     Organization = MaleoIdentityOrganizationResponses
-    User = MaleoIdentityUserResponses
+    UserOrganizationRole = MaleoIdentityUserOrganizationRoleResponses
+    UserOrganization = MaleoIdentityUserOrganizationResponses
     UserProfile = MaleoIdentityUserProfileResponses
     UserSystemRole = MaleoIdentityUserSystemRoleResponses
-    UserOrganization = MaleoIdentityUserOrganizationResponses
+    User = MaleoIdentityUserResponses