fetch parent before deciding on metrics update

Signed-off-by: Valentijn Scholten <valentijnscholten@gmail.com>

Author: valentijnscholten

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

@@ -516,9 +516,16 @@ public Project updateProject(Project transientProject, boolean commitIndex) {
         final Project project = getObjectByUuid(Project.class, transientProject.getUuid());
 
         Project oldParent = project.getParent();
+        // Resolve the new parent from DB before making scheduling decisions.
+        // transientProject.getParent() is a stub from the API request with only UUID populated,
+        // so getCollectionLogic() on it always returns NONE.
+        Project resolvedNewParent = null;
+        if (transientProject.getParent() != null && transientProject.getParent().getUuid() != null) {
+            resolvedNewParent = getObjectByUuid(Project.class, transientProject.getParent().getUuid());
+        }
         boolean scheduleProjectMetricsUpdate = this.needScheduleProjectMetricsUpdate(project, transientProject);
-        boolean scheduleParentMetricsUpdate = this.needScheduleParentMetricsUpdate(transientProject, scheduleProjectMetricsUpdate);
-        boolean scheduleOldParentMetricsUpdate = this.needScheduleOldParentMetricsUpdate(oldParent, transientProject);
+        boolean scheduleParentMetricsUpdate = this.needScheduleParentMetricsUpdate(resolvedNewParent, scheduleProjectMetricsUpdate);
+        boolean scheduleOldParentMetricsUpdate = this.needScheduleOldParentMetricsUpdate(oldParent, resolvedNewParent);
 
         project.setAuthors(transientProject.getAuthors());
         project.setPublisher(transientProject.getPublisher());
@@ -557,20 +564,19 @@ public Project updateProject(Project transientProject, boolean commitIndex) {
         }
         project.setIsLatest(transientProject.isLatest());
 
-        if (transientProject.getParent() != null && transientProject.getParent().getUuid() != null) {
-            if (project.getUuid().equals(transientProject.getParent().getUuid())){
+        if (resolvedNewParent != null) {
+            if (project.getUuid().equals(resolvedNewParent.getUuid())){
                 throw new IllegalArgumentException("A project cannot select itself as a parent");
             }
-            Project parent = getObjectByUuid(Project.class, transientProject.getParent().getUuid());
-            if (!Boolean.TRUE.equals(parent.isActive())){
+            if (!Boolean.TRUE.equals(resolvedNewParent.isActive())){
                 throw new IllegalArgumentException("An inactive project cannot be selected as a parent");
-            } else if (isChildOf(parent, transientProject.getUuid())){
+            } else if (isChildOf(resolvedNewParent, transientProject.getUuid())){
                 throw new IllegalArgumentException("The new parent project cannot be a child of the current project.");
             } else {
-                project.setParent(parent);
+                project.setParent(resolvedNewParent);
             }
-            project.setParent(parent);
-        }else {
+            project.setParent(resolvedNewParent);
+        } else {
             project.setParent(null);
         }
 
@@ -621,17 +627,17 @@ private boolean needScheduleProjectMetricsUpdate(Project project, Project transi
     /**
      * if parent is collection schedule an update, unless this project itself is scheduled already since that will trigger a parent update, too
      */
-    private boolean needScheduleParentMetricsUpdate(Project transientProject, boolean scheduleProjectMetricsUpdate) {
+    private boolean needScheduleParentMetricsUpdate(Project newParent, boolean scheduleProjectMetricsUpdate) {
         return !scheduleProjectMetricsUpdate
-                && transientProject.getParent() != null
-                && transientProject.getParent().getCollectionLogic() != ProjectCollectionLogic.NONE;
+                && newParent != null
+                && newParent.getCollectionLogic() != ProjectCollectionLogic.NONE;
     }
 
     /**
      * if project gets a new parent and old parent was collection, we need to update old parent's metrics
      */
-    private boolean needScheduleOldParentMetricsUpdate(Project oldParent, Project transientProject) {
-        return oldParent != transientProject.getParent()
+    private boolean needScheduleOldParentMetricsUpdate(Project oldParent, Project newParent) {
+        return oldParent != newParent
                 && oldParent != null
                 && oldParent.getCollectionLogic() != ProjectCollectionLogic.NONE;
     }