maleo-identity 0.0.10__py3-none-any.whl → 0.0.12__py3-none-any.whl

maleo_identity/client/controllers/http/organization.py

@@ -2,7 +2,9 @@ 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 import MaleoIdentityOrganizationGeneralParametersTransfers
+from maleo_identity.models.transfers.parameters.general.user_organization import MaleoIdentityUserOrganizationGeneralParametersTransfers
 from maleo_identity.models.transfers.parameters.client.organization import MaleoIdentityOrganizationClientParametersTransfers
+from maleo_identity.models.transfers.parameters.client.user_organization import MaleoIdentityUserOrganizationClientParametersTransfers
 
 class MaleoIdentityOrganizationHTTPController(MaleoClientHTTPController):
     async def get_organizations(self, parameters:MaleoIdentityOrganizationClientParametersTransfers.GetMultiple) -> BaseClientHTTPControllerResults:
@@ -73,4 +75,36 @@ class MaleoIdentityOrganizationHTTPController(MaleoClientHTTPController):
 
             #* Send request and wait for response
             response = await client.put(url=url, json=json, 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:
+            #* Define URL
+            url = f"{self._manager.url.api}/v1/organizations/{parameters.organization_id}/users/"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityUserOrganizationClientParametersTransfers.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_user(self, parameters:MaleoIdentityUserOrganizationGeneralParametersTransfers.GetSingle) -> BaseClientHTTPControllerResults:
+        """Get user's organization 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}"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityUserOrganizationGeneralParametersTransfers.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

@@ -2,8 +2,10 @@ 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.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.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
 
 class MaleoIdentityUserHTTPController(MaleoClientHTTPController):
@@ -118,6 +120,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_organizations(self, parameters:MaleoIdentityUserOrganizationClientParametersTransfers.GetMultipleFromUser) -> BaseClientHTTPControllerResults:
+        """Get user's organizations from MaleoIdentity"""
+        async with self._manager.get_client() as client:
+            #* Define URL
+            url = f"{self._manager.url.api}/v1/users/{parameters.user_id}/organizations/"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityUserOrganizationClientParametersTransfers.GetMultipleFromUserQuery.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(self, parameters:MaleoIdentityUserOrganizationGeneralParametersTransfers.GetSingle) -> BaseClientHTTPControllerResults:
+        """Get user's organization 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}"
+
+            #* Parse parameters to query params
+            params = MaleoIdentityUserOrganizationGeneralParametersTransfers.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

@@ -1,12 +1,15 @@
-from fastapi import status
 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 import MaleoIdentityOrganizationGeneralParametersTransfers
+from maleo_identity.models.transfers.parameters.general.user_organization import MaleoIdentityUserOrganizationGeneralParametersTransfers
 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.results.general.organization import MaleoIdentityOrganizationGeneralResultsTransfers
-from maleo_identity.types.results.general.organization import MaleoIdentityOrganizationGeneralResultsTypes
+from maleo_identity.models.transfers.results.general.user_organization import MaleoIdentityUserOrganizationGeneralResultsTransfers
+from maleo_identity.types.results.client.organization import MaleoIdentityOrganizationClientResultsTypes
+from maleo_identity.types.results.client.user_organization import MaleoIdentityUserOrganizationClientResultsTypes
 
 class MaleoIdentityOrganizationClientService(ClientService):
     def __init__(self, logger, controllers:MaleoIdentityOrganizationControllers):
@@ -21,7 +24,7 @@ class MaleoIdentityOrganizationClientService(ClientService):
         self,
         parameters:MaleoIdentityOrganizationClientParametersTransfers.GetMultiple,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityOrganizationGeneralResultsTypes.GetMultiple:
+    ) -> MaleoIdentityOrganizationClientResultsTypes.GetMultiple:
         """Retrieve organizations from MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="retrieving organizations",
@@ -55,7 +58,7 @@ class MaleoIdentityOrganizationClientService(ClientService):
         self,
         parameters:MaleoIdentityOrganizationGeneralParametersTransfers.GetSingle,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityOrganizationGeneralResultsTypes.GetSingle:
+    ) -> MaleoIdentityOrganizationClientResultsTypes.GetSingle:
         """Retrieve organization from MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="retrieving organization",
@@ -77,11 +80,7 @@ class MaleoIdentityOrganizationClientService(ClientService):
                 return MaleoIdentityOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
             #* Return proper response
             if not controller_result.success:
-                if controller_result.status_code != status.HTTP_404_NOT_FOUND:
-                    return MaleoIdentityOrganizationGeneralResultsTransfers.Fail.model_validate(controller_result.content)
-                else:
-                    controller_result.content["success"] = True
-                    return MaleoIdentityOrganizationGeneralResultsTransfers.NoData.model_validate(controller_result.content)
+                return MaleoIdentityOrganizationGeneralResultsTransfers.Fail.model_validate(controller_result.content)
             else:
                 return MaleoIdentityOrganizationGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
         return await _impl()
@@ -90,7 +89,7 @@ class MaleoIdentityOrganizationClientService(ClientService):
         self,
         parameters:MaleoIdentityOrganizationGeneralParametersTransfers.Create,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityOrganizationGeneralResultsTypes.CreateOrUpdate:
+    ) -> MaleoIdentityOrganizationClientResultsTypes.CreateOrUpdate:
         """Create a new organization in MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="creating a new organization",
@@ -121,7 +120,7 @@ class MaleoIdentityOrganizationClientService(ClientService):
         self,
         parameters:MaleoIdentityOrganizationGeneralParametersTransfers.Update,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityOrganizationGeneralResultsTypes.CreateOrUpdate:
+    ) -> MaleoIdentityOrganizationClientResultsTypes.CreateOrUpdate:
         """Update organization's data in MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="updating organization's data",
@@ -146,4 +145,69 @@ class MaleoIdentityOrganizationClientService(ClientService):
                 return MaleoIdentityOrganizationGeneralResultsTransfers.Fail.model_validate(controller_result.content)
             else:
                 return MaleoIdentityOrganizationGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_organization_users(
+        self,
+        parameters:MaleoIdentityUserOrganizationClientParametersTransfers.GetMultipleFromOrganization,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityUserOrganizationClientResultsTypes.GetMultiple:
+        """Retrieve organization's users from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving organization's users",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityUserOrganizationGeneralResultsTransfers.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 MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Update organization's data using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_organization_users(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                if controller_result.content["data"] is None:
+                    return MaleoIdentityUserOrganizationGeneralResultsTransfers.NoData.model_validate(controller_result.content)
+                else:
+                    return MaleoIdentityUserOrganizationGeneralResultsTransfers.MultipleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_organization_user(
+        self,
+        parameters:MaleoIdentityUserOrganizationGeneralParametersTransfers.GetSingle,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityUserOrganizationClientResultsTypes.GetSingle:
+        """Retrieve organization's user from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving organization's user",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityUserOrganizationGeneralResultsTransfers.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 MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Update organization's data using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_organization_user(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
         return await _impl()

maleo_identity/client/services/user.py

@@ -4,13 +4,17 @@ from maleo_foundation.utils.exceptions import BaseExceptions
 from maleo_identity.client.controllers import MaleoIdentityUserControllers
 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.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.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.types.results.general.user import MaleoIdentityUserGeneralResultsTypes
-from maleo_identity.types.results.general.user_system_role import MaleoIdentityUserSystemRoleGeneralResultsTypes
+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
 
 class MaleoIdentityUserClientService(ClientService):
     def __init__(self, logger, controllers:MaleoIdentityUserControllers):
@@ -25,7 +29,7 @@ class MaleoIdentityUserClientService(ClientService):
         self,
         parameters:MaleoIdentityUserClientParametersTransfers.GetMultiple,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityUserGeneralResultsTypes.GetMultiple:
+    ) -> MaleoIdentityUserClientResultsTypes.GetMultiple:
         """Retrieve users from MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="retrieving users",
@@ -59,7 +63,7 @@ class MaleoIdentityUserClientService(ClientService):
         self,
         parameters:MaleoIdentityUserGeneralParametersTransfers.GetSingle,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityUserGeneralResultsTypes.GetSingle:
+    ) -> MaleoIdentityUserClientResultsTypes.GetSingle:
         """Retrieve user from MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="retrieving user",
@@ -81,11 +85,7 @@ class MaleoIdentityUserClientService(ClientService):
                 return MaleoIdentityUserGeneralResultsTransfers.Fail(message=message, description=description)
             #* Return proper response
             if not controller_result.success:
-                if controller_result.status_code != status.HTTP_404_NOT_FOUND:
-                    return MaleoIdentityUserGeneralResultsTransfers.Fail.model_validate(controller_result.content)
-                else:
-                    controller_result.content["success"] = True
-                    return MaleoIdentityUserGeneralResultsTransfers.NoData.model_validate(controller_result.content)
+                return MaleoIdentityUserGeneralResultsTransfers.Fail.model_validate(controller_result.content)
             else:
                 return MaleoIdentityUserGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
         return await _impl()
@@ -94,7 +94,7 @@ class MaleoIdentityUserClientService(ClientService):
         self,
         parameters:MaleoIdentityUserGeneralParametersTransfers.Create,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityUserGeneralResultsTypes.CreateOrUpdate:
+    ) -> MaleoIdentityUserClientResultsTypes.CreateOrUpdate:
         """Create a new user in MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="creating a new user",
@@ -125,7 +125,7 @@ class MaleoIdentityUserClientService(ClientService):
         self,
         parameters:MaleoIdentityUserGeneralParametersTransfers.Update,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityUserGeneralResultsTypes.CreateOrUpdate:
+    ) -> MaleoIdentityUserClientResultsTypes.CreateOrUpdate:
         """Update user's data in MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="updating user's data",
@@ -156,7 +156,7 @@ class MaleoIdentityUserClientService(ClientService):
         self,
         parameters:MaleoIdentityUserGeneralParametersTransfers.GetSinglePassword,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityUserGeneralResultsTypes.GetSinglePassword:
+    ) -> MaleoIdentityUserClientResultsTypes.GetSinglePassword:
         """Retrieve user's password from MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="retrieving user's password",
@@ -183,11 +183,76 @@ class MaleoIdentityUserClientService(ClientService):
                 return MaleoIdentityUserGeneralResultsTransfers.SinglePassword.model_validate(controller_result.content)
         return await _impl()
 
+    async def get_user_organizations(
+        self,
+        parameters:MaleoIdentityUserOrganizationClientParametersTransfers.GetMultipleFromUser,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityUserOrganizationClientResultsTypes.GetMultiple:
+        """Retrieve user's organizations from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving user's organizations",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityUserOrganizationGeneralResultsTransfers.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 MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Retrieve users using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_user_organizations(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                if controller_result.content["data"] is None:
+                    return MaleoIdentityUserOrganizationGeneralResultsTransfers.NoData.model_validate(controller_result.content)
+                else:
+                    return MaleoIdentityUserOrganizationGeneralResultsTransfers.MultipleData.model_validate(controller_result.content)
+        return await _impl()
+
+    async def get_user_organization(
+        self,
+        parameters:MaleoIdentityUserOrganizationGeneralParametersTransfers.GetSingle,
+        controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
+    ) -> MaleoIdentityUserOrganizationClientResultsTypes.GetSingle:
+        """Retrieve user's organization from MaleoIdentity"""
+        @BaseExceptions.service_exception_handler(
+            operation="retrieving user's organization",
+            logger=self._logger,
+            fail_result_class=MaleoIdentityUserOrganizationGeneralResultsTransfers.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 MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Retrieve user using chosen controller
+            if controller_type == MaleoIdentityGeneralEnums.ClientControllerType.HTTP:
+                controller_result = await self._controllers.http.get_user_organization(parameters=parameters)
+            else:
+                message = "Invalid controller type"
+                description = "The provided controller type has not been implemented"
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail(message=message, description=description)
+            #* Return proper response
+            if not controller_result.success:
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail.model_validate(controller_result.content)
+            else:
+                return MaleoIdentityUserOrganizationGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
+        return await _impl()
+
     async def get_user_system_roles(
         self,
         parameters:MaleoIdentityUserSystemRoleClientParametersTransfers.GetMultipleFromUser,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityUserSystemRoleGeneralResultsTypes.GetMultiple:
+    ) -> MaleoIdentityUserSystemRoleClientResultsTypes.GetMultiple:
         """Retrieve user's system roles from MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="retrieving user's system roles",
@@ -221,7 +286,7 @@ class MaleoIdentityUserClientService(ClientService):
         self,
         parameters:MaleoIdentityUserSystemRoleGeneralParametersTransfers.GetSingle,
         controller_type:MaleoIdentityGeneralEnums.ClientControllerType = MaleoIdentityGeneralEnums.ClientControllerType.HTTP
-    ) -> MaleoIdentityUserSystemRoleGeneralResultsTypes.GetSingle:
+    ) -> MaleoIdentityUserSystemRoleClientResultsTypes.GetSingle:
         """Retrieve user's system role from MaleoIdentity"""
         @BaseExceptions.service_exception_handler(
             operation="retrieving user's system role",
@@ -243,11 +308,7 @@ class MaleoIdentityUserClientService(ClientService):
                 return MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail(message=message, description=description)
             #* Return proper response
             if not controller_result.success:
-                if controller_result.status_code != status.HTTP_404_NOT_FOUND:
-                    return MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
-                else:
-                    controller_result.content["success"] = True
-                    return MaleoIdentityUserSystemRoleGeneralResultsTransfers.NoData.model_validate(controller_result.content)
+                return MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail.model_validate(controller_result.content)
             else:
                 return MaleoIdentityUserSystemRoleGeneralResultsTransfers.SingleData.model_validate(controller_result.content)
         return await _impl()

maleo_identity/models/transfers/parameters/client/user_organization.py

@@ -24,6 +24,18 @@ class MaleoIdentityUserOrganizationClientParametersTransfers:
         BaseClientParametersTransfers.GetPaginatedMultiple
     ): pass
 
+    class GetMultipleFromUserQuery(
+        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId,
+        BaseClientParametersTransfers.GetPaginatedMultipleQuery
+    ): pass
+
+    class GetMultipleFromOrganizationQuery(
+        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfUserId,
+        BaseClientParametersTransfers.GetPaginatedMultipleQuery
+    ): pass
+
     class GetMultipleQuery(
         MaleoIdentityUserOrganizationGeneralSchemas.Expand,
         MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId,

maleo_identity/types/results/__init__.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 from .general import MaleoIdentityGeneralResultsTypes
 from .query import MaleoIdentityQueryResultsTypes
+from .client import MaleoIdentityClientResultsTypes
 
 class MaleoIdentityResultsTypes:
     General = MaleoIdentityGeneralResultsTypes
-    Query = MaleoIdentityQueryResultsTypes
+    Query = MaleoIdentityQueryResultsTypes
+    Client = MaleoIdentityClientResultsTypes

maleo_identity/types/results/client/__init__.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+from .organization import MaleoIdentityOrganizationClientResultsTypes
+from .user import MaleoIdentityUserClientResultsTypes
+from .user_profile import MaleoIdentityUserProfileClientResultsTypes
+from .user_system_role import MaleoIdentityUserSystemRoleClientResultsTypes
+from .user_organization import MaleoIdentityUserOrganizationClientResultsTypes
+
+class MaleoIdentityClientResultsTypes:
+    Organization = MaleoIdentityOrganizationClientResultsTypes
+    User = MaleoIdentityUserClientResultsTypes
+    UserProfile = MaleoIdentityUserProfileClientResultsTypes
+    UserSystemRole = MaleoIdentityUserSystemRoleClientResultsTypes
+    UserOrganization = MaleoIdentityUserOrganizationClientResultsTypes

maleo_identity/types/results/client/organization.py

@@ -0,0 +1,19 @@
+from typing import Union
+from maleo_identity.models.transfers.results.general.organization import MaleoIdentityOrganizationGeneralResultsTransfers
+
+class MaleoIdentityOrganizationClientResultsTypes:
+    GetMultiple = Union[
+        MaleoIdentityOrganizationGeneralResultsTransfers.Fail,
+        MaleoIdentityOrganizationGeneralResultsTransfers.NoData,
+        MaleoIdentityOrganizationGeneralResultsTransfers.MultipleData
+    ]
+
+    GetSingle = Union[
+        MaleoIdentityOrganizationGeneralResultsTransfers.Fail,
+        MaleoIdentityOrganizationGeneralResultsTransfers.SingleData
+    ]
+
+    CreateOrUpdate = Union[
+        MaleoIdentityOrganizationGeneralResultsTransfers.Fail,
+        MaleoIdentityOrganizationGeneralResultsTransfers.SingleData
+    ]

maleo_identity/types/results/client/user.py

@@ -0,0 +1,24 @@
+from typing import Union
+from maleo_identity.models.transfers.results.general.user import MaleoIdentityUserGeneralResultsTransfers
+
+class MaleoIdentityUserClientResultsTypes:
+    GetMultiple = Union[
+        MaleoIdentityUserGeneralResultsTransfers.Fail,
+        MaleoIdentityUserGeneralResultsTransfers.NoData,
+        MaleoIdentityUserGeneralResultsTransfers.MultipleData
+    ]
+
+    GetSingle = Union[
+        MaleoIdentityUserGeneralResultsTransfers.Fail,
+        MaleoIdentityUserGeneralResultsTransfers.SingleData
+    ]
+
+    CreateOrUpdate = Union[
+        MaleoIdentityUserGeneralResultsTransfers.Fail,
+        MaleoIdentityUserGeneralResultsTransfers.SingleData
+    ]
+
+    GetSinglePassword = Union[
+        MaleoIdentityUserGeneralResultsTransfers.Fail,
+        MaleoIdentityUserGeneralResultsTransfers.SinglePassword
+    ]

maleo_identity/types/results/client/user_organization.py

@@ -0,0 +1,19 @@
+from typing import Union
+from maleo_identity.models.transfers.results.general.user_organization import MaleoIdentityUserOrganizationGeneralResultsTransfers
+
+class MaleoIdentityUserOrganizationClientResultsTypes:
+    GetMultiple = Union[
+        MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail,
+        MaleoIdentityUserOrganizationGeneralResultsTransfers.NoData,
+        MaleoIdentityUserOrganizationGeneralResultsTransfers.MultipleData
+    ]
+
+    GetSingle = Union[
+        MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail,
+        MaleoIdentityUserOrganizationGeneralResultsTransfers.SingleData
+    ]
+
+    Create = Union[
+        MaleoIdentityUserOrganizationGeneralResultsTransfers.Fail,
+        MaleoIdentityUserOrganizationGeneralResultsTransfers.SingleData
+    ]

maleo_identity/types/results/client/user_profile.py

@@ -0,0 +1,19 @@
+from typing import Union
+from maleo_identity.models.transfers.results.general.user_profile import MaleoIdentityUserProfileGeneralResultsTransfers
+
+class MaleoIdentityUserProfileClientResultsTypes:
+    GetMultiple = Union[
+        MaleoIdentityUserProfileGeneralResultsTransfers.Fail,
+        MaleoIdentityUserProfileGeneralResultsTransfers.NoData,
+        MaleoIdentityUserProfileGeneralResultsTransfers.MultipleData
+    ]
+
+    GetSingle = Union[
+        MaleoIdentityUserProfileGeneralResultsTransfers.Fail,
+        MaleoIdentityUserProfileGeneralResultsTransfers.SingleData
+    ]
+
+    CreateOrUpdate = Union[
+        MaleoIdentityUserProfileGeneralResultsTransfers.Fail,
+        MaleoIdentityUserProfileGeneralResultsTransfers.SingleData
+    ]

maleo_identity/types/results/client/user_system_role.py

@@ -0,0 +1,19 @@
+from typing import Union
+from maleo_identity.models.transfers.results.general.user_system_role import MaleoIdentityUserSystemRoleGeneralResultsTransfers
+
+class MaleoIdentityUserSystemRoleClientResultsTypes:
+    GetMultiple = Union[
+        MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail,
+        MaleoIdentityUserSystemRoleGeneralResultsTransfers.NoData,
+        MaleoIdentityUserSystemRoleGeneralResultsTransfers.MultipleData
+    ]
+
+    GetSingle = Union[
+        MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail,
+        MaleoIdentityUserSystemRoleGeneralResultsTransfers.SingleData
+    ]
+
+    Create = Union[
+        MaleoIdentityUserSystemRoleGeneralResultsTransfers.Fail,
+        MaleoIdentityUserSystemRoleGeneralResultsTransfers.SingleData
+    ]

{maleo_identity-0.0.10.dist-info → maleo_identity-0.0.12.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.0.10
+Version: 0.0.12
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: maleo_foundation>=0.1.92
-Requires-Dist: maleo_metadata>=0.0.64
+Requires-Dist: maleo_metadata>=0.0.65
 
 # README #
 

{maleo_identity-0.0.10.dist-info → maleo_identity-0.0.12.dist-info}/RECORD

@@ -4,11 +4,11 @@ maleo_identity/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 maleo_identity/client/manager.py,sha256=CZHz2E7EyrJt-cDklCC37xIIyVPcrGbfLChze8OiOgk,2636
 maleo_identity/client/controllers/__init__.py,sha256=Kln0lR4EAnHsHaFWNEQBlOGH-hDiY_8KJdPq86msvA0,927
 maleo_identity/client/controllers/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo_identity/client/controllers/http/organization.py,sha256=k55EjiUAd2dTRe5Zg37fXbh1iXEa6miSI8HXpY7eBps,4435
-maleo_identity/client/controllers/http/user.py,sha256=hxt7YYETu-gyT-tOkLvmTEFbgfPpVSh5qiTn-wYS2O0,6949
+maleo_identity/client/controllers/http/organization.py,sha256=eJs_7qx9md_UjcDZfRy2FiyRDsvaiFm87yhdHAabv9M,6553
+maleo_identity/client/controllers/http/user.py,sha256=ifaOciZYGkmGSN4uAbPt97ujL0xVuQmI8G24ddP9-B0,9043
 maleo_identity/client/services/__init__.py,sha256=52SEvH0DQUnTCGQIqRfdy-nnnOP1CXxxh4Zakzl5-W8,536
-maleo_identity/client/services/organization.py,sha256=UZkVZ9DEIjPdThW_kzBF51vcKCPcA425nR6QcdmSE5A,9303
-maleo_identity/client/services/user.py,sha256=z31oPvfJ6mSsMf0zBTX2u6xoOkGgCFRbH_LkmtbqZvU,15644
+maleo_identity/client/services/organization.py,sha256=vz2nY5LztwRBx1aJNyMESy8QpyDMutllKY7X1HMUv4M,13689
+maleo_identity/client/services/user.py,sha256=TpBlHwguBYeRZnVYkaTWt-R-ou22vs-Cw_167R1y4lQ,19731
 maleo_identity/constants/__init__.py,sha256=g1zbxRrikSN_3GzxDTUQF-g5epTSLeoXH7iPHjyHQTE,632
 maleo_identity/constants/organization.py,sha256=M5STqi5WMtT6kfNbB4BnQ1gEdQvU-l9dc9MiJCKzO_o,484
 maleo_identity/constants/user.py,sha256=ye4oK5oDaDR4iJOERj9bQ-XcWjVAVAmXJpR8McXmFLc,1383
@@ -65,7 +65,7 @@ maleo_identity/models/transfers/parameters/__init__.py,sha256=ysazhGlRoT9kY_L_gr
 maleo_identity/models/transfers/parameters/client/__init__.py,sha256=5CXqAUODAPcskCiwWqeSMvu1L09034IE-t-YqRRSsZ8,808
 maleo_identity/models/transfers/parameters/client/organization.py,sha256=h-iOTTPtuYdBLnsuhZ-rlMyk0tfdyYiAWG7GRCps1UM,1065
 maleo_identity/models/transfers/parameters/client/user.py,sha256=ntPf_E5gw4f_eL4sRgeRF_AZcjNoBTM8KWDIN02pB3c,1298
-maleo_identity/models/transfers/parameters/client/user_organization.py,sha256=20D8eKHEVcKW2NszfnaevDDG1_XS8RpalYf2z8n6EwM,1556
+maleo_identity/models/transfers/parameters/client/user_organization.py,sha256=9Vin2d8jrTDtnTwSD7lQDaWi5aAbtGlGbnkUmGaSXSI,2066
 maleo_identity/models/transfers/parameters/client/user_profile.py,sha256=KB5_Ado_JAVYaSAPyqS00TSnrgbCkCE6yKYhe4NLb58,1224
 maleo_identity/models/transfers/parameters/client/user_system_role.py,sha256=olEv7xSsej7jwuESoQ6qSK5cPRgGIhK6svamYjV_5ns,1569
 maleo_identity/models/transfers/parameters/general/__init__.py,sha256=VOslVmijMHB9aot1QZom6Ug7prr9gGJ7FQvXrfADIBw,819
@@ -94,7 +94,13 @@ maleo_identity/models/transfers/results/query/user_organization.py,sha256=easdO0
 maleo_identity/models/transfers/results/query/user_profile.py,sha256=LxuG_x3jTXtQ3Iw4Ffc1Xv_Cv7OMt4lDNqh4MyHnaYU,824
 maleo_identity/models/transfers/results/query/user_system_role.py,sha256=9j6o48GtLNyirnxCz-sM3CaX_jiGyBNy5AWOH_cKTeo,842
 maleo_identity/types/__init__.py,sha256=U6YJOUefzuJjISnFXE6j7gzQvrZEAHboW3t8Ezgty94,148
-maleo_identity/types/results/__init__.py,sha256=zI6HD5dMpZfFJdPyNOL4-ewyAmBXHCInOWE64nC24m8,262
+maleo_identity/types/results/__init__.py,sha256=Bru0muO5iXb5vfyB8yPvolXe8Ao5wksx1-lizJbk5Ts,359
+maleo_identity/types/results/client/__init__.py,sha256=rm0x6L7s6FEcNLsgfuEgWEVioykOk98IDyMvFyJHibw,731
+maleo_identity/types/results/client/organization.py,sha256=Nj22DnZl_Vs4ZjGI5xcfymn4s-HvzNqOwj2H9lWVkFU,754
+maleo_identity/types/results/client/user.py,sha256=gRznLZdk2zwsnk3SBC0T_RksnsIOc_7qBzePcuoxI3M,831
+maleo_identity/types/results/client/user_organization.py,sha256=YiWdgVbuNeKiEpT8iZXufno1JSumK97xACLDFZUdDp0,787
+maleo_identity/types/results/client/user_profile.py,sha256=eOD_W8cFogI5rXXTBSvjknOb6DJYhkuSt0ck0qJGPVI,745
+maleo_identity/types/results/client/user_system_role.py,sha256=SqJd5ZlolyL3dgVNButz5GsvYgPBYAMMn4PUWbHgAvY,768
 maleo_identity/types/results/general/__init__.py,sha256=fBh243KjiAsbTrHfR9IX59dv1i-R96oVAfY0_ZRDu8k,742
 maleo_identity/types/results/general/organization.py,sha256=_1lIf9ds756m7uMXToxHX0HA-Qha6E3yMmcG1Ei9XC4,820
 maleo_identity/types/results/general/user.py,sha256=2raDahxVdE9rcpwJrj3LmHUWQUwQNVbXR-pOCOI_aCg,889
@@ -107,7 +113,7 @@ maleo_identity/types/results/query/user.py,sha256=SNgSJEOD3ZAdflkgPz47vVDYuTxtYV
 maleo_identity/types/results/query/user_organization.py,sha256=5_YbwX6s9l1uYbLMZmlVg5EiP_5_RvUKRkRdbBFzLWo,835
 maleo_identity/types/results/query/user_profile.py,sha256=Tz960UKJa17fYxaS5_Ju2iqVj5b1F07ZkgXsshWqX0E,788
 maleo_identity/types/results/query/user_system_role.py,sha256=U5PgAv3B-g_5d852pi-9GdZy9sCkl0TgSdOgsEsRk-Q,814
-maleo_identity-0.0.10.dist-info/METADATA,sha256=zRotxwb33O1-ovt-iZY4h1CBXm-y4_01HuHQECMGZEc,868
-maleo_identity-0.0.10.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-maleo_identity-0.0.10.dist-info/top_level.txt,sha256=mQENoRr7CBU3vx2PxHXywCHdfBm3AIzVx75IaEsArYE,15
-maleo_identity-0.0.10.dist-info/RECORD,,
+maleo_identity-0.0.12.dist-info/METADATA,sha256=ltvOhzhDMsROjPayUosFgCmRPo2GTl4wj16wwzIYGKg,868
+maleo_identity-0.0.12.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+maleo_identity-0.0.12.dist-info/top_level.txt,sha256=mQENoRr7CBU3vx2PxHXywCHdfBm3AIzVx75IaEsArYE,15
+maleo_identity-0.0.12.dist-info/RECORD,,