refactored code for SOLID, DRY, KISS and YAGNI principles compartibility

config/services.yaml

@@ -34,12 +34,16 @@ services:
         arguments:
             - proxy: '%env(TELEGRAM_PROXY)%'
 
-    App\Presentation\PortfolioPresenter:
+    App\Service\SecurityTitleResolver:
         arguments:
             $securitiesMap: '%securitiesMap%'
+
+    App\Service\PortfolioImageRenderer:
+        arguments:
             $fontDir: '%kernel.project_dir%'
 
     App\Service\MailFetcher:
         arguments:
+            $proxy: '%env(TELEGRAM_PROXY)%'
             $validEmailSubject: '%env(VALID_EMAIL_SUBJECT)%'
             $validEmailSender: '%env(VALID_EMAIL_SENDER)%'

src/Command/ImportFromXmlCommand.php

@@ -4,9 +4,10 @@ declare(strict_types=1);
 
 namespace App\Command;
 
-use App\Presentation\PortfolioPresenter;
-use App\Service\TelegramNotifier;
-use App\Service\XmlParser;
+use App\Service\PortfolioImageRenderer;
+use App\Service\TelegramNotifierInterface;
+use App\Service\XmlParserInterface;
+use App\Service\PortfolioPresenterInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -21,9 +22,10 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 class ImportFromXmlCommand extends Command
 {
     public function __construct(
-        private readonly XmlParser          $xmlParser,
-        private readonly TelegramNotifier   $telegramNotifier,
-        private readonly PortfolioPresenter $portfolioPresenter,
+        private readonly XmlParserInterface          $xmlParser,
+        private readonly TelegramNotifierInterface   $telegramNotifier,
+        private readonly PortfolioPresenterInterface $portfolioPresenter,
+        private readonly PortfolioImageRenderer      $imageRenderer,
     )
     {
         parent::__construct();
@@ -71,7 +73,7 @@ class ImportFromXmlCommand extends Command
 
         $output->writeln($this->portfolioPresenter->toText($parsedPortfolio));
 
-        $this->portfolioPresenter->toImage($parsedPortfolio, 'portfolio.png');
+        $this->imageRenderer->toImage($parsedPortfolio, 'portfolio.png');
 
         if ($input->getOption('notify')) {
             $this->telegramNotifier->notify('', 'portfolio.png');

src/Presentation/PortfolioPresenter.php

@@ -6,54 +6,17 @@ namespace App\Presentation;
 
 use App\Domain\Entity\ParsedPortfolio;
 use App\Service\PortfolioPresenterInterface;
+use App\Service\SecurityTitleResolver;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Helper\TableStyle;
 
 class PortfolioPresenter implements PortfolioPresenterInterface
 {
-    private const FONT_SIZE = 12;
-    private const FONT_NAME = 'droid_sans_mono.ttf';
     private const COPYRIGHT_MARK = ' ©ЕИ';
 
-    /** @var array{array<string>, array<string>} */
-    private array $securityMapPrintable = [['(в пути)'], ['±']];
-
-    /** @var array<string, string> */
-    private array $mapSecurityTitle = [];
-
-    private string $fontPath;
-
-    public function __construct(array $securitiesMap, string $fontDir)
+    public function __construct(private SecurityTitleResolver $titleResolver)
     {
-        array_unshift($this->securityMapPrintable[0], ...array_keys($securitiesMap));
-        array_unshift($this->securityMapPrintable[1], ...array_values($securitiesMap));
-
-        $this->fontPath = $fontDir . '/' . self::FONT_NAME;
-    }
-
-    public function toImage(ParsedPortfolio $parsedPortfolio, string $filename): void
-    {
-        $im = imagecreatetruecolor(1000, 1000);
-        $whitey = imagecolorallocate($im, 240, 240, 240);
-        $grey = imagecolorallocate($im, 48, 48, 48);
-        imagefill($im, 0, 0, $grey);
-
-        $lines = explode("\n", $this->toText($parsedPortfolio));
-        $height = self::FONT_SIZE;
-        foreach ($lines as $line) {
-            imagefttext($im, self::FONT_SIZE, 0, 0, $height, $whitey, $this->fontPath, $line);
-            $height += self::FONT_SIZE + (int) round(0.5 * self::FONT_SIZE);
-        }
-
-        $cropped = imagecropauto($im, IMG_CROP_SIDES);
-        if ($cropped !== false) {
-            imagedestroy($im);
-            $im = $cropped;
-        }
-
-        imagepng($im, $filename);
-        imagedestroy($im);
     }
 
     public function toText(ParsedPortfolio $parsedPortfolio): string
@@ -77,7 +40,7 @@ class PortfolioPresenter implements PortfolioPresenterInterface
 
         foreach ($parsedPortfolio->details as $detail) {
             $table->addRow([
-                $this->getPrintableSecurityTitle($detail->security, $detail->issuer),
+                $this->titleResolver->resolve($detail->security, $detail->issuer),
                 $this->formatQuantity($detail->quantityStart, $detail->quantityEnd),
                 $detail->priceStart,
                 $detail->priceEnd,
@@ -97,7 +60,7 @@ class PortfolioPresenter implements PortfolioPresenterInterface
 
         foreach ($parsedPortfolio->movements as $movement) {
             $table->addRow([
-                $this->getPrintableSecurityTitle($movement->security),
+                $this->titleResolver->resolve($movement->security),
                 $movement->quantityStart,
                 $movement->quantityIncome > 0 ? '+' . $movement->quantityIncome : $movement->quantityIncome,
                 $movement->quantityOutcome > 0 ? '-' . $movement->quantityOutcome : $movement->quantityOutcome,
@@ -123,32 +86,6 @@ class PortfolioPresenter implements PortfolioPresenterInterface
         return $total;
     }
 
-    private function getPrintableSecurityTitle(string $security, ?string $issuer = null): string
-    {
-        $security = str_replace(
-            $this->securityMapPrintable[0],
-            $this->securityMapPrintable[1],
-            $security,
-        );
-
-        if (!str_starts_with($security, 'RU00')) {
-            return $security;
-        }
-
-        if (isset($this->mapSecurityTitle[$security])) {
-            return $this->mapSecurityTitle[$security];
-        }
-
-        if ($issuer === null) {
-            return $security;
-        }
-
-        $title = str_replace(['МКПАО', 'ПАО', '"', ' ', '(', ')'], '', $issuer);
-        $this->mapSecurityTitle[$security] = $title;
-
-        return $title;
-    }
-
     private function formatQuantity(int $quantityStart, int $quantityEnd): string
     {
         if ($quantityStart === $quantityEnd) {

src/Service/MailFetcher.php

@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Presentation\PortfolioPresenter;
-use App\Service\TelegramNotifier;
 use PhpImap\Exceptions\ConnectionException;
 use PhpImap\IncomingMail;
 use Psr\Log\LoggerInterface;
@@ -16,21 +14,25 @@ readonly class MailFetcher
 {
     public function __construct(
         #[Target('finfollowConnection')]
-        private ConnectionInterface $connection,
-        private XmlParser           $xmlParser,
-        private PortfolioManager    $portfolioManager,
-        private LoggerInterface     $logger,
-        private TelegramNotifier    $telegramNotifier,
-        private PortfolioPresenter  $portfolioPresenter,
-        private AttachmentProcessor $attachmentProcessor,
-        private string              $validEmailSubject,
-        private string              $validEmailSender,
+        private ConnectionInterface      $connection,
+        private XmlParserInterface       $xmlParser,
+        private PortfolioManager         $portfolioManager,
+        private LoggerInterface          $logger,
+        private TelegramNotifierInterface $telegramNotifier,
+        private PortfolioImageRenderer   $imageRenderer,
+        private AttachmentProcessor      $attachmentProcessor,
+        private ProxyChecker             $proxyChecker,
+        private string                   $proxy,
+        private string                   $validEmailSubject,
+        private string                   $validEmailSender,
     )
     {
     }
 
     public function fetchNewEmails(): void
     {
+        $this->proxyChecker->check($this->proxy);
+
         $mailbox = $this->connection->getMailbox();
         try {
             $mailsIds = $mailbox->searchMailbox('ALL');
@@ -101,7 +103,7 @@ readonly class MailFetcher
 
             if ($this->portfolioManager->updatePortfolio($parsedPortfolio, $xmlString)) {
                 $pngFilename = tempnam(sys_get_temp_dir(), 'finfollow-portfolio-');
-                $this->portfolioPresenter->toImage($parsedPortfolio, $pngFilename);
+                $this->imageRenderer->toImage($parsedPortfolio, $pngFilename);
                 $this->telegramNotifier->notify('', $pngFilename);
             }
         }

src/Service/PortfolioImageRenderer.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Domain\Entity\ParsedPortfolio;
+
+readonly class PortfolioImageRenderer
+{
+    private const FONT_SIZE = 12;
+    private const FONT_NAME = 'droid_sans_mono.ttf';
+
+    private string $fontPath;
+
+    public function __construct(
+        private PortfolioPresenterInterface $presenter,
+        string $fontDir,
+    ) {
+        $this->fontPath = $fontDir . '/' . self::FONT_NAME;
+    }
+
+    public function toImage(ParsedPortfolio $parsedPortfolio, string $filename): void
+    {
+        $im = imagecreatetruecolor(1000, 1000);
+        $whitey = imagecolorallocate($im, 240, 240, 240);
+        $grey = imagecolorallocate($im, 48, 48, 48);
+        imagefill($im, 0, 0, $grey);
+
+        $lines = explode("\n", $this->presenter->toText($parsedPortfolio));
+
+        $height = self::FONT_SIZE;
+        foreach ($lines as $line) {
+            imagefttext($im, self::FONT_SIZE, 0, 0, $height, $whitey, $this->fontPath, $line);
+            $height += self::FONT_SIZE + (int) round(0.5 * self::FONT_SIZE);
+        }
+
+        $cropped = imagecropauto($im, IMG_CROP_SIDES);
+        if ($cropped !== false) {
+            imagedestroy($im);
+            $im = $cropped;
+        }
+
+        imagepng($im, $filename);
+        imagedestroy($im);
+    }
+}

src/Service/PortfolioPresenterInterface.php

@@ -8,7 +8,5 @@ use App\Domain\Entity\ParsedPortfolio;
 
 interface PortfolioPresenterInterface
 {
-    public function toImage(ParsedPortfolio $parsedPortfolio, string $filename): void;
-
     public function toText(ParsedPortfolio $parsedPortfolio): string;
 }

src/Service/ProxyChecker.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+readonly class ProxyChecker
+{
+    public function check(string $proxy): void
+    {
+        if ($proxy === '') {
+            return;
+        }
+
+        $parsed = parse_url($proxy);
+
+        if ($parsed === false || !isset($parsed['host'])) {
+            throw new \RuntimeException('TELEGRAM_PROXY: invalid URL format');
+        }
+
+        $host = $parsed['host'];
+        $port = $parsed['port'] ?? 1080;
+
+        $errno = 0;
+        $errstr = '';
+
+        $fp = @fsockopen($host, $port, $errno, $errstr, 5);
+
+        if ($fp === false) {
+            throw new \RuntimeException(
+                sprintf('TELEGRAM_PROXY is unreachable: %s:%d (%s)', $host, $port, $errstr),
+            );
+        }
+
+        fclose($fp);
+    }
+}

src/Service/SecurityTitleResolver.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+final class SecurityTitleResolver
+{
+    /** @var array{list<string>, list<string>} */
+    private readonly array $mapPrintable;
+
+    /** @var array<string, string> */
+    private array $cache;
+
+    public function __construct(array $securitiesMap)
+    {
+        $this->cache = [];
+        $this->mapPrintable = [
+            array_merge(['(в пути)'], array_keys($securitiesMap)),
+            array_merge(['±'], array_values($securitiesMap)),
+        ];
+    }
+
+    public function resolve(string $security, ?string $issuer = null): string
+    {
+        $security = str_replace(
+            $this->mapPrintable[0],
+            $this->mapPrintable[1],
+            $security,
+        );
+
+        if (!str_starts_with($security, 'RU00')) {
+            return $security;
+        }
+
+        if (isset($this->cache[$security])) {
+            return $this->cache[$security];
+        }
+
+        if ($issuer === null) {
+            return $security;
+        }
+
+        $title = str_replace(['МКПАО', 'ПАО', '"', ' ', '(', ')'], '', $issuer);
+        $this->cache[$security] = $title;
+
+        return $title;
+    }
+}

src/Service/TelegramNotifier.php

@@ -48,4 +48,4 @@ readonly class TelegramNotifier implements TelegramNotifierInterface
             ]);
         }
     }
-}
+}

src/Service/XmlParser.php

@@ -9,7 +9,7 @@ use App\Domain\Entity\PortfolioDetailItem;
 use App\Domain\Entity\PortfolioHeader;
 use App\Domain\Entity\PortfolioMovementItem;
 
-class XmlParser
+class XmlParser implements XmlParserInterface
 {
     private const XML_HEADER_AGRMT        = 'ШапкаГенСог';
     private const XML_HEADER_PERIOD       = 'ШапкаПериод';

src/Service/XmlParserInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Domain\Entity\ParsedPortfolio;
+
+interface XmlParserInterface
+{
+    public function processXml(\SimpleXMLElement $xml): ParsedPortfolio;
+}