From 465f67bd4cddf9c4a6de66f261154a3bbb4b4dcc Mon Sep 17 00:00:00 2001 From: stephen-oppong-beduh <56881842+stephen-oppong-beduh@users.noreply.github.com> Date: Fri, 14 Feb 2025 18:10:20 +0000 Subject: [PATCH] SASS-11099 - hardcoded jointlyLet to false --- app/services/MergeService.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/MergeService.scala b/app/services/MergeService.scala index e216eea..f8e8e79 100644 --- a/app/services/MergeService.scala +++ b/app/services/MergeService.scala @@ -369,7 +369,7 @@ class MergeService @Inject() (implicit s"\nclaimExpensesOrRRRYesNo = $claimExpensesOrRRRYesNo" ) val rentalsAndRaRAboutStoreAnswers = (claimPropertyIncomeAllowanceYesOrNo, claimExpensesOrRRRYesNo) - rentalsAndRaRAboutStoreAnswers.merge((jointlyLet, uKOtherPropertyMaybe)) + rentalsAndRaRAboutStoreAnswers.merge((jointlyLet.orElse(Some(false)), uKOtherPropertyMaybe)) } def mergeRaRAbout( @@ -392,7 +392,7 @@ class MergeService @Inject() (implicit ukop <- resultFromPeriodicDownstream.ukOtherProperty } yield ukop - rentARoomAllowancesStoreAnswers.merge((jointlyLet, uKOtherPropertyMaybe)) + rentARoomAllowancesStoreAnswers.merge((jointlyLet.orElse(Some(false)), uKOtherPropertyMaybe)) } def mergeStatuses(resultFromRepository: Map[String, JourneyAnswers]): List[JourneyWithStatus] =