some fixed and code cleanup

.gitignore

@@ -8,3 +8,4 @@
 /var/
 /vendor/
 ###< symfony/framework-bundle ###
+.idea

src/Command/FetchEmailsCommand.php

@@ -34,6 +34,7 @@ class FetchEmailsCommand extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        /*
         $io = new SymfonyStyle($input, $output);
         $arg1 = $input->getArgument('arg1');
 
@@ -44,11 +45,12 @@ class FetchEmailsCommand extends Command
         if ($input->getOption('option1')) {
             // ...
         }
+        */
 
         $this->mailFetcher->fetchNewEmails();
 
 
-        $io->success('You have a new command! Now make it your own! Pass --help to see your options.');
+        //$io->success('You have a new command! Now make it your own! Pass --help to see your options.');
 
         return Command::SUCCESS;
     }

src/Presentation/PortfolioPresenter.php

@@ -9,6 +9,11 @@ use Symfony\Component\Console\Helper\TableStyle;
 
 class PortfolioPresenter
 {
+    public const SecurityMapPrint = [
+        'RU000A1014L8' => 'LQDT',
+    ];
+
+
     public static function toPrint(ParsedPortfolio $parsedPortfolio): string
     {
         $output = new BufferedOutput();
@@ -26,7 +31,7 @@ class PortfolioPresenter
 
         foreach ($parsedPortfolio->getDetails() as $detail) {
             $table->addRow([
-                $detail['ЦБ'],// . ' ' . $detail['Эмитент'],
+                self::SecurityMapPrint[$detail['ЦБ']] ?? $detail['ЦБ'],// . ' ' . $detail['Эмитент'],
                 $detail['КоличествоНО'],
                 $detail['НОЦена'],
                 //$detail['СуммаНКДНО'],
@@ -51,11 +56,11 @@ class PortfolioPresenter
 
         foreach ($parsedPortfolio->getMovements() as $movement) {
             $table->addRow([
-                $movement['ЦБ'],
+                self::SecurityMapPrint[$movement['ЦБ']] ?? $movement['ЦБ'],
                 //$movement['Период'],
                 $movement['НО'],
-                $movement['Приход']>0 ? '+'.$movement['Приход'] : $movement['Приход'],
-                $movement['Расход']>0 ? '-'.$movement['Расход'] : $movement['Расход'],
+                $movement['Приход'] > 0 ? '+' . $movement['Приход'] : $movement['Приход'],
+                $movement['Расход'] > 0 ? '-' . $movement['Расход'] : $movement['Расход'],
                 $movement['КО'],
             ]);
         }

src/Service/MailFetcher.php

@@ -10,23 +10,17 @@ use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Path;
 use App\Presentation\PortfolioPresenter as PresentationPortfolio;
-use Symfony\Component\Notifier\Bridge\Telegram\TelegramOptions;
-use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransport;
-use Symfony\Component\Notifier\Chatter;
-use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Notifier;
-use Symfony\Component\Notifier\NotifierInterface;
 use App\Service\TelegramNotifier;
 
 readonly class MailFetcher
 {
     public function __construct(
         #[Target('finfollowConnection')]
-        private ConnectionInterface   $connection,
-        private XmlParser             $xmlParser,
-        private PortfolioManager      $portfolioManager,
-        private LoggerInterface       $logger,
-        private TelegramNotifier      $telegramNotifier,
+        private ConnectionInterface $connection,
+        private XmlParser           $xmlParser,
+        private PortfolioManager    $portfolioManager,
+        private LoggerInterface     $logger,
+        private TelegramNotifier    $telegramNotifier,
     )
     {
     }
@@ -46,13 +40,13 @@ readonly class MailFetcher
         if (!$mailsIds) {
             $this->logger->info('Mailbox is empty');
 
-            $this->logger->warn("Here we should send info about no changes performed..");
+            $this->logger->warning("Here we should send info about no changes performed..");
 
             return;
         }
 
-// If '__DIR__' was defined in the first line, it will automatically
-// save all attachments to the specified directory
+        // If '__DIR__' was defined in the first line, it will automatically
+        // save all attachments to the specified directory
 
         foreach ($mailsIds as $mailId) {
             $mail = $mailbox->getMail($mailId);
@@ -72,7 +66,7 @@ readonly class MailFetcher
 
                 }
 
-                //$mailbox->deleteMail($mailId);
+                $mailbox->deleteMail($mailId);
                 $this->logger->debug("Deleted email with id=" . $mailId);
             } else {
                 $this->logger->debug("Skipped mail with id=" . $mailId);
@@ -141,8 +135,8 @@ readonly class MailFetcher
             $parsedPortfolio = $this->xmlParser->processXml($xml);
             $message = PresentationPortfolio::toPrint($parsedPortfolio);
 
-             if ($this->portfolioManager->updatePortfolio($parsedPortfolio, $xmlString)) {
-                 $this->telegramNotifier->notify($message);
+            if ($this->portfolioManager->updatePortfolio($parsedPortfolio, $xmlString)) {
+                $this->telegramNotifier->notify('<pre>' . $message . '</pre>');
             }
 
             $fs = new Filesystem();

src/Service/TelegramNotifier.php

@@ -9,20 +9,15 @@ use Symfony\Component\Notifier\Message\ChatMessage;
 
 readonly class TelegramNotifier
 {
-    private string $telegramBotToken;
-    private string $telegramChatId;
-
-    public function __construct(string $telegramBotToken, string $telegramChatId)
+    public function __construct(private string $telegramBotToken, private string $telegramChatId)
     {
-        $this->telegramBotToken = $telegramBotToken;
-        $this->telegramChatId = $telegramChatId;
     }
 
     public function notify(string $message): void
     {
         $telegramTransport = new TelegramTransport($this->telegramBotToken, $this->telegramChatId);
         $chatter = new Chatter($telegramTransport);
-        $chatMessage = new ChatMessage('<pre>' . $message . '</pre>');
+        $chatMessage = new ChatMessage($message);
 
         $telegramOptions = new TelegramOptions();
         $telegramOptions->parseMode(TelegramOptions::PARSE_MODE_HTML);