diff --git a/app/api/module/Api/src/Domain/CommandHandler/CompaniesHouse/Compare.php b/app/api/module/Api/src/Domain/CommandHandler/CompaniesHouse/Compare.php index 22398fa3b5..75c35d02ad 100644 --- a/app/api/module/Api/src/Domain/CommandHandler/CompaniesHouse/Compare.php +++ b/app/api/module/Api/src/Domain/CommandHandler/CompaniesHouse/Compare.php @@ -30,6 +30,8 @@ final class Compare extends AbstractCommandHandler */ public function handleCommand(CommandInterface $command) { + $this->result->setFlag('isInsolvent', false); + $companyNumber = $command->getCompanyNumber(); try { diff --git a/app/api/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfile.php b/app/api/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfile.php index 60ac314918..c6a0f1353c 100644 --- a/app/api/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfile.php +++ b/app/api/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfile.php @@ -29,12 +29,13 @@ public function handleCommand(CommandInterface $command) } $companyNumber = $messages[0]['Body']; - $this->result->merge($this->handleSideEffect(Compare::create(['companyNumber' => $companyNumber]))); + $companyResult = $this->handleSideEffect(Compare::create(['companyNumber' => $companyNumber])); + $this->result->merge($companyResult); $companiesHouseCompany = $this->getRepo()->getLatestByCompanyNumber($companyNumber); $isProcessed = $companiesHouseCompany->getInsolvencyProcessed(); - if ($this->result->getFlag('isInsolvent') && !$isProcessed) { + if ($companyResult->getFlag('isInsolvent') === true && !$isProcessed) { $insolvencyMessage = $this->messageBuilderService->buildMessage( ['companyOrLlpNo' => $companyNumber], ProcessInsolvency::class,