Fix email send with company tokens

app/bundles/LeadBundle/Entity/CompanyRepository.php

@@ -237,8 +237,9 @@ public function getCompanies($user = false, $id = '')
             return $companies[$key];
         }
 
-        $q->select('comp.*')
-            ->from(MAUTIC_TABLE_PREFIX.'companies', 'comp');
+        $q->select('comp.*, cl.is_primary')
+            ->from(MAUTIC_TABLE_PREFIX.'companies', 'comp')
+            ->leftJoin('comp', MAUTIC_TABLE_PREFIX.'companies_leads', 'cl', 'cl.company_id = comp.id');
 
         if (!empty($id)) {
             $q->where(

app/bundles/LeadBundle/Tests/Functional/Entity/CompanyRepositoryTest.php

@@ -0,0 +1,195 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mautic\LeadBundle\Tests\Functional\Entity;
+
+use DateTime;
+use Mautic\CoreBundle\Test\MauticMysqlTestCase;
+use Mautic\EmailBundle\Helper\MailHelper;
+use Mautic\EmailBundle\Tests\Helper\Transport\SmtpTransport;
+use Mautic\LeadBundle\Entity\Company;
+use Mautic\LeadBundle\Entity\Lead;
+use Mautic\LeadBundle\Entity\LeadList;
+use Mautic\LeadBundle\Entity\ListLead;
+use Mautic\LeadBundle\Model\CompanyModel;
+use PHPUnit\Framework\Assert;
+use ReflectionProperty;
+use Swift_Mailer;
+use Symfony\Component\HttpFoundation\Request;
+
+final class CompanyRepositoryTest extends MauticMysqlTestCase
+{
+    private SmtpTransport $transport;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->setUpMailer();
+    }
+
+    protected function tearDown(): void
+    {
+        // Clear owners cache (to leave a clean environment for future tests):
+        $mailHelper = self::$container->get('mautic.helper.mailer');
+        $this->setPrivateProperty($mailHelper, 'leadOwners', []);
+        parent::tearDown();
+    }
+
+    public function testEmailSendWithCompanyTokens(): void
+    {
+        $suffix   = random_int(10, 100);
+        $companyA = $this->createCompany('ABC Co.'.$suffix, 'First Street'.$suffix);
+        $contactA = $this->createContact('John'.$suffix, 'JohnDoe'.$suffix.'@email.com', $companyA);
+        $companyB = $this->createCompany('XYZ Co.'.$suffix, 'Second Street'.$suffix);
+        $this->editContact($contactA, $companyB, $companyA);
+        $segment = $this->createSegment('Segment A'.$suffix, 'segment-a-'.$suffix);
+        $this->addContactsToSegment([$contactA], $segment);
+        $emailId = $this->createEmail('EmailName'.$suffix, 'Subject'.$suffix, 'list', $segment->getId());
+        $this->sendEmailViaApi($emailId);
+        $testEmail = function () use ($suffix): void {
+            $message = $this->transport->sentMessage;
+            Assert::assertSame($message->getSubject(), 'Subject'.$suffix);
+            Assert::assertSame($message->getTo(), ['JohnDoe'.$suffix.'@email.com' => 'John'.$suffix]);
+            $messageBody = $message->getBody();
+            Assert::assertStringContainsString('JohnDoe'.$suffix.'@email.com', $messageBody);
+            Assert::assertStringContainsString('XYZ Co.'.$suffix, $messageBody);
+            Assert::assertStringContainsString('Second Street'.$suffix, $messageBody);
+        };
+        $testEmail();
+    }
+
+    private function createCompany(string $name, string $address1 = ''): Company
+    {
+        /** @var CompanyModel $model */
+        $model   = self::$container->get('mautic.lead.model.company');
+        $company = new Company();
+        $company->setIsPublished(true)->setName($name)->setAddress1($address1);
+        $model->saveEntity($company);
+
+        return $company;
+    }
+
+    private function createContact(string $firstName, string $email, Company $company): Lead
+    {
+        $crawler     = $this->client->request(Request::METHOD_GET, '/s/contacts/new');
+        $formCrawler = $crawler->filter('form[name=lead]');
+        $this->assertSame(1, $formCrawler->count());
+
+        $form = $formCrawler->form();
+        $form->setValues(
+            [
+                'lead[firstname]' => $firstName,
+                'lead[email]'     => $email,
+                'lead[companies]' => [$company->getId()],
+            ]
+        );
+        $this->client->submit($form);
+
+        return $this->em->getRepository(Lead::class)->findOneBy(
+            [
+                'firstname' => $firstName,
+                'email'     => $email,
+            ]
+        );
+    }
+
+    private function editContact(Lead $contact, Company $primaryCompany, Company $secondaryCompany): void
+    {
+        $crawler     = $this->client->request(Request::METHOD_GET, '/s/contacts/edit/'.$contact->getId());
+        $formCrawler = $crawler->filter('form[name=lead]');
+        $this->assertSame(1, $formCrawler->count());
+
+        $form = $formCrawler->form();
+        $form->setValues(
+            [
+                'lead[companies]' => [$primaryCompany->getId(), $secondaryCompany->getId()],
+            ]
+        );
+        $this->client->submit($form);
+    }
+
+    private function createSegment(string $name, string $alias): LeadList
+    {
+        $segment = new LeadList();
+        $segment->setName($name);
+        $segment->setPublicName($name);
+        $segment->setAlias($alias);
+        $this->em->persist($segment);
+        $this->em->flush();
+
+        return $segment;
+    }
+
+    /**
+     * @param array<Lead> $contacts
+     */
+    private function addContactsToSegment(array $contacts, LeadList $segment): void
+    {
+        foreach ($contacts as $contact) {
+            $reference = new ListLead();
+            $reference->setLead($contact);
+            $reference->setList($segment);
+            $reference->setDateAdded(new DateTime());
+            $this->em->persist($reference);
+        }
+
+        $this->em->flush();
+    }
+
+    private function createEmail(string $name, string $subject, string $emailType, int $segmentId = null): int
+    {
+        $payload = [
+            'name'       => $name,
+            'subject'    => $subject,
+            'emailType'  => $emailType,
+            'customHtml' => '{contactfield=email} {contactfield=companyname} {contactfield=companyaddress1}',
+        ];
+
+        if ('list' === $emailType) {
+            $payload['lists'] = [$segmentId];
+        }
+
+        $this->client->request('POST', '/api/emails/new', $payload);
+        $clientResponse = $this->client->getResponse();
+        $response       = json_decode($clientResponse->getContent(), true);
+
+        return $response['email']['id'];
+    }
+
+    private function setUpMailer(): void
+    {
+        $mailHelper = self::$container->get('mautic.helper.mailer');
+        $transport  = new SmtpTransport();
+        $mailer     = new Swift_Mailer($transport);
+        $this->setPrivateProperty($mailHelper, 'mailer', $mailer);
+        $this->setPrivateProperty($mailHelper, 'transport', $transport);
+        $this->transport = $transport;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private function setPrivateProperty(MailHelper $object, string $property, $value): void
+    {
+        $reflector = new ReflectionProperty(get_class($object), $property);
+        $reflector->setAccessible(true);
+        $reflector->setValue($object, $value);
+    }
+
+    private function sendEmailViaApi(int $emailId): void
+    {
+        $this->client->request('POST', "/api/emails/${emailId}/send");
+        $clientResponse = $this->client->getResponse();
+        Assert::assertSame(200, $clientResponse->getStatusCode(), $clientResponse->getContent());
+        Assert::assertSame(
+            json_decode($clientResponse->getContent(), true, 512, JSON_THROW_ON_ERROR),
+            [
+                'success'          => 1,
+                'sentCount'        => 1,
+                'failedRecipients' => 0,
+            ],
+            $clientResponse->getContent()
+        );
+    }
+}