Merge branch 'release/44.3.0'

Author: einpraegsam

Classes/Command/LuxCleanupCompaniesByPropertyCommand.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+namespace In2code\Lux\Command;
+
+use Doctrine\DBAL\Exception as ExceptionDbal;
+use In2code\Lux\Domain\Model\Company;
+use In2code\Lux\Domain\Repository\CompanyRepository;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
+
+class LuxCleanupCompaniesByPropertyCommand extends Command
+{
+    use ExtbaseCommandTrait;
+
+    public function configure()
+    {
+        $description = 'Remove companies by a given property. E.g. removing all companies of a country';
+        $this->setDescription($description);
+        $this->addArgument('propertyName', InputArgument::REQUIRED, 'any property name');
+        $this->addArgument('propertyValue', InputArgument::REQUIRED, 'any property value');
+        $this->addArgument('exactMatch', InputArgument::OPTIONAL, 'direct match');
+        $this->addOption('remove-visitors', null, InputOption::VALUE_NONE, 'also remove all related visitors');
+    }
+
+    /**
+     * Remove companies by a given property. E.g. removing all chinese companies with
+     * "./vendor/bin/typo3 lux:cleanupCompaniesByProperty countryCode cn 1" or
+     * "./vendor/bin/typo3 lux:cleanupCompaniesByProperty title "Testfirma" 0 --remove-visitors"
+     *
+     *      !!! Really removes companies from the database
+     *      Relations to a removed company are always resolved: with --remove-visitors all related visitors and
+     *      all rows from their related tables are removed, without it the visitors are kept and only lose their
+     *      relation to the company
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws InvalidQueryException
+     * @throws ExceptionDbal
+     */
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->initializeExtbase();
+        $companyRepository = GeneralUtility::makeInstance(CompanyRepository::class);
+        $companies = $companyRepository->findAllByProperty(
+            (string)$input->getArgument('propertyName'),
+            (string)$input->getArgument('propertyValue'),
+            (bool)$input->getArgument('exactMatch')
+        );
+        $removeVisitors = (bool)$input->getOption('remove-visitors');
+        /** @var Company $company */
+        foreach ($companies as $company) {
+            $companyRepository->removeCompany($company, $removeVisitors);
+        }
+        $output->writeln(count($companies) . ' successfully removed');
+        return self::SUCCESS;
+    }
+}

Classes/Domain/Repository/CompanyRepository.php

@@ -12,10 +12,14 @@
 use In2code\Lux\Domain\Model\Visitor;
 use In2code\Lux\Domain\Service\BranchService;
 use In2code\Lux\Domain\Service\CountryService;
+use In2code\Lux\Utility\ArrayUtility;
 use In2code\Lux\Utility\DatabaseUtility;
 use In2code\Lux\Utility\DateUtility;
+use In2code\Lux\Utility\StringUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 
 class CompanyRepository extends AbstractRepository
 {
@@ -83,6 +87,36 @@ public function findAmountByFilter(FilterDto $filter): int
         return (int)$connection->executeQuery($sql)->fetchOne();
     }
 
+    /**
+     * Find all companies by a given property. Property paths are allowed (e.g. "category.title")
+     *
+     * @param string $propertyName
+     * @param string $propertyValue
+     * @param bool $exactMatch
+     * @param array $orderings
+     * @param int $limit
+     * @return QueryResultInterface
+     * @throws InvalidQueryException
+     */
+    public function findAllByProperty(
+        string $propertyName,
+        string $propertyValue,
+        bool $exactMatch,
+        array $orderings = ['uid' => 'DESC'],
+        int $limit = 1000
+    ): QueryResultInterface {
+        $query = $this->createQuery();
+        $propertyName = StringUtility::cleanString($propertyName, false, '._-');
+        $constraint = $query->equals($propertyName, $propertyValue);
+        if ($exactMatch === false) {
+            $constraint = $query->like($propertyName, '%' . $propertyValue . '%');
+        }
+        $query->matching($constraint);
+        $query->setOrderings(ArrayUtility::cleanStringForArrayKeys($orderings));
+        $query->setLimit($limit);
+        return $query->execute();
+    }
+
     public function findByTitleAndDomain(string $title, string $domain): ?Company
     {
         $query = $this->createQuery();
@@ -277,12 +311,16 @@ public function canCompanyBeReadBySites(Company $company, array $sites): bool
      */
     public function removeCompany(Company $company, bool $removeVisitors): void
     {
-        if ($removeVisitors) {
-            $visitorRepository = GeneralUtility::makeInstance(VisitorRepository::class);
-            foreach ($company->getVisitors() as $visitor) {
-                $visitorRepository->removeVisitor($visitor);
+        $visitorRepository = GeneralUtility::makeInstance(VisitorRepository::class);
+        if ($removeVisitors === true) {
+            foreach ($visitorRepository->findAllUidsByCompany($company) as $visitorUid) {
+                $visitor = $visitorRepository->findByUid($visitorUid);
+                if ($visitor !== null) {
+                    $visitorRepository->removeVisitor($visitor);
+                }
             }
         }
+        $visitorRepository->removeCompanyRelation($company);
 
         $connection = DatabaseUtility::getConnectionForTable(Company::TABLE_NAME);
         $connection->executeQuery('delete from ' . Company::TABLE_NAME . ' where uid=' . (int)$company->getUid());

Classes/Domain/Repository/VisitorRepository.php

@@ -552,6 +552,19 @@ public function getScoringSumFromCompany(Company $company): int
         return (int)$connection->executeQuery($sql)->fetchOne();
     }
 
+    /**
+     * @param Company $company
+     * @return int[]
+     * @throws ExceptionDbal
+     */
+    public function findAllUidsByCompany(Company $company): array
+    {
+        $connection = DatabaseUtility::getConnectionForTable(Visitor::TABLE_NAME);
+        $sql = 'select uid from ' . Visitor::TABLE_NAME
+            . ' where companyrecord = ' . (int)$company->getUid();
+        return array_map('intval', $connection->executeQuery($sql)->fetchFirstColumn());
+    }
+
     public function findByCompany(Company $company, int $limit = 200): array
     {
         $connection = DatabaseUtility::getConnectionForTable(Visitor::TABLE_NAME);
@@ -624,6 +637,20 @@ public function updateRecordsWithLanguageAll(): void
         }
     }
 
+    /**
+     * @param Company $company
+     * @return void
+     * @throws ExceptionDbal
+     */
+    public function removeCompanyRelation(Company $company): void
+    {
+        $connection = DatabaseUtility::getConnectionForTable(Visitor::TABLE_NAME);
+        $connection->executeQuery(
+            'update ' . Visitor::TABLE_NAME . ' set companyrecord=0'
+            . ' where companyrecord = ' . (int)$company->getUid()
+        );
+    }
+
     /**
      * @param Visitor $visitor
      * @return void

Configuration/Services.yaml

@@ -48,6 +48,11 @@ services:
       - name: 'console.command'
         command: 'lux:cleanupAllVisitors'
 
+  In2code\Lux\Command\LuxCleanupCompaniesByPropertyCommand:
+    tags:
+      - name: 'console.command'
+        command: 'lux:cleanupCompaniesByProperty'
+
   In2code\Lux\Command\LuxCleanupUnknownVisitorsByAgeCommand:
     tags:
       - name: 'console.command'

Documentation/Technical/Changelog/Index.md

@@ -9,6 +9,7 @@
 
 | Version    | Date       | State    | TYPO3       | Description                                                                                                                                                                                           |
 |------------|------------|----------|-------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 44.3.0     | 2026-09-02 | Feature  | `v13 + v14` | Add new command to remove company records (with or without visitor records)                                                                                                                           |
 | 44.2.0     | 2026-09-02 | Task     | `v13 + v14` | Allow deleting of visitors via command by chained properties, Show if leadfeeder requests are failing, update token pattern for leadfeeder API keys                                                   |
 | 44.1.1     | 2026-08-24 | Bugfix   | `v13 + v14` | Allow extending of HEADER_ROBOTS for other extensions                                                                                                                                                 |
 | 44.1.0     | 2026-08-24 | Task     | `v13 + v14` | Return status code 400 for invalid TypeNum requests with missing parameters to prevent unneeded logging, Render "X-Robots-Tag: noindex, nofollow" in all FE TypeNum answers.                          |

Documentation/Technical/Commands/Index.md

@@ -18,6 +18,7 @@ Most of the Commands can be called via CLI or via Scheduler Backend Module (dire
   * Remove unknown visitors by age
   * Remove a defined visitor by uid
   * Remove visitors by a given property
+  * Remove companies by a given property
 * Lead commands to get a summary mail for your sales team
   * Send an overall summary
   * Send a summary mail with known companies
@@ -142,6 +143,36 @@ Example usage:
 ./vendor/bin/typo3 lux:cleanupVisitorsByProperty pagevisits.referrer "test.in2code.de" 0
 ```
 
+##### \In2code\Lux\Command\LuxCleanupCompaniesByPropertyCommand
+
+Removes company records by a given property - e.g. all companies of a country that is not relevant for your sales.
+Remove means in this case not deleted=1 but really remove from database.
+
+Relations to a removed company are always resolved, so no visitor points to a company that does not exist any more:
+
+* **without** `--remove-visitors`: the related visitors are kept and only lose their relation to the company
+* **with** `--remove-visitors`: the related visitors and all rows from their related tables (pagevisits, downloads,
+  log entries, fingerprints, attributes, ...) are removed as well
+
+Use the property name of the company model - not the database field. So `countryCode` (and not `country_code`),
+`branchCode`, `revenueClass`, `sizeClass`, `title`, `domain`, `city`, `zip` or `region`.
+
+Example usage:
+
+```
+# Remove all companies of a country but keep their visitors (1 = exact match)
+./vendor/bin/typo3 lux:cleanupCompaniesByProperty countryCode cn 1
+
+# Remove all companies of a country including all their visitors and the visitor related records
+./vendor/bin/typo3 lux:cleanupCompaniesByProperty countryCode cn 1 --remove-visitors
+
+# Remove all companies with a title like "Testfirma" (0 = like)
+./vendor/bin/typo3 lux:cleanupCompaniesByProperty title Testfirma 0
+```
+
+**Note:** Like `lux:cleanupVisitorsByProperty` this command handles up to 1000 records per run - simply call it
+again if there are more of them.
+
 
 #### Lead Commands
 

ext_emconf.php

@@ -4,7 +4,7 @@
     'description' => 'Living User Experience - LUX - the Marketing Automation tool for TYPO3.
         Turn your visitors to leads. Identification and profiling of your visitors within your TYPO3 website.',
     'category' => 'plugin',
-    'version' => '44.2.0',
+    'version' => '44.3.0',
     'author' => 'Alex Kellner',
     'author_email' => 'alexander.kellner@in2code.de',
     'author_company' => 'in2code.de',