Skip to content

Commit ba7f356

Browse files
fregataaclaude
andcommitted
revert(BA-3696): Restore DeleteUserAction to main state
Revert DeleteUserAction and DeleteUserActionResult back to their original main branch definitions (simple UserAction/BaseActionResult base classes with email-only parameter). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 2b8c04c commit ba7f356

2 files changed

Lines changed: 11 additions & 28 deletions

File tree

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,27 @@
11
from dataclasses import dataclass
22
from typing import override
3-
from uuid import UUID
43

5-
from ai.backend.common.data.permission.types import RBACElementType
4+
from ai.backend.manager.actions.action import BaseActionResult
65
from ai.backend.manager.actions.types import ActionOperationType
7-
from ai.backend.manager.data.permission.types import RBACElementRef
8-
from ai.backend.manager.services.user.actions.base import (
9-
UserSingleEntityAction,
10-
UserSingleEntityActionResult,
11-
)
6+
from ai.backend.manager.services.user.actions.base import UserAction
127

138

149
@dataclass
15-
class DeleteUserAction(UserSingleEntityAction):
16-
user_uuid: UUID
17-
email: str # Still needed for the service layer implementation
10+
class DeleteUserAction(UserAction):
11+
email: str
12+
13+
@override
14+
def entity_id(self) -> str | None:
15+
return None
1816

1917
@override
2018
@classmethod
2119
def operation_type(cls) -> ActionOperationType:
2220
return ActionOperationType.DELETE
2321

24-
@override
25-
def target_entity_id(self) -> str:
26-
return str(self.user_uuid)
27-
28-
@override
29-
def target_element(self) -> RBACElementRef:
30-
return RBACElementRef(RBACElementType.USER, str(self.user_uuid))
31-
3222

3323
@dataclass
34-
class DeleteUserActionResult(UserSingleEntityActionResult):
35-
user_uuid: UUID
36-
24+
class DeleteUserActionResult(BaseActionResult):
3725
@override
3826
def entity_id(self) -> str | None:
39-
return str(self.user_uuid)
40-
41-
@override
42-
def target_entity_id(self) -> str:
43-
return str(self.user_uuid)
27+
return None

src/ai/backend/manager/services/user/service.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,10 @@ async def bulk_modify_users(self, action: BulkModifyUserAction) -> BulkModifyUse
122122
return BulkModifyUserActionResult(data=result)
123123

124124
async def delete_user(self, action: DeleteUserAction) -> DeleteUserActionResult:
125-
user_data = await self._user_repository.get_by_email_validated(email=action.email)
126125
await self._user_repository.soft_delete_user_validated(
127126
email=action.email,
128127
)
129-
return DeleteUserActionResult(user_uuid=user_data.uuid)
128+
return DeleteUserActionResult()
130129

131130
async def get_user(self, action: GetUserAction) -> GetUserActionResult:
132131
"""Retrieve a single user by UUID.

0 commit comments

Comments
 (0)