Skip to content

Commit 119cc5f

Browse files
authored
Merge pull request #494 from kkdy21/fix/system-service
fix: delete update workspace user count function call on system init
2 parents 155201f + ac4316e commit 119cc5f

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

src/spaceone/identity/service/system_service.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ def init(self, params: SystemInitRequest) -> Union[SystemResponse, dict]:
129129
"domain_id": user_vo.domain_id,
130130
"role_type": role_vos[0].role_type,
131131
}
132-
rb_vo = role_binding_mgr.create_role_binding(params_rb)
133-
self._update_workspace_user_count(rb_vo.workspace_id, rb_vo.domain_id)
132+
role_binding_mgr.create_role_binding(params_rb)
134133

135134
system_token = system_mgr.create_system_token(
136135
root_domain_vo.domain_id, user_vo.user_id

src/spaceone/identity/service/user_service.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,16 +269,20 @@ def update(self, params: UserUpdateRequest) -> Union[UserResponse, dict]:
269269

270270
general_params = params.dict(
271271
exclude_unset=True,
272-
exclude={"reset_password", "enforce_mfa_state", "enforce_mfa_type"},
272+
exclude={
273+
"reset_password",
274+
"enforce_mfa_state",
275+
"enforce_mfa_type",
276+
"required_actions",
277+
},
273278
)
274279
update_user_vo.update(general_params)
275280

276281
user_vo = self.user_mgr.update_user_by_vo(update_user_vo, user_vo)
277282

278-
if update_require_actions != (set(required_actions)):
279-
user_vo = self.user_mgr.update_user_by_vo(
280-
{"required_actions": list(update_require_actions)}, user_vo
281-
)
283+
user_vo = self.user_mgr.update_user_by_vo(
284+
{"required_actions": list(update_require_actions)}, user_vo
285+
)
282286

283287
return UserResponse(**user_vo.to_dict())
284288

0 commit comments

Comments
 (0)