code reengineered

.env

@@ -31,7 +31,7 @@ IMAP_STORE_ATTACHMENTS_DIR=var/imap/attachments
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
-DATABASE_URL="postgresql://db_user:secret@127.0.0.1:5432/finfollow?serverVersion=11&charset=utf8"
+DATABASE_URL="postgresql://db_user:secret@127.0.0.1:5432/finfollow?serverVersion=13&charset=utf8"
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/telegram-notifier ###
@@ -46,4 +46,4 @@ TELEGRAM_CHAT_ID=
 SECURITIES_MAP='{"RU000A1014L8":"LQDT", "RU000A107UL4":"T", "RU000A108X38":"X5"}'
 
 VALID_EMAIL_SUBJECT='Broker report'
-VALID_EMAIL_SENDER='@bcs.ru'
+VALID_EMAIL_SENDER='@bcs.ru'

config/services.yaml

@@ -37,6 +37,7 @@ services:
     App\Presentation\PortfolioPresenter:
         arguments:
             $securitiesMap: '%securitiesMap%'
+            $fontDir: '%kernel.project_dir%'
 
     App\Service\MailFetcher:
         arguments:

src/Domain/Entity/ParsedPortfolio.php

@@ -1,54 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Domain\Entity;
 
 final readonly class ParsedPortfolio
 {
-    private array $header;
-
-    private array $details;
-
-    private array $movements;
-
-
-    public function __construct(array $header, array $details, array $movements)
-    {
-        $this->header = $header;
-        $this->details = $details;
-        $this->movements = $movements;
-    }
-
-    public function getHeader(): array
-    {
-        return $this->header;
-    }
-
-    public function getDetails(): array
-    {
-        return $this->details;
-    }
-
-    public function getMovements(): array
-    {
-        return $this->movements;
-    }
-
-    public function extractPeriod(): array
-    {
-        if (array_key_exists('НачПериода', $this->header)) {
-            $startDate = \DateTime::createFromFormat('d.m.Y', $this->header['НачПериода']);
-            $endDate = \DateTime::createFromFormat('d.m.Y', $this->header['КонПериода']);
-        } elseif (array_key_exists('СтрокаПериода', $this->header)) {
-            $chunks = explode(' ', $this->header['СтрокаПериода']);
-
-            if(count($chunks) !== 4) throw new \Exception('Unexpected period format!');
-
-            $startDate = \DateTime::createFromFormat('d.m.Y', $chunks[1]);
-            $endDate = \DateTime::createFromFormat('d.m.Y', $chunks[3]);
-        } else {
-            throw new \Exception('Can not detect xml header version!');
-        }
-
-        return [$startDate, $endDate];
+    /** @param PortfolioDetailItem[] $details */
+    /** @param PortfolioMovementItem[] $movements */
+    public function __construct(
+        public PortfolioHeader $header,
+        public array $details,
+        public array $movements,
+    ) {
     }
 }

src/Domain/Entity/PortfolioDetailItem.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Domain\Entity;
+
+final readonly class PortfolioDetailItem
+{
+    public function __construct(
+        public string $issuer,
+        public string $security,
+        public string $priceStart,
+        public string $priceEnd,
+        public int $quantityStart,
+        public int $quantityEnd,
+        public string $sumStart,
+        public string $sumEnd,
+        public string $sumTotal,
+    ) {
+    }
+}

src/Domain/Entity/PortfolioHeader.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Domain\Entity;
+
+final readonly class PortfolioHeader
+{
+    public function __construct(
+        public string $clientAgreement,
+        public \DateTimeImmutable $startDate,
+        public \DateTimeImmutable $endDate,
+    ) {
+    }
+}

src/Domain/Entity/PortfolioMovementItem.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Domain\Entity;
+
+final readonly class PortfolioMovementItem
+{
+    public function __construct(
+        public string $security,
+        public \DateTimeImmutable $period,
+        public int $quantityStart,
+        public int $quantityEnd,
+        public int $quantityIncome,
+        public int $quantityOutcome,
+    ) {
+    }
+}

src/Presentation/PortfolioPresenter.php

@@ -1,24 +1,35 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Presentation;
 
 use App\Domain\Entity\ParsedPortfolio;
+use App\Service\PortfolioPresenterInterface;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Helper\TableStyle;
 
-class PortfolioPresenter
+class PortfolioPresenter implements PortfolioPresenterInterface
 {
     private const FONT_SIZE = 12;
-    private const FONT_NAME = 'droid_sans_mono';
+    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 = [];
 
-    public function __construct(array $securitiesMap)
+    private string $fontPath;
+
+    public function __construct(array $securitiesMap, string $fontDir)
     {
         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
@@ -28,20 +39,17 @@ class PortfolioPresenter
         $grey = imagecolorallocate($im, 48, 48, 48);
         imagefill($im, 0, 0, $grey);
 
-        putenv('GDFONTPATH=' . realpath('.'));
-        // Замена пути к шрифту на пользовательский
-
         $lines = explode("\n", $this->toText($parsedPortfolio));
         $height = self::FONT_SIZE;
         foreach ($lines as $line) {
-            imagefttext($im, self::FONT_SIZE, 0, 0, $height, $whitey, self::FONT_NAME, $line);
-            $height += self::FONT_SIZE + round(0.5 * self::FONT_SIZE);
+            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) { // in case a new image object was returned
-            imagedestroy($im);    // we destroy the original image
-            $im = $cropped;       // and assign the cropped image to $im
+        if ($cropped !== false) {
+            imagedestroy($im);
+            $im = $cropped;
         }
 
         imagepng($im, $filename);
@@ -50,8 +58,8 @@ class PortfolioPresenter
 
     public function toText(ParsedPortfolio $parsedPortfolio): string
     {
-        list($startDate, $endDate) = $parsedPortfolio->extractPeriod();
-        $periodTitle = $startDate->format('d.m.y').' - '.$endDate->format('d.m.y');
+        $header = $parsedPortfolio->header;
+        $periodTitle = $header->startDate->format('d.m.y') . ' - ' . $header->endDate->format('d.m.y');
 
         $total = $this->calcTotalSum($parsedPortfolio);
 
@@ -64,20 +72,17 @@ class PortfolioPresenter
         $cellStyle->setPadType(STR_PAD_RIGHT);
 
         $table = new Table($output);
-        $table->setHeaderTitle('ПОРТФЕЛЬ: '.$periodTitle);
-        $table->setHeaders([
-            'ЦБ', 'Кол-во', 'Цн', 'Цк', 'Сумм', '%'
-        ]);
+        $table->setHeaderTitle('ПОРТФЕЛЬ: ' . $periodTitle);
+        $table->setHeaders(['ЦБ', 'Кол-во', 'Цн', 'Цк', 'Сумм', '%']);
 
-        foreach ($parsedPortfolio->getDetails() as $detail) {
+        foreach ($parsedPortfolio->details as $detail) {
             $table->addRow([
-                $this->getPrintableSecurityTitle($detail),
-                $this->formatQuantity($detail),
-                $detail['НОЦена'],
-                //$detail['СуммаНКДНО'],
-                $detail['КОЦена'],
-                round($detail['КОСумма']),
-                round(100 * $detail['КОСумма'] / $total, 2),
+                $this->getPrintableSecurityTitle($detail->security, $detail->issuer),
+                $this->formatQuantity($detail->quantityStart, $detail->quantityEnd),
+                $detail->priceStart,
+                $detail->priceEnd,
+                round((float) $detail->sumTotal),
+                round(100 * (float) $detail->sumTotal / $total, 2),
             ]);
         }
 
@@ -87,19 +92,16 @@ class PortfolioPresenter
         $txt = $output->fetch();
 
         $table = new Table($output);
-        $table->setHeaderTitle('ДВИЖ: '.$periodTitle);
-        $table->setHeaders([
-            'ЦБ', 'Кн', 'In', 'Out', 'Кк'
-        ]);
+        $table->setHeaderTitle('ДВИЖ: ' . $periodTitle);
+        $table->setHeaders(['ЦБ', 'Кн', 'In', 'Out', 'Кк']);
 
-        foreach ($parsedPortfolio->getMovements() as $movement) {
+        foreach ($parsedPortfolio->movements as $movement) {
             $table->addRow([
-                $this->getPrintableSecurityTitle($movement),
-                //$movement['Период'],
-                $movement['НО'],
-                $movement['Приход'] > 0 ? '+' . $movement['Приход'] : $movement['Приход'],
-                $movement['Расход'] > 0 ? '-' . $movement['Расход'] : $movement['Расход'],
-                $movement['КО'],
+                $this->getPrintableSecurityTitle($movement->security),
+                $movement->quantityStart,
+                $movement->quantityIncome > 0 ? '+' . $movement->quantityIncome : $movement->quantityIncome,
+                $movement->quantityOutcome > 0 ? '-' . $movement->quantityOutcome : $movement->quantityOutcome,
+                $movement->quantityEnd,
             ]);
         }
 
@@ -114,44 +116,47 @@ class PortfolioPresenter
     {
         $total = 0.0;
 
-        foreach ($parsedPortfolio->getDetails() as $detail) {
-            $total += $detail['КОСумма'];
+        foreach ($parsedPortfolio->details as $detail) {
+            $total += (float) $detail->sumTotal;
         }
 
         return $total;
     }
 
-    private function getPrintableSecurityTitle(array $security): string
+    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['ЦБ'];
+        $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 (isset($this->mapSecurityTitle[$security])) {
+            return $this->mapSecurityTitle[$security];
         }
 
-        if (!isset($security['Эмитент'])) {
-            return $security['ЦБ'];
+        if ($issuer === null) {
+            return $security;
         }
 
-        $title = str_replace(['МКПАО', 'ПАО', '"', ' ', '(', ')'], ['', '', '', '', '', ''], $security['Эмитент']);
-        $this->mapSecurityTitle[$security['ЦБ']] = $title;
+        $title = str_replace(['МКПАО', 'ПАО', '"', ' ', '(', ')'], '', $issuer);
+        $this->mapSecurityTitle[$security] = $title;
 
         return $title;
     }
 
-    private function formatQuantity(array $detail): string
+    private function formatQuantity(int $quantityStart, int $quantityEnd): string
     {
-        if ($detail['КоличествоНО'] == $detail['КоличествоКО']) {
-            return $detail['КоличествоНО'];
-        } else {
-            return ($detail['КоличествоНО'] > 0 ? $detail['КоличествоНО'] . ' ' : '')
-                . ($detail['КоличествоКО'] > $detail['КоличествоНО'] ? '+' : '')
-                . ($detail['КоличествоКО'] - $detail['КоличествоНО']);
+        if ($quantityStart === $quantityEnd) {
+            return (string) $quantityStart;
         }
-    }
 
+        return ($quantityStart > 0 ? $quantityStart . ' ' : '')
+            . ($quantityEnd > $quantityStart ? '+' : '')
+            . ($quantityEnd - $quantityStart);
+    }
 }

src/Service/AttachmentProcessor.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use PhpImap\IncomingMailAttachment;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Filesystem\Filesystem;
+
+readonly class AttachmentProcessor
+{
+    public function __construct(private LoggerInterface $logger)
+    {
+    }
+
+    public function extractXmlFromAttachment(IncomingMailAttachment $attachment): ?string
+    {
+        if (strtolower($attachment->mimeType) !== 'application/zip') {
+            return null;
+        }
+
+        $zip = new \ZipArchive();
+        if ($zip->open($attachment->filePath) !== true) {
+            $this->logger->error('ZIP open error');
+            return null;
+        }
+
+        $xmlString = null;
+        $tmpdir = null;
+
+        for ($i = 0; $i < $zip->numFiles; $i++) {
+            $stat = $zip->statIndex($i);
+
+            if (pathinfo($stat['name'], PATHINFO_EXTENSION) !== 'xml') {
+                continue;
+            }
+
+            $tmpdir = $this->getTmpDir();
+            $zip->extractTo($tmpdir, [$stat['name']]);
+            $this->logger->debug("Extracted '{$stat['name']}' into '$tmpdir'");
+
+            $content = file_get_contents($tmpdir . '/' . $stat['name']);
+            if ($content !== false) {
+                $xmlString = $content;
+                break;
+            }
+        }
+
+        $zip->close();
+
+        if ($tmpdir !== null) {
+            (new Filesystem())->remove($tmpdir);
+        }
+
+        return $xmlString;
+    }
+
+    private function getTmpDir(): string
+    {
+        $tmpdir = sys_get_temp_dir() . '/FINFOLLOW-' . uniqid();
+
+        (new Filesystem())->mkdir($tmpdir);
+
+        return $tmpdir;
+    }
+}

src/Service/MailFetcher.php

@@ -1,17 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Service;
 
+use App\Presentation\PortfolioPresenter;
+use App\Service\TelegramNotifier;
+use PhpImap\Exceptions\ConnectionException;
 use PhpImap\IncomingMail;
-use PhpImap\IncomingMailAttachment;
 use Psr\Log\LoggerInterface;
 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;
-use App\Service\TelegramNotifier;
-use PhpImap\Exceptions\ConnectionException;
 
 readonly class MailFetcher
 {
@@ -23,6 +22,7 @@ readonly class MailFetcher
         private LoggerInterface     $logger,
         private TelegramNotifier    $telegramNotifier,
         private PortfolioPresenter  $portfolioPresenter,
+        private AttachmentProcessor $attachmentProcessor,
         private string              $validEmailSubject,
         private string              $validEmailSender,
     )
@@ -33,8 +33,6 @@ readonly class MailFetcher
     {
         $mailbox = $this->connection->getMailbox();
         try {
-            // Get all emails (messages)
-            // PHP.net imap_search criteria: http://php.net/manual/en/function.imap-search.php
             $mailsIds = $mailbox->searchMailbox('ALL');
         } catch (ConnectionException $ex) {
             $this->logger->error("IMAP connection failed: " . implode(",", $ex->getErrors('all')));
@@ -47,9 +45,6 @@ readonly class MailFetcher
             return;
         }
 
-        // 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);
 
@@ -62,11 +57,7 @@ readonly class MailFetcher
             ], true));
 
             if ($this->canProcessMail($mail)) {
-                if ($this->processMail($mail)) {
-                    // for dev purposes
-                    //break;
-                }
-
+                $this->processMail($mail);
                 $mailbox->deleteMail($mailId);
                 $this->logger->debug("Deleted email with id=" . $mailId);
             } else {
@@ -94,72 +85,27 @@ readonly class MailFetcher
         return true;
     }
 
-    private function processMail(IncomingMail $mail): bool
+    private function processMail(IncomingMail $mail): void
     {
-        $mailProcessed = false;
-
         foreach ($mail->getAttachments() as $attachment) {
-            if ($attachment->mimeType != 'application/zip') {
+            $xmlString = $this->attachmentProcessor->extractXmlFromAttachment($attachment);
+            if ($xmlString === null) {
                 continue;
             }
 
-            $mailProcessed |= $this->processZipArchiveAttachment($attachment);
-        }
-
-        return $mailProcessed;
-    }
-
-    private function processZipArchiveAttachment(IncomingMailAttachment $attachment): bool
-    {
-        $zip = new \ZipArchive();
-        if ($zip->open($attachment->filePath) !== true) {
-            $this->logger->error('ZIP open error: ' . $zip);
-            return false;
-        }
-
-        $xmlFound = false;
-        for ($i = 0; $i < $zip->numFiles; $i++) {
-            $stat = $zip->statIndex($i);
-
-            if (pathinfo($stat['name'])['extension'] !== 'xml') {
+            $xml = simplexml_load_string($xmlString);
+            if ($xml === false) {
+                $this->logger->error('Invalid XML from attachment');
                 continue;
             }
 
-            $tmpdir = $this->getTmpDir();
-
-            $zip->extractTo($tmpdir, [$stat['name']]);
-            $this->logger->debug("Extracted '$stat[name]' into '$tmpdir'");
-
-            $xmlString = file_get_contents($tmpdir . '/' . $stat['name']);
-            $xml = simplexml_load_string($xmlString);
-
             $parsedPortfolio = $this->xmlParser->processXml($xml);
 
             if ($this->portfolioManager->updatePortfolio($parsedPortfolio, $xmlString)) {
-                //$this->telegramNotifier->notify('<pre>' . (new PresentationPortfolio)->toText($parsedPortfolio) . '</pre>');
-
-                $pngFilename = $tmpdir . '/portfolio.png';
+                $pngFilename = tempnam(sys_get_temp_dir(), 'finfollow-portfolio-');
                 $this->portfolioPresenter->toImage($parsedPortfolio, $pngFilename);
                 $this->telegramNotifier->notify('', $pngFilename);
             }
-
-            $fs = new Filesystem();
-            $fs->remove($tmpdir);
-
-            $xmlFound = true;
         }
-
-        return $xmlFound;
-    }
-
-    private function getTmpDir(): string
-    {
-        $tmpdir = Path::normalize(sys_get_temp_dir() . '/FINFOLLOW-' . random_int(0, 100));
-
-        $filesystem = new Filesystem();
-        $filesystem->mkdir($tmpdir);
-
-        return $tmpdir;
     }
-
-}
+}

src/Service/PortfolioManager.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Service;
 
 use App\Domain\Entity\ParsedPortfolio;
@@ -17,12 +19,12 @@ readonly class PortfolioManager
 
     public function updatePortfolio(ParsedPortfolio $parsedPortfolio, string $xmlString): bool
     {
-        list($startDate, $endDate) = $parsedPortfolio->extractPeriod();
+        $header = $parsedPortfolio->header;
 
         $portfolio = $this->entityManager->getRepository(Portfolio::class)->findOneBy([
-            'clientAgreement' => $parsedPortfolio->getHeader()['Клиент'],
-            'startDate' => new \DateTimeImmutable($startDate->format('Y-m-d')),
-            'endDate' => new \DateTimeImmutable($endDate->format('Y-m-d')),
+            'clientAgreement' => $header->clientAgreement,
+            'startDate' => $header->startDate,
+            'endDate' => $header->endDate,
         ]);
 
         if ($portfolio) {
@@ -30,56 +32,54 @@ readonly class PortfolioManager
             return false;
         }
 
-        $newPortfolio = $this->savePortfolio($parsedPortfolio, $xmlString, $startDate, $endDate);
+        $newPortfolio = $this->savePortfolio($parsedPortfolio, $xmlString);
         $this->logger->debug("Saved new portfolio with id: " . $newPortfolio->getId());
 
         return true;
     }
 
-    private function savePortfolio(
-        ParsedPortfolio $parsedPortfolio,
-        string $xmlString,
-        \DateTime $startDate,
-        \DateTime $endDate,
-    ): Portfolio {
+    private function savePortfolio(ParsedPortfolio $parsedPortfolio, string $xmlString): Portfolio
+    {
         $this->logger->debug(print_r($parsedPortfolio, true));
 
+        $header = $parsedPortfolio->header;
+
         $portfolio = new Portfolio();
 
-        $portfolio->setClientAgreement($parsedPortfolio->getHeader()['Клиент']);
-        $portfolio->setStartDate(new \DateTimeImmutable($startDate->format('Y-m-d')));
-        $portfolio->setEndDate(new \DateTimeImmutable($endDate->format('Y-m-d')));
+        $portfolio->setClientAgreement($header->clientAgreement);
+        $portfolio->setStartDate($header->startDate);
+        $portfolio->setEndDate($header->endDate);
         $portfolio->setXmlData($xmlString);
 
         $this->entityManager->wrapInTransaction(function () use ($parsedPortfolio, $portfolio): void {
             $this->entityManager->persist($portfolio);
 
-            foreach ($parsedPortfolio->getDetails() as $parsedDetail) {
+            foreach ($parsedPortfolio->details as $item) {
                 $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['СуммаНКДКО']);
+                $detail->setIssuer($item->issuer);
+                $detail->setSecurity($item->security);
+                $detail->setPriceStart($item->priceStart);
+                $detail->setPriceEnd($item->priceEnd);
+                $detail->setQuantityStart($item->quantityStart);
+                $detail->setQuantityEnd($item->quantityEnd);
+                $detail->setSumStart($item->sumStart);
+                $detail->setSumEnd($item->sumEnd);
 
                 $this->entityManager->persist($detail);
             }
 
-            foreach ($parsedPortfolio->getMovements() as $parsedMovement) {
+            foreach ($parsedPortfolio->movements as $item) {
                 $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['Расход']);
+                $movement->setSecurity($item->security);
+                $movement->setPeriod($item->period);
+                $movement->setQuantityStart($item->quantityStart);
+                $movement->setQuantityEnd($item->quantityEnd);
+                $movement->setQuantityIncome($item->quantityIncome);
+                $movement->setQuantityOutcome($item->quantityOutcome);
 
                 $this->entityManager->persist($movement);
             }
@@ -89,5 +89,4 @@ readonly class PortfolioManager
 
         return $portfolio;
     }
-
 }

src/Service/PortfolioPresenterInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Domain\Entity\ParsedPortfolio;
+
+interface PortfolioPresenterInterface
+{
+    public function toImage(ParsedPortfolio $parsedPortfolio, string $filename): void;
+
+    public function toText(ParsedPortfolio $parsedPortfolio): string;
+}

src/Service/TelegramNotifier.php

@@ -9,7 +9,7 @@ use Symfony\Component\Notifier\Bridge\Telegram\TelegramOptions;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-readonly class TelegramNotifier
+readonly class TelegramNotifier implements TelegramNotifierInterface
 {
     public function __construct(
         private string $telegramBotToken,

src/Service/TelegramNotifierInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+interface TelegramNotifierInterface
+{
+    public function notify(string $message, ?string $filename = null): void;
+}

src/Service/XmlParser.php

@@ -1,59 +1,127 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Service;
 
 use App\Domain\Entity\ParsedPortfolio;
+use App\Domain\Entity\PortfolioDetailItem;
+use App\Domain\Entity\PortfolioHeader;
+use App\Domain\Entity\PortfolioMovementItem;
 
 class XmlParser
 {
     public function processXml(\SimpleXMLElement $xml): ParsedPortfolio
     {
-        $portfolio = [
-            'header' => $this->processXmlHeader($xml),
-            'details' => $this->processXmlElement($xml->{'ЗаголовокПортфель'}->{'ШапкаПортфель'}),
-            'movements' => $this->processXmlElement($xml->{'ШапкаДвиженияИОстаткиЦБ'}),
-        ];
-
-        return new ParsedPortfolio(...$portfolio);
+        return new ParsedPortfolio(
+            header: $this->processXmlHeader($xml),
+            details: $this->processDetails($xml->{'ЗаголовокПортфель'}->{'ШапкаПортфель'}),
+            movements: $this->processMovements($xml->{'ШапкаДвиженияИОстаткиЦБ'}),
+        );
     }
 
-
-    private function processXmlHeader(\SimpleXMLElement $xml): array
+    private function processXmlHeader(\SimpleXMLElement $xml): PortfolioHeader
     {
-        $header = [];
-        foreach (['ШапкаГенСог', 'ШапкаПериод'] as $h) {
-            foreach ($xml->{$h}->attributes() as $key => $value) {
-                $header[$key] = get_object_vars($value)[0];
+        $attrs = [];
+        foreach (['ШапкаГенСог', 'ШапкаПериод'] as $section) {
+            foreach ($xml->{$section}->attributes() as $key => $value) {
+                $attrs[$key] = get_object_vars($value)[0];
+            }
+        }
+
+        if (array_key_exists('НачПериода', $attrs)) {
+            $startDate = \DateTimeImmutable::createFromFormat('d.m.Y', $attrs['НачПериода']);
+            $endDate   = \DateTimeImmutable::createFromFormat('d.m.Y', $attrs['КонПериода']);
+        } elseif (array_key_exists('СтрокаПериода', $attrs)) {
+            $chunks = explode(' ', $attrs['СтрокаПериода']);
+            if (count($chunks) !== 4) {
+                throw new \RuntimeException('Unexpected period format');
             }
+            $startDate = \DateTimeImmutable::createFromFormat('d.m.Y', $chunks[1]);
+            $endDate   = \DateTimeImmutable::createFromFormat('d.m.Y', $chunks[3]);
+        } else {
+            throw new \RuntimeException('Cannot detect XML header version');
         }
 
-        return $header;
+        if (!$startDate || !$endDate) {
+            throw new \RuntimeException('Invalid date format in XML header');
+        }
+
+        return new PortfolioHeader(
+            clientAgreement: $attrs['Клиент'],
+            startDate: $startDate,
+            endDate: $endDate,
+        );
     }
 
-    private function processXmlElement(\SimpleXMLElement $xml): array
+    private function processDetails(\SimpleXMLElement $xml): array
     {
-        $securities = [];
+        $items = [];
 
         foreach (get_object_vars($xml) as $key => $value) {
+            if (mb_strpos($key, 'Детали') === false) {
+                continue;
+            }
 
-            if (mb_strpos($key, 'Детали') !== false) {
+            if (!is_array($value)) {
+                $value = [$value];
+            }
 
-                if (!is_array($value)) {
-                    $value = [$value];
+            foreach ($value as $line) {
+                $attr = [];
+                foreach ($line->attributes() as $attrName => $attrValue) {
+                    $attr[$attrName] = get_object_vars($attrValue)[0];
                 }
 
-                foreach ($value as $line) {
-                    $attr = [];
+                $items[] = new PortfolioDetailItem(
+                    issuer:        $attr['Эмитент'],
+                    security:      $attr['ЦБ'],
+                    priceStart:    $attr['НОЦена'],
+                    priceEnd:      $attr['КОЦена'],
+                    quantityStart: (int) $attr['КоличествоНО'],
+                    quantityEnd:   (int) $attr['КоличествоКО'],
+                    sumStart:      $attr['СуммаНКДНО'],
+                    sumEnd:        $attr['СуммаНКДКО'],
+                    sumTotal:      $attr['КОСумма'],
+                );
+            }
+        }
+
+        return $items;
+    }
 
-                    foreach ($line->attributes() as $k1 => $v1) {
-                        $attr[$k1] = get_object_vars($v1)[0];
-                    }
+    private function processMovements(\SimpleXMLElement $xml): array
+    {
+        $items = [];
 
-                    $securities[$attr['ЦБ']] = $attr;
+        foreach (get_object_vars($xml) as $key => $value) {
+            if (mb_strpos($key, 'Детали') === false) {
+                continue;
+            }
+
+            if (!is_array($value)) {
+                $value = [$value];
+            }
+
+            foreach ($value as $line) {
+                $attr = [];
+                foreach ($line->attributes() as $attrName => $attrValue) {
+                    $attr[$attrName] = get_object_vars($attrValue)[0];
                 }
+
+                $period = new \DateTimeImmutable($attr['Период']);
+
+                $items[] = new PortfolioMovementItem(
+                    security:       $attr['ЦБ'],
+                    period:         $period,
+                    quantityStart:  (int) $attr['НО'],
+                    quantityEnd:    (int) $attr['КО'],
+                    quantityIncome: (int) $attr['Приход'],
+                    quantityOutcome:(int) $attr['Расход'],
+                );
             }
         }
 
-        return $securities;
+        return $items;
     }
 }