Refactoring

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

src/main/kotlin/com/salesforce/revoman/ReVoman.kt

@@ -203,8 +203,7 @@ object ReVoman {
               envSnapshot =
                 pm.environment.copy(mutableEnv = pm.environment.mutableEnv.toMutableMap())
             )
-        // * NOTE 15/10/23 gopala.akshintala: http status code can be non-success
-        haltExecution = shouldHaltExecution(currentStepReport, kick, pm)
+        haltExecution = shouldHaltExecution(currentStepReport, kick, pm.rundown)
         stepReports + currentStepReport
       }
   }

src/main/kotlin/com/salesforce/revoman/input/config/KickDef.kt

@@ -48,7 +48,7 @@ internal interface KickDef {
 
   @Value.Default fun haltOnAnyFailure(): Boolean = false
 
-  fun haltOnFailureOfTypeExcept(): Map<ExeType, PostTxnStepPick>
+  fun haltOnFailureOfTypeExcept(): Map<ExeType, PostTxnStepPick?>
 
   fun runOnlySteps(): List<ExeStepPick>
 

src/main/kotlin/com/salesforce/revoman/internal/exe/ExeUtils.kt

@@ -14,9 +14,10 @@ import arrow.core.Either.Left
 import arrow.core.Either.Right
 import com.salesforce.revoman.input.config.Kick
 import com.salesforce.revoman.input.config.StepPick.ExeStepPick
-import com.salesforce.revoman.internal.postman.PostmanSDK
 import com.salesforce.revoman.internal.postman.template.Item
 import com.salesforce.revoman.output.ExeType
+import com.salesforce.revoman.output.Rundown
+import com.salesforce.revoman.output.Rundown.Companion.isStepIgnoredForFailure
 import com.salesforce.revoman.output.report.Folder
 import com.salesforce.revoman.output.report.Step
 import com.salesforce.revoman.output.report.StepReport
@@ -91,10 +92,11 @@ internal fun <T> runCatching(
     )
 }
 
+// ! TODO 01 Mar 2025 gopala.akshintala: Unit test this
 internal fun shouldHaltExecution(
   currentStepReport: StepReport,
   kick: Kick,
-  pm: PostmanSDK,
+  rundown: Rundown,
 ): Boolean =
   when {
     currentStepReport.isSuccessful -> false
@@ -114,26 +116,15 @@ internal fun shouldHaltExecution(
           false
         }
         else ->
-          kick
-            .haltOnFailureOfTypeExcept()
-            .asSequence()
-            .any { (exeType, postTxnPick) ->
-              currentStepReport.exeTypeForFailure == exeType &&
-                postTxnPick.pick(
-                  currentStepReport,
-                  pm.rundown.copy(stepReports = pm.rundown.stepReports + currentStepReport),
-                )
-            }
-            .not()
-            .also {
-              logger.info {
-                if (it) {
-                  "${currentStepReport.step} doesn't qualify `haltOnFailureOfTypeExcept` for ${currentStepReport.exeTypeForFailure}, so 🛑 halting the execution of next steps"
-                } else {
-                  "Continuing the execution of next steps, as the step qualifies `haltOnFailureOfTypeExcept` for ${currentStepReport.exeTypeForFailure}"
-                }
+          !isStepIgnoredForFailure(currentStepReport, rundown).also {
+            logger.info {
+              if (it) {
+                "${currentStepReport.step} doesn't qualify `haltOnFailureOfTypeExcept`, so 🛑 halting the execution of next steps"
+              } else {
+                "Continuing the execution of next steps, as the step qualifies `haltOnFailureOfTypeExcept`"
               }
             }
+          }
       }
     }
   }

src/main/kotlin/com/salesforce/revoman/output/Rundown.kt

@@ -15,7 +15,7 @@ import com.salesforce.revoman.output.report.StepReport
 data class Rundown(
   @JvmField val stepReports: List<StepReport> = emptyList(),
   @JvmField val mutableEnv: PostmanEnvironment<Any?>,
-  private val stepsToIgnoreForFailurePick: Map<ExeType, PostTxnStepPick>?,
+  private val haltOnFailureOfTypeExcept: Map<ExeType, PostTxnStepPick?>,
 ) {
   @get:JvmName("immutableEnv") val immutableEnv: Map<String, Any?> by lazy { mutableEnv.toMap() }
 
@@ -27,24 +27,16 @@ data class Rundown(
   @get:JvmName("firstUnIgnoredUnsuccessfulStepReport")
   val firstUnIgnoredUnsuccessfulStepReport: StepReport? by lazy {
     stepReports.firstOrNull { stepReport ->
-      !stepReport.isSuccessful && !isStepIgnoredForFailure(stepReport)
+      !stepReport.isSuccessful && !isStepIgnoredForFailure(stepReport, this)
     }
   }
 
-  private fun isStepIgnoredForFailure(stepReport: StepReport): Boolean =
-    stepsToIgnoreForFailurePick
-      ?.asSequence()
-      ?.map { (exeType, postTxnPick) ->
-        stepReport.exeTypeForFailure == exeType && postTxnPick.pick(stepReport, this)
-      }
-      ?.any { it } ?: false
-
   @get:JvmName("areAllStepsSuccessful")
   val areAllStepsSuccessful: Boolean by lazy { stepReports.all { it.isSuccessful } }
 
   @get:JvmName("areAllStepsExceptIgnoredSuccessful")
   val areAllStepsExceptIgnoredSuccessful: Boolean by lazy {
-    stepReports.all { it.isSuccessful || !isStepIgnoredForFailure(it) }
+    stepReports.all { it.isSuccessful || !isStepIgnoredForFailure(it, this) }
   }
 
   fun reportsForStepsInFolder(folderName: String): List<StepReport?> =
@@ -61,6 +53,17 @@ data class Rundown(
 
   fun filterReportIncludingStepsWithName(stepNames: Set<String>): List<StepReport> =
     stepReports.filter { r -> stepNames.any { r.step.stepNameMatches(it) } }
+
+  companion object {
+    fun isStepIgnoredForFailure(stepReport: StepReport, rundown: Rundown): Boolean =
+      rundown.haltOnFailureOfTypeExcept
+        .asSequence()
+        .map { (exeType, postTxnPick) ->
+          stepReport.exeTypeForFailure == exeType &&
+            (postTxnPick?.pick(stepReport, rundown) ?: false)
+        }
+        .any { it }
+  }
 }
 
 fun <T> List<T>.endsWith(list: List<T>): Boolean =