Follow-up on cancel review app deployments MR

What does this MR do?

This is a follow-up MR to address some issues that @dosuken123 found with !34960 (merged).

Does this MR meet the acceptance criteria?

Conformity

• Code review guidelines
• Merge request performance guidelines
• Style guides

Availability and Testing

• Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process.