From 95d854bcddc92b35ffc6aea280e13ff6f27bb3c6 Mon Sep 17 00:00:00 2001
From: Alexander <saszhulin@gmail.com>
Date: Mon, 2 Dec 2024 09:23:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B1=D1=80=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/contingent_parser.php                 | 13 +++++++-----
 src/Factory/ManagerFactory.php                | 20 +++++++++++++++++++
 src/Factory/ProgressBarFactory.php            | 13 ++++++++++++
 src/Factory/TypeManger.php                    |  9 +++++++++
 .../ContingentManager.php                     |  5 +++--
 src/{ => Manager}/Manager.php                 |  8 ++++++--
 .../ContingentParser.php                      |  5 +++--
 src/{ => Parser}/Parser.php                   |  2 +-
 .../ContingentRepository.php                  |  4 ++--
 src/{ => Repository}/Repository.php           |  3 +--
 .../ContingentRow.php                         |  4 ++--
 .../ContingentService.php                     |  5 +++--
 src/{ => Service}/Service.php                 |  2 +-
 13 files changed, 72 insertions(+), 21 deletions(-)
 create mode 100644 src/Factory/ManagerFactory.php
 create mode 100644 src/Factory/ProgressBarFactory.php
 create mode 100644 src/Factory/TypeManger.php
 rename src/{ContingentParser => Manager}/ContingentManager.php (69%)
 rename src/{ => Manager}/Manager.php (94%)
 rename src/{ContingentParser => Parser}/ContingentParser.php (98%)
 rename src/{ => Parser}/Parser.php (97%)
 rename src/{ContingentParser => Repository}/ContingentRepository.php (94%)
 rename src/{ => Repository}/Repository.php (99%)
 rename src/{ContingentParser => Row}/ContingentRow.php (93%)
 rename src/{ContingentParser => Service}/ContingentService.php (94%)
 rename src/{ => Service}/Service.php (97%)

diff --git a/scripts/contingent_parser.php b/scripts/contingent_parser.php
index 26ef74c..b1669be 100644
--- a/scripts/contingent_parser.php
+++ b/scripts/contingent_parser.php
@@ -1,18 +1,21 @@
 <?php
 
-use SvedenParser\ContingentParser\ContingentManager;
+use SvedenParser\Factory\ManagerFactory;
+use SvedenParser\Factory\ProgressBarFactory;
+use SvedenParser\Factory\TypeManger;
+use SvedenParser\Manager\Manager;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\ConsoleOutput;
 
 define('SVEDEN_PARSER', '/home/developer/sveden_parser');
-define('TYPE_PARSER', explode('_', basename(__FILE__, '.php'))[0]);
+define('TYPE_PARSER', TypeManger::CONTINGENT->value);
 
 require_once SVEDEN_PARSER . "/vendor/autoload.php";
 
-
-$manager = new ContingentManager();
+/** @var Manager $manager */
+$manager = ManagerFactory::create(TypeManger::CONTINGENT);
 $sites = $manager->getSites();
-$progressBar = new ProgressBar(new ConsoleOutput(), count($sites));
+$progressBar = ProgressBarFactory::create(count($sites));
 $progressBar->start();
 
 $start = 0; $end = count($sites);
diff --git a/src/Factory/ManagerFactory.php b/src/Factory/ManagerFactory.php
new file mode 100644
index 0000000..6b51264
--- /dev/null
+++ b/src/Factory/ManagerFactory.php
@@ -0,0 +1,20 @@
+<?php
+namespace SvedenParser\Factory;
+
+use SvedenParser\EmployeesParser\EmployeesManager;
+use SvedenParser\Manager\ContingentManager;
+use SvedenParser\Manager\Manager;
+use SvedenParser\PriemParser\PriemManager;
+
+final class ManagerFactory
+{
+    public static function create(TypeManger $typeManager): ?Manager
+    {
+        return match ($typeManager) {
+            TypeManger::CONTINGENT => new ContingentManager(),
+            TypeManger::PRIEM => new PriemManager(),
+            TypeManger::EMPLOYEES => new EmployeesManager(),
+            default => null,
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Factory/ProgressBarFactory.php b/src/Factory/ProgressBarFactory.php
new file mode 100644
index 0000000..745d8c6
--- /dev/null
+++ b/src/Factory/ProgressBarFactory.php
@@ -0,0 +1,13 @@
+<?php
+namespace SvedenParser\Factory;
+
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Output\ConsoleOutput;
+
+final class ProgressBarFactory
+{
+    public static function create(int $max): ProgressBar
+    {
+        return new ProgressBar(new ConsoleOutput(), $max);
+    }
+}
\ No newline at end of file
diff --git a/src/Factory/TypeManger.php b/src/Factory/TypeManger.php
new file mode 100644
index 0000000..72c598e
--- /dev/null
+++ b/src/Factory/TypeManger.php
@@ -0,0 +1,9 @@
+<?php
+namespace SvedenParser\Factory;
+
+enum TypeManger : string
+{
+    case CONTINGENT = 'contingent';
+    case PRIEM = 'priem';
+    case EMPLOYEES = 'employees';
+}
\ No newline at end of file
diff --git a/src/ContingentParser/ContingentManager.php b/src/Manager/ContingentManager.php
similarity index 69%
rename from src/ContingentParser/ContingentManager.php
rename to src/Manager/ContingentManager.php
index b73d573..644dac2 100644
--- a/src/ContingentParser/ContingentManager.php
+++ b/src/Manager/ContingentManager.php
@@ -1,7 +1,8 @@
 <?php
-namespace SvedenParser\ContingentParser;
+namespace SvedenParser\Manager;
 
-use SvedenParser\Manager;
+use SvedenParser\Repository\ContingentRepository;
+use SvedenParser\Service\ContingentService;
 
 final class ContingentManager extends Manager
 {
diff --git a/src/Manager.php b/src/Manager/Manager.php
similarity index 94%
rename from src/Manager.php
rename to src/Manager/Manager.php
index ecb333c..8d28687 100644
--- a/src/Manager.php
+++ b/src/Manager/Manager.php
@@ -1,13 +1,16 @@
 <?php
-namespace SvedenParser;
+namespace SvedenParser\Manager;
 
 use SvedenParser\Http\HttpClient;
 use SvedenParser\Http\UrlBuilder;
 use SvedenParser\Logger\Logger;
+use SvedenParser\Repositoty\Repository;
+use SvedenParser\Service\Service;
 use Symfony\Component\Yaml\Yaml;
 
 abstract class Manager
 {
+    public readonly array $sites;
     protected Service $service;
     protected Repository $repository;
     protected HttpClient $httpClient;
@@ -15,6 +18,7 @@ abstract class Manager
 
     public function __construct()
     {
+        $this->sites = $this->getSites();
         $this->httpClient = new HttpClient();
     }
     /**
@@ -103,7 +107,7 @@ abstract class Manager
      * @param array $params Массив сайтов, у которых нужны обновиленные URL
      * @return array
      */
-    public function getSites(array $params = []): array
+    protected function getSites(array $params = []): array
     {
         if (!$params) {
             return $this->repository->getSitesFromNiimko();
diff --git a/src/ContingentParser/ContingentParser.php b/src/Parser/ContingentParser.php
similarity index 98%
rename from src/ContingentParser/ContingentParser.php
rename to src/Parser/ContingentParser.php
index 1cd0f06..48988a3 100644
--- a/src/ContingentParser/ContingentParser.php
+++ b/src/Parser/ContingentParser.php
@@ -3,11 +3,12 @@
  * Парсер информации об образовательной организации
  * с её сайта с использованием микроразметки
  */
-namespace SvedenParser\ContingentParser;
+namespace SvedenParser\Parser;
 
 use SvedenParser\Color;
-use SvedenParser\Parser;
 use SvedenParser\Printer;
+use SvedenParser\Row\ContingentRow;
+
 final class ContingentParser extends Parser
 {
     private const TEMPLATE = '//tr[@itemprop="eduChislen"]//';
diff --git a/src/Parser.php b/src/Parser/Parser.php
similarity index 97%
rename from src/Parser.php
rename to src/Parser/Parser.php
index 72ee78d..b3e127c 100644
--- a/src/Parser.php
+++ b/src/Parser/Parser.php
@@ -1,5 +1,5 @@
 <?php
-namespace SvedenParser;
+namespace SvedenParser\Parser;
 
 abstract class Parser
 {
diff --git a/src/ContingentParser/ContingentRepository.php b/src/Repository/ContingentRepository.php
similarity index 94%
rename from src/ContingentParser/ContingentRepository.php
rename to src/Repository/ContingentRepository.php
index 83355fa..7fc59ea 100644
--- a/src/ContingentParser/ContingentRepository.php
+++ b/src/Repository/ContingentRepository.php
@@ -1,7 +1,7 @@
 <?php
-namespace SvedenParser\ContingentParser;
+namespace SvedenParser\Repository;
 
-use SvedenParser\Repository;
+use SvedenParser\Repositoty\Repository;
 
 final class ContingentRepository extends Repository
 {
diff --git a/src/Repository.php b/src/Repository/Repository.php
similarity index 99%
rename from src/Repository.php
rename to src/Repository/Repository.php
index 42d09fe..9b9d440 100644
--- a/src/Repository.php
+++ b/src/Repository/Repository.php
@@ -1,5 +1,5 @@
 <?php
-namespace SvedenParser;
+namespace SvedenParser\Repositoty;
 
 use SvedenParser\Database\Database;
 use SvedenParser\Database\DatabaseConfig;
@@ -78,7 +78,6 @@ abstract class Repository
         $sql = "SELECT kod AS org_id, site FROM niimko.s_vuzes 
             WHERE ootype = :v1 AND deleted = :v2 AND fake = :v3 AND country = :v4";
         return $this->niimko->select($sql, ['vuz', 'n', 'n', 'RU']);
-
     }
     /**
      * Извлечение сайтов базы данных opendata
diff --git a/src/ContingentParser/ContingentRow.php b/src/Row/ContingentRow.php
similarity index 93%
rename from src/ContingentParser/ContingentRow.php
rename to src/Row/ContingentRow.php
index 1b1c68e..adb9c83 100644
--- a/src/ContingentParser/ContingentRow.php
+++ b/src/Row/ContingentRow.php
@@ -1,5 +1,5 @@
 <?php
-namespace SvedenParser\ContingentParser;
+namespace SvedenParser\Row;
 
 final class ContingentRow
 {
@@ -34,7 +34,7 @@ final class ContingentRow
             "spec_code" => $this->eduCode,
             "spec_name" => $this->eduName,
             "edu_level" => $this->eduLevel,
-            "edu_forms"=> $this->eduForm,
+            "edu_forms" => $this->eduForm,
             "contingent" => $this->contingent
         ];
     }
diff --git a/src/ContingentParser/ContingentService.php b/src/Service/ContingentService.php
similarity index 94%
rename from src/ContingentParser/ContingentService.php
rename to src/Service/ContingentService.php
index 23eb599..ee336bf 100644
--- a/src/ContingentParser/ContingentService.php
+++ b/src/Service/ContingentService.php
@@ -1,6 +1,7 @@
 <?php
-namespace SvedenParser\ContingentParser;
-use SvedenParser\Service;
+namespace SvedenParser\Service;
+
+use SvedenParser\Parser\ContingentParser;
 
 final class ContingentService extends Service
 {
diff --git a/src/Service.php b/src/Service/Service.php
similarity index 97%
rename from src/Service.php
rename to src/Service/Service.php
index 0fba1a0..30ab9a2 100644
--- a/src/Service.php
+++ b/src/Service/Service.php
@@ -1,5 +1,5 @@
 <?php
-namespace SvedenParser;
+namespace SvedenParser\Service;
 
 abstract class Service
 {