some code cleanup

src/Command/ImportFromXmlCommand.php

@@ -7,7 +7,6 @@ use App\Service\TelegramNotifier;
 use App\Service\XmlParser;
 use Symfony\Component\Console\Attribute\AsCommand;
 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;
@@ -39,25 +38,44 @@ class ImportFromXmlCommand extends Command
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
+
         $xmlFile = $input->getOption('xml-file');
+        if (null === $xmlFile) {
+            $io->error('The --xml-file option is required.');
+
+            return Command::INVALID;
+        }
 
-//        if ($xmlFile) {
-//            $io->note(sprintf('You passed an argument: %s', $xmlFile));
-//        }
+        if (!is_file($xmlFile)) {
+            $io->error(sprintf('File not found: %s', $xmlFile));
+
+            return Command::INVALID;
+        }
 
         $xmlString = file_get_contents($xmlFile);
+        if (false === $xmlString) {
+            $io->error(sprintf('Cannot read file: %s', $xmlFile));
+
+            return Command::FAILURE;
+        }
+
         $xml = simplexml_load_string($xmlString);
+        if (false === $xml) {
+            $io->error('Invalid XML content.');
+
+            return Command::FAILURE;
+        }
 
         $parsedPortfolio = $this->xmlParser->processXml($xml);
-        print $this->portfolioPresenter->toText($parsedPortfolio);
+
+        $output->writeln($this->portfolioPresenter->toText($parsedPortfolio));
+
         $this->portfolioPresenter->toImage($parsedPortfolio, 'portfolio.png');
 
         if ($input->getOption('notify')) {
             $this->telegramNotifier->notify('', 'portfolio.png');
         }
 
-        //$io->success('You have a new command! Now make it your own! Pass --help to see your options.');
-
         return Command::SUCCESS;
     }
 }

src/Service/MailFetcher.php

@@ -11,6 +11,7 @@ use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Path;
 use App\Presentation\PortfolioPresenter;
 use App\Service\TelegramNotifier;
+use PhpImap\Exceptions\ConnectionException;
 
 readonly class MailFetcher
 {
@@ -35,9 +36,9 @@ readonly class MailFetcher
             // Get all emails (messages)
             // PHP.net imap_search criteria: http://php.net/manual/en/function.imap-search.php
             $mailsIds = $mailbox->searchMailbox('ALL');
-        } catch (PhpImap\Exceptions\ConnectionException $ex) {
+        } catch (ConnectionException $ex) {
             $this->logger->error("IMAP connection failed: " . implode(",", $ex->getErrors('all')));
-            die();
+            throw new \RuntimeException('IMAP connection failed', 0, $ex);
         }
 
         if (!$mailsIds) {

src/Service/PortfolioManager.php

@@ -28,19 +28,22 @@ readonly class PortfolioManager
         if ($portfolio) {
             $this->logger->debug("Found existing portfolio with id: " . $portfolio->getId() . ', skipped..');
             return false;
-        } else {
-            $newPortfolio = $this->savePortfolio($parsedPortfolio, $xmlString);
-            $this->logger->debug("Saved new portfolio with id: " . $newPortfolio->getId());
-            return true;
         }
+
+        $newPortfolio = $this->savePortfolio($parsedPortfolio, $xmlString, $startDate, $endDate);
+        $this->logger->debug("Saved new portfolio with id: " . $newPortfolio->getId());
+
+        return true;
     }
 
-    private function savePortfolio(ParsedPortfolio $parsedPortfolio, string $xmlString): Portfolio
-    {
+    private function savePortfolio(
+        ParsedPortfolio $parsedPortfolio,
+        string $xmlString,
+        \DateTime $startDate,
+        \DateTime $endDate,
+    ): Portfolio {
         $this->logger->debug(print_r($parsedPortfolio, true));
 
-        list($startDate, $endDate) = $parsedPortfolio->extractPeriod();
-
         $portfolio = new Portfolio();
 
         $portfolio->setClientAgreement($parsedPortfolio->getHeader()['Клиент']);
@@ -48,39 +51,41 @@ readonly class PortfolioManager
         $portfolio->setEndDate(new \DateTimeImmutable($endDate->format('Y-m-d')));
         $portfolio->setXmlData($xmlString);
 
-        $this->entityManager->persist($portfolio);
-
-        foreach ($parsedPortfolio->getDetails() as $parsedDetail) {
-            $detail = new PortfolioDetail();
-
-            $detail->setPortfolio($portfolio);
-            $detail->setIssuer($parsedDetail['Эмитент']);
-            $detail->setSecurity($parsedDetail['ЦБ']);
-            $detail->setPriceStart($parsedDetail['НОЦена']);
-            $detail->setPriceEnd($parsedDetail['КОЦена']);
-            $detail->setQuantityStart($parsedDetail['КоличествоНО']);
-            $detail->setQuantityEnd($parsedDetail['КоличествоКО']);
-            $detail->setSumStart($parsedDetail['СуммаНКДНО']);
-            $detail->setSumEnd($parsedDetail['СуммаНКДКО']);
-
-            $this->entityManager->persist($detail);
-        }
-
-        foreach ($parsedPortfolio->getMovements() as $parsedMovement) {
-            $movement = new PortfolioMovement();
-
-            $movement->setPortfolio($portfolio);
-            $movement->setSecurity($parsedMovement['ЦБ']);
-            $movement->setPeriod(new \DateTimeImmutable($parsedMovement['Период']));
-            $movement->setQuantityStart($parsedMovement['НО']);
-            $movement->setQuantityEnd($parsedMovement['КО']);
-            $movement->setQuantityIncome($parsedMovement['Приход']);
-            $movement->setQuantityOutcome($parsedMovement['Расход']);
-
-            $this->entityManager->persist($movement);
-        }
-
-        $this->entityManager->flush();
+        $this->entityManager->wrapInTransaction(function () use ($parsedPortfolio, $portfolio): void {
+            $this->entityManager->persist($portfolio);
+
+            foreach ($parsedPortfolio->getDetails() as $parsedDetail) {
+                $detail = new PortfolioDetail();
+
+                $detail->setPortfolio($portfolio);
+                $detail->setIssuer($parsedDetail['Эмитент']);
+                $detail->setSecurity($parsedDetail['ЦБ']);
+                $detail->setPriceStart($parsedDetail['НОЦена']);
+                $detail->setPriceEnd($parsedDetail['КОЦена']);
+                $detail->setQuantityStart($parsedDetail['КоличествоНО']);
+                $detail->setQuantityEnd($parsedDetail['КоличествоКО']);
+                $detail->setSumStart($parsedDetail['СуммаНКДНО']);
+                $detail->setSumEnd($parsedDetail['СуммаНКДКО']);
+
+                $this->entityManager->persist($detail);
+            }
+
+            foreach ($parsedPortfolio->getMovements() as $parsedMovement) {
+                $movement = new PortfolioMovement();
+
+                $movement->setPortfolio($portfolio);
+                $movement->setSecurity($parsedMovement['ЦБ']);
+                $movement->setPeriod(new \DateTimeImmutable($parsedMovement['Период']));
+                $movement->setQuantityStart($parsedMovement['НО']);
+                $movement->setQuantityEnd($parsedMovement['КО']);
+                $movement->setQuantityIncome($parsedMovement['Приход']);
+                $movement->setQuantityOutcome($parsedMovement['Расход']);
+
+                $this->entityManager->persist($movement);
+            }
+
+            $this->entityManager->flush();
+        });
 
         return $portfolio;
     }

src/Service/TelegramNotifier.php

@@ -2,6 +2,7 @@
 
 namespace App\Service;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransport;
 use Symfony\Component\Notifier\Chatter;
 use Symfony\Component\Notifier\Bridge\Telegram\TelegramOptions;
@@ -14,6 +15,7 @@ readonly class TelegramNotifier
         private string $telegramBotToken,
         private string $telegramChatId,
         private HttpClientInterface $httpClient,
+        private LoggerInterface $logger,
     ) {
     }
 
@@ -36,6 +38,12 @@ readonly class TelegramNotifier
 
         $chatMessage->options($telegramOptions);
 
-        $chatter->send($chatMessage);
+        try {
+            $chatter->send($chatMessage);
+        } catch (\Throwable $e) {
+            $this->logger->error('Telegram notification failed: ' . $e->getMessage(), [
+                'exception' => $e,
+            ]);
+        }
     }
 }