🐛 fix(Overall performance): Adjustment in additional question delete process A2-494

Author: kenjitm

marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/manager/impl/CrpProgramOutcomeIndicatorManagerImpl.java

@@ -100,16 +100,14 @@ public void remove(CrpProgramOutcomeIndicator originalCrpOutcomeIndicator, Phase
       List<CrpProgramOutcome> outcomes = crpProgramOutcomeManager.getAllCrpProgramOutcomesByComposedIdFromPhase(
         originalCrpOutcomeIndicator.getCrpProgramOutcome().getComposeID(), initialPhase.getId());
 
-      if (outcomes != null) {
+      if (outcomes != null && !outcomes.isEmpty()) {
         for (CrpProgramOutcome crpProgramOutcome : outcomes) {
 
-          if (this.getCrpProgramOutcomeIndicatorByOutcomeAndIndicator(originalCrpOutcomeIndicator.getIndicator(),
-            crpProgramOutcome) != null
-            || (!this.getCrpProgramOutcomeIndicatorByOutcomeAndIndicator(originalCrpOutcomeIndicator.getIndicator(),
-              crpProgramOutcome).isEmpty())) {
-            List<CrpProgramOutcomeIndicator> indicators =
-              new ArrayList<>(this.getCrpProgramOutcomeIndicatorByOutcomeAndIndicator(
-                originalCrpOutcomeIndicator.getIndicator(), crpProgramOutcome));
+          List<CrpProgramOutcomeIndicator> result = this.getCrpProgramOutcomeIndicatorByOutcomeAndIndicator(
+            originalCrpOutcomeIndicator.getIndicator(), crpProgramOutcome);
+
+          if (result != null && !result.isEmpty()) {
+            List<CrpProgramOutcomeIndicator> indicators = new ArrayList<>(result);
 
             for (CrpProgramOutcomeIndicator indicator : indicators) {
               if (indicator != null && indicator.getId() != null) {

marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/impactpathway/OutcomesAction.java

@@ -870,11 +870,11 @@ public void saveIndicators(CrpProgramOutcome crpProgramOutcomeDB, CrpProgramOutc
         if (crpProgramOutcomeIndicator != null
           && !crpProgramOutcomeDetached.getIndicators().contains(crpProgramOutcomeIndicator)) {
           crpProgramOutcomeIndicatorManager.deleteCrpProgramOutcomeIndicator(crpProgramOutcomeIndicator.getId());
-          crpProgramOutcomeIndicatorManager.remove(crpProgramOutcomeIndicator, nextPhase);
+          // crpProgramOutcomeIndicatorManager.remove(crpProgramOutcomeIndicator, nextPhase);
         }
       } else {
         crpProgramOutcomeIndicatorManager.deleteCrpProgramOutcomeIndicator(crpProgramOutcomeIndicator.getId());
-        crpProgramOutcomeIndicatorManager.remove(crpProgramOutcomeIndicator, nextPhase);
+        // crpProgramOutcomeIndicatorManager.remove(crpProgramOutcomeIndicator, nextPhase);
       }
     }