Merge pull request #5402 from arjavdongaonkar/fix/team-delete

Signed-off-by: Arjav <arjavdongaonkar@gmail.com>

src/main/java/org/dependencytrack/persistence/ProjectQueryManager.java

@@ -1074,6 +1074,12 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
                 );
                 executeAndCloseWithArray(sqlQuery, queryParameter);
 
+                sqlQuery = pm.newQuery(JDOQuery.SQL_QUERY_LANGUAGE, """
+                    DELETE FROM "POLICYVIOLATION" WHERE "PROJECT_ID" = ANY(?);
+                    """.replace("= ANY(?)", inExpression)
+                );
+                executeAndCloseWithArray(sqlQuery, queryParameter);
+
                 // Deletion with CTEs does not work with H2, but verified on Postgres and MS SQL Server
                 if (!DbUtil.isH2()) {
                     if (DbUtil.isPostgreSQL()) {
@@ -1186,12 +1192,6 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
                 );
                 executeAndCloseWithArray(sqlQuery, queryParameter);
 
-                sqlQuery = pm.newQuery(JDOQuery.SQL_QUERY_LANGUAGE, """
-                    DELETE FROM "POLICYVIOLATION" WHERE "PROJECT_ID" = ANY(?);
-                    """.replace("= ANY(?)", inExpression)
-                );
-                executeAndCloseWithArray(sqlQuery, queryParameter);
-
                 sqlQuery = pm.newQuery(JDOQuery.SQL_QUERY_LANGUAGE, """
                     DELETE FROM "POLICY_PROJECTS" WHERE "PROJECT_ID" = ANY(?);
                     """.replace("= ANY(?)", inExpression)

src/main/java/org/dependencytrack/persistence/QueryManager.java

@@ -1542,6 +1542,10 @@ public class QueryManager extends AlpineQueryManager {
                 final Query<?> aclDeleteQuery = pm.newQuery(JDOQuery.SQL_QUERY_LANGUAGE, """
                         DELETE FROM "PROJECT_ACCESS_TEAMS" WHERE "PROJECT_ACCESS_TEAMS"."TEAM_ID" = ?""");
                 executeAndCloseWithArray(aclDeleteQuery, team.getId());
+
+                final Query<?> notificationRuleQuery = pm.newQuery(JDOQuery.SQL_QUERY_LANGUAGE, """
+                    DELETE FROM "NOTIFICATIONRULE_TEAMS" WHERE "NOTIFICATIONRULE_TEAMS"."TEAM_ID" = ?""");
+                executeAndCloseWithArray(notificationRuleQuery, team.getId());
             }
 
             pm.deletePersistent(team);