Skip to content

server: remove user-project mappings when delete a project #14150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weizhouapache wants to merge 1 commit into
base: 4.20
Choose a base branch
from
Open

server: remove user-project mappings when delete a project #14150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public interface ProjectAccountDao extends GenericDao<ProjectAccountVO, Long> {

ProjectAccountVO findByProjectIdAccountId(long projectId, long accountId);

ProjectAccountVO findByProjectIdUserId(long projectId, long accountId, long userId);
ProjectAccountVO findByProjectIdUserId(long projectId, long accountId, Long userId);

boolean canUserAccessProjectAccount(long accountId, long userId, long projectAccountId);

Expand Down
6 changes: 4 additions & 2 deletions engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ public ProjectAccountVO findByProjectIdAccountId(long projectId, long accountId)
}

@Override
public ProjectAccountVO findByProjectIdUserId(long projectId, long accountId, long userId) {
public ProjectAccountVO findByProjectIdUserId(long projectId, long accountId, Long userId) {
SearchCriteria<ProjectAccountVO> sc = AllFieldsSearch.create();
sc.setParameters("projectId", projectId);
sc.setParameters("userId", userId);
if (userId != null) {
sc.setParameters("userId", userId);
}
sc.setParameters("accountId", accountId);

return findOneBy(sc);
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/projects/ProjectManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ public Boolean doInTransaction(TransactionStatus status) {

@Override
public boolean unassignAccountFromProject(long projectId, long accountId) {
ProjectAccountVO projectAccount = _projectAccountDao.findByProjectIdAccountId(projectId, accountId);
ProjectAccountVO projectAccount = _projectAccountDao.findByProjectIdUserId(projectId, accountId, null);
if (projectAccount == null) {
logger.debug("Account id=" + accountId + " is not assigned to project id=" + projectId + " so no need to unassign");
return true;
Expand Down
Loading