server: remove user-project mappings when delete a project

Author: weizhouapache

engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDao.java

@@ -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);
 

engine/schema/src/main/java/com/cloud/projects/dao/ProjectAccountDaoImpl.java

@@ -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);

server/src/main/java/com/cloud/projects/ProjectManagerImpl.java

@@ -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;