Add back missing changes from #10008 to 4.23

engine/schema/src/main/resources/META-INF/db/schema-42210to42300-cleanup.sql

@@ -18,3 +18,6 @@
 --;
 -- Schema upgrade cleanup from 4.22.1.0 to 4.23.0.0
 --;
+
+-- Delete `project_account` entries for users that were removed
+DELETE FROM `cloud`.`project_account` WHERE `user_id` IN (SELECT `id` FROM `cloud`.`user` WHERE `removed`);

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -2521,9 +2521,16 @@ public boolean deleteUser(DeleteUserCmd deleteUserCmd) {
         checkAccountAndAccess(user, account);
         verifyCallerPrivilegeForUserOrAccountOperations(user);
 
-        removeUserApiKeys(id);
+        return Transaction.execute((TransactionCallback<Boolean>) status -> deleteAndCleanupUser(user));
+    }
+
+    protected boolean deleteAndCleanupUser(User user) {
+        long userId = user.getId();
+
+        removeUserApiKeys(userId);
+        _projectAccountDao.removeUserFromProjects(userId);
 
-        return _userDao.remove(id);
+        return _userDao.remove(userId);
     }
 
     @Override

server/src/test/java/com/cloud/user/AccountManagerImplTest.java

@@ -2131,4 +2131,16 @@ public void testCreateUserSuccess() {
         );
         Assert.assertNotNull(userResultVO);
     }
+
+    @Test
+    public void deleteAndCleanupUserTestUserCleanup() {
+        long userId = userVoMock.getId();
+        Mockito.doNothing().when(accountManagerImpl).removeUserApiKeys(userId);
+        Mockito.doNothing().when(_projectAccountDao).removeUserFromProjects(userId);
+
+        accountManagerImpl.deleteAndCleanupUser(userVoMock);
+
+        Mockito.verify(accountManagerImpl).removeUserApiKeys(userId);
+        Mockito.verify(_projectAccountDao).removeUserFromProjects(userId);
+    }
 }