fixed script, history delete

wttech · Nov 4, 2023 · 77faf4b · 77faf4b
1 parent 0a0f5a4
commit 77faf4b
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/history/ScriptHistoryImpl.java b/app/aem/core/src/main/java/com/cognifide/apm/core/history/ScriptHistoryImpl.java
@@ -20,8 +20,11 @@
 
 package com.cognifide.apm.core.history;
 
+import com.cognifide.apm.api.services.ExecutionMode;
+import java.util.Comparator;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.DefaultInjectionStrategy;
 import org.apache.sling.models.annotations.Model;
@@ -72,20 +75,28 @@ public static ScriptHistoryImpl empty(String scriptPath) {
 
   @Override
   public HistoryEntry getLastLocalRun() {
-    lastLocalRun = getHistoryEntry(lastLocalRun, lastLocalRunPath);
+    lastLocalRun = getHistoryEntry(lastLocalRun, lastLocalRunPath, ExecutionMode.RUN);
     return lastLocalRun;
   }
 
   @Override
   public HistoryEntry getLastLocalDryRun() {
-    lastLocalDryRun = getHistoryEntry(lastLocalDryRun, lastLocalDryRunPath);
+    lastLocalDryRun = getHistoryEntry(lastLocalDryRun, lastLocalDryRunPath, ExecutionMode.DRY_RUN);
     return lastLocalDryRun;
   }
 
-  private HistoryEntry getHistoryEntry(HistoryEntry entry, String historyEntryPath) {
+  private HistoryEntry getHistoryEntry(HistoryEntry entry, String historyEntryPath, ExecutionMode mode) {
     HistoryEntry historyEntry = entry;
     if (historyEntry == null && resource != null && historyEntryPath != null) {
       historyEntry = history.findHistoryEntry(resource.getResourceResolver(), historyEntryPath);
+      if (historyEntry == null) {
+        historyEntry = history.findAllHistoryEntries(resource.getResourceResolver())
+            .stream()
+            .filter(it -> StringUtils.equals(it.getScriptPath(), scriptPath)
+                && StringUtils.equals(it.getMode(), mode.toString()))
+            .max(Comparator.comparing(HistoryEntry::getExecutionTime))
+            .orElse(new HistoryEntryImpl());
+      }
     }
     return historyEntry;
   }