moved securities map from class constant to .env

.env

@@ -40,3 +40,5 @@ TELEGRAM_DSN=telegram://bot_token@default?channel=channel_id
 
 TELEGRAM_BOT_TOKEN=
 TELEGRAM_CHAT_ID=
+
+SECURITIES_MAP='{"RU000A1014L8":"LQDT", "RU000A107UL4":"T", "RU000A108X38":"X5"}'

README.md

@@ -9,3 +9,4 @@ The main goal is
 NB:
 Do not forget to remove `var/imap/attachments/*.bin` files after
 
+Use .env:SECURITIES_MAP to substitute more human-readable titles instead of given ones

config/services.yaml

@@ -4,6 +4,7 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
+    securitiesMap: '%env(json:SECURITIES_MAP)%'
 
 services:
     # default configuration for services in *this* file
@@ -26,3 +27,7 @@ services:
         arguments:
             $telegramBotToken: '%env(TELEGRAM_BOT_TOKEN)%'
             $telegramChatId: '%env(TELEGRAM_CHAT_ID)%'
+
+    App\Presentation\PortfolioPresenter:
+        arguments:
+            $securitiesMap: '%securitiesMap%'

src/Command/FetchEmailsCommand.php

@@ -14,12 +14,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 )]
 class FetchEmailsCommand extends Command
 {
-    private MailFetcher $mailFetcher;
-
-    public function __construct(MailFetcher $mailFetcher)
+    public function __construct(private readonly MailFetcher $mailFetcher)
     {
         parent::__construct();
-        $this->mailFetcher = $mailFetcher;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int

src/Command/ImportFromXmlCommand.php

@@ -2,7 +2,7 @@
 
 namespace App\Command;
 
-use App\Presentation\PortfolioPresenter as PresentationPortfolio;
+use App\Presentation\PortfolioPresenter;
 use App\Service\TelegramNotifier;
 use App\Service\XmlParser;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -20,8 +20,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 class ImportFromXmlCommand extends Command
 {
     public function __construct(
-        private readonly XmlParser        $xmlParser,
-        private readonly TelegramNotifier $telegramNotifier,
+        private readonly XmlParser          $xmlParser,
+        private readonly TelegramNotifier   $telegramNotifier,
+        private readonly PortfolioPresenter $portfolioPresenter,
     )
     {
         parent::__construct();
@@ -32,8 +33,7 @@ class ImportFromXmlCommand extends Command
         $this
             //->addArgument('xml-file', null, InputArgument::REQUIRED, 'XML file with portfolio data')
             ->addOption('xml-file', null, InputOption::VALUE_REQUIRED, 'XML file with Portfolio data')
-            ->addOption('notify', null, InputOption::VALUE_NONE, 'Notify to telegram')
-        ;
+            ->addOption('notify', null, InputOption::VALUE_NONE, 'Notify to telegram');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -49,8 +49,8 @@ class ImportFromXmlCommand extends Command
         $xml = simplexml_load_string($xmlString);
 
         $parsedPortfolio = $this->xmlParser->processXml($xml);
-        print (new PresentationPortfolio)->toText($parsedPortfolio);
-        (new PresentationPortfolio)->toImage($parsedPortfolio, 'portfolio.png');
+        print $this->portfolioPresenter->toText($parsedPortfolio);
+        $this->portfolioPresenter->toImage($parsedPortfolio, 'portfolio.png');
 
         if ($input->getOption('notify')) {
             $this->telegramNotifier->notify('', 'portfolio.png');

src/Presentation/PortfolioPresenter.php

@@ -9,15 +9,17 @@ use Symfony\Component\Console\Helper\TableStyle;
 
 class PortfolioPresenter
 {
-    private const SecurityMapPrint = [
-        ['RU000A1014L8', 'RU000A107UL4', '(в пути)'], ['LQDT', 'T', '±'],
-    ];
-
     private const FONT_SIZE = 12;
     private const FONT_NAME = 'droid_sans_mono';
     private const COPYRIGHT_MARK = ' ©ЕИ';
+    private array $securityMapPrintable = [['(в пути)'], ['±']];
+    private array $mapSecurityTitle = [];
 
-    private array $MapSecuritiesPrintable = [];
+    public function __construct(array $securitiesMap)
+    {
+        array_unshift($this->securityMapPrintable[0], ...array_keys($securitiesMap));
+        array_unshift($this->securityMapPrintable[1], ...array_values($securitiesMap));
+    }
 
     public function toImage(ParsedPortfolio $parsedPortfolio, string $filename): void
     {
@@ -118,14 +120,14 @@ class PortfolioPresenter
 
     private function getPrintableSecurityTitle(array $security): string
     {
-        $security['ЦБ'] = str_replace(self::SecurityMapPrint[0], self::SecurityMapPrint[1], $security['ЦБ']);
+        $security['ЦБ'] = str_replace($this->securityMapPrintable[0], $this->securityMapPrintable[1], $security['ЦБ']);
 
         if (!str_starts_with($security['ЦБ'], 'RU00')) {
             return $security['ЦБ'];
         }
 
-        if (isset($this->MapSecuritiesPrintable[$security['ЦБ']])) {
-            return $this->MapSecuritiesPrintable[$security['ЦБ']];
+        if (isset($this->mapSecurityTitle[$security['ЦБ']])) {
+            return $this->mapSecurityTitle[$security['ЦБ']];
         }
 
         if (!isset($security['Эмитент'])) {
@@ -133,7 +135,7 @@ class PortfolioPresenter
         }
 
         $title = str_replace(['МКПАО', 'ПАО', '"', ' ', '(', ')'], ['', '', '', '', '', ''], $security['Эмитент']);
-        $this->MapSecuritiesPrintable[$security['ЦБ']] = $title;
+        $this->mapSecurityTitle[$security['ЦБ']] = $title;
 
         return $title;
     }

src/Service/MailFetcher.php

@@ -9,7 +9,7 @@ use SecIT\ImapBundle\Connection\ConnectionInterface;
 use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Path;
-use App\Presentation\PortfolioPresenter as PresentationPortfolio;
+use App\Presentation\PortfolioPresenter;
 use App\Service\TelegramNotifier;
 
 readonly class MailFetcher
@@ -21,6 +21,7 @@ readonly class MailFetcher
         private PortfolioManager    $portfolioManager,
         private LoggerInterface     $logger,
         private TelegramNotifier    $telegramNotifier,
+        private PortfolioPresenter  $portfolioPresenter,
     )
     {
     }
@@ -135,7 +136,7 @@ readonly class MailFetcher
                 //$this->telegramNotifier->notify('<pre>' . (new PresentationPortfolio)->toText($parsedPortfolio) . '</pre>');
 
                 $pngFilename = $tmpdir . '/portfolio.png';
-                (new PresentationPortfolio)->toImage($parsedPortfolio, $pngFilename);
+                $this->portfolioPresenter->toImage($parsedPortfolio, $pngFilename);
                 $this->telegramNotifier->notify('', $pngFilename);
             }