fix: skip approve_if if the evaluation of when condition is false (#150)

singhvikash11 · Vikash · web-flow · commit 6abc852ce0ce · 2022-03-29T13:40:28.000+05:30
Co-authored-by: Vikash &lt;vikash.singh@gojek.com&gt;
diff --git a/core/approval/service.go b/core/approval/service.go
@@ -78,7 +78,7 @@ func (s *Service) AdvanceApproval(appeal *domain.Appeal) error {
 				}
 			}
 
-			if stepConfig.Strategy == domain.ApprovalStepStrategyAuto {
+			if approval.Status != domain.ApprovalStatusSkipped && stepConfig.Strategy == domain.ApprovalStepStrategyAuto {
 				v, err := evaluator.Expression(stepConfig.ApproveIf).EvaluateWithVars(map[string]interface{}{
 					"appeal": appealMap,
 				})

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (s Service) AdvanceApproval(appeal domain.Appeal) error {`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`- if stepConfig.Strategy == domain.ApprovalStepStrategyAuto {`
	`81`	`+ if approval.Status != domain.ApprovalStatusSkipped && stepConfig.Strategy == domain.ApprovalStepStrategyAuto {`
`82`	`82`	`v, err := evaluator.Expression(stepConfig.ApproveIf).EvaluateWithVars(map[string]interface{}{`
`83`	`83`	`"appeal": appealMap,`
`84`	`84`	`})`