Merge branch 'master' of https://bitbucket.org/Panabonic/faufcc-api

app/Models/Registries/Category.php

@@ -77,4 +77,13 @@ class Category extends Model {
     }
 
 
+    public function addCategory(string $name): ?Model {
+        $res = $this->children()->where(['name' => $name])->first();
+        if (!$res) {
+            $res = $this->children()->create(['registry_id' => $this->registry_id, 'name' => $name]);
+            $res->update(['ord' => $res->getMaxOrd()]);
+        }
+        return $res;
+    }
+
 }

app/Models/Registries/Entry.php

@@ -123,6 +123,7 @@ class Entry extends Model {
     public function sortOperations() {
         $this->operations()->reorder()->applyOrders(['order-date' => 'desc'])->get()->each(function($operation, $ord) {
             $this->objects()->updateExistingPivot($operation, ['ord' => $ord]);
+            if ($ord === 0) $this->update(['active_since' => $operation->value('active-since'), 'active_till' => $operation->value('active-till')]);
         });
     }
 

app/Models/Registries/Registry.php

@@ -54,4 +54,13 @@ class Registry extends Model {
     }
 
 
+    public function addCategory(string $name): ?Model {
+        $res = $this->categories()->where(['name' => $name])->first();
+        if (!$res) {
+            $res = $this->categories()->create(['name' => $name]);
+            $res->update(['ord' => $res->getMaxOrd()]);
+        }
+        return $res;
+    }
+
 }

app/Services/Registries/RegistryImportService.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Services\Registries;
+
+use App\Models\Asset;
+use App\Models\Registries\Registry;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
+use PHPHtmlParser\Dom;
+
+class RegistryImportService {
+    protected Registry $registry;
+    protected string $url;
+    protected Dom $dom;
+
+    protected array $mimes = [
+        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'pdf' => 'application/pdf',
+        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    ];
+
+
+    public function __construct(Registry $registry, string $url) {
+        $this->registry = $registry;
+        $this->url = $url;
+        $this->dom = new Dom;
+        $this->dom->loadFromUrl($url);
+    }
+
+
+    public function download($url, $dir = null, $filename = null): ?Asset {
+        $urlInfo = parse_url($url);
+        if (empty($urlInfo['host'])) {
+            $url = str_replace('//', '/', "faufcc.ru/{$url}");
+            $url = "https://{$url}";
+        }
+        $info = pathinfo($url);
+        if ($info['extension'] ?? null) {
+            $path = "public/documents/registries";
+            $filename = $filename ? "{$filename}.{$info['extension']}" : $info['basename'];
+            $path = $dir ? "{$path}/{$dir}/{$filename}" : "{$path}/{$filename}";
+            $asset = Asset::query()->where(['path' => $path])->first();
+            if (!$asset && Storage::put($path, Http::get($url)->body())) $asset = $this->makeAsset($path);
+            elseif ($asset) var_dump($asset->path);
+        }
+        return $asset ?? null;
+    }
+    public function makeAsset($path, $name = null) {
+        $info = pathinfo($path);
+        return Asset::create([
+            'type' => 'document',
+            'path' => $path,
+            'mime' => $this->mimes[$info['extension']] ?? null,
+            'name' => $name ?? $info['basename'],
+            'filename' => $info['basename'],
+            'extension' => $info['extension'],
+            'user_id' => ($user = Auth::user()) ? $user->id : null
+        ]);
+    }
+
+
+}

app/Services/Registries/RulesetImportService.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Services\Registries;
+
+use App\Models\Registries\Category;
+use App\Models\Registries\Entry;
+use Illuminate\Support\Facades\Date;
+use Illuminate\Support\Str;
+use PHPHtmlParser\Dom;
+
+class RulesetImportService extends RegistryImportService {
+
+    public function test() {
+        $res = [];
+        $nodes = $this->dom->find('#sp_entyity *')->toArray();
+        foreach ($nodes as $node) {
+            if ($node->tag->name() === 'div') {
+                $items = $node->find('li');
+                foreach ($items as $k => $item) {
+                    $res[] = trim($item->text, '«» ');
+                    //if ($k >= 5) return;
+                }
+            }
+        }
+        $res = collect(array_count_values($res))->filter(function($count) {
+            return $count > 1;
+        });
+
+        var_dump($res);
+    }
+
+    public function import() {
+        $category = null;
+        $subcategory = null;
+        $nodes = $this->dom->find('#sp_entyity *')->toArray();
+        foreach ($nodes as $node) {
+            $name = trim($node->text, '«» ');
+            if ($node->tag->name() === 'h2') {
+                $category = $this->registry->addCategory($name);
+                $subcategory = null;
+            } elseif ($node->tag->name() === 'h3') {
+                if ($category) $subcategory = $category->addCategory($name);
+            }
+            elseif ($node->tag->name() === 'div') {
+                $items = $node->find('li');
+                foreach ($items as $k => $item) {
+                    $entryName = trim($item->text, '«» ');
+                    if (!$this->registry->entries()->where(['name' => $entryName])->exists()) {
+                        echo ("Importing {$entryName}\n");
+                        $link = $item->find('a', 0);
+                        $this->importItem("{$this->url}{$link->href}", $subcategory, $entryName);
+                    } else echo("Already imported {$entryName}\n");
+                    //if ($k >= 5) return;
+                }
+            }
+        }
+    }
+
+    public function importItem(string $url, Category $category, $name) {
+        $dom = new Dom;
+        $dom->loadFromUrl($url);
+        $link = $dom->find('p.ACTUALNAME a', 0);
+        list($number) = explode('«', $link->text);
+        $number = trim($number);
+        $entry = $category->entries()->firstOrCreate(['registry_id' => $category->registry_id, 'number' => $number]);
+        $entry->update(['name' => $name]);
+        $this->importOperations($entry, array_slice($dom->find('table.inc1 tr')->toArray(), 1));
+    }
+
+    public function importOperations(Entry $entry, array $operations) {
+        foreach ($operations as $operation) {
+            $this->importOperation($entry, $operation);
+        }
+        $entry->sortOperations();
+    }
+
+    public function importOperation(Entry $entry, $node) {
+        list($col1, $col2, $col3, $col4, $col5) = $node->find('td')->toArray();
+
+        $type = trim(Str::replace(explode(' ', $entry->number), '', $col1->text ?? ''), ': ');
+        $data['operation-type'] = ['title' => explode(' ', $type)[0]];
+        $data['active-since'] = $col3->text ? Date::create($col3->text) : null;
+        $data['active-till'] = $col4->text ? Date::create($col4->text) : null;
+        $data['developer'] = Str::replace('&quot;', '"', $col5->text ?? null);
+        $data['listings'] = [];
+        $data['order-name'] = $data['order-date'] = $data['order-document'] = null;
+        $data = $this->parseColumn2($col2, $data);
+
+        $object = $entry->operations()->applyFilters(['order-name' => $data['order-name'] ?? null])->first();
+        if (!$object) $object = $entry->createObject($entry->registry->options['operations'] ?? null, null, 'operations');
+        $object->setValues($data);
+    }
+
+    public function parseColumn2($node, $data): array {
+        $links = $node->find('a')->toArray();
+        if ($links) {
+            foreach ($node->find('a')->toArray() as $link) {
+                if (count(explode(' от ', $link->text)) === 2) {
+                    list($orderName, $orderDate) = explode(' от ', $link->text);
+                    $data['order-name'] = $orderName;
+                    $data['order-date'] = $orderDate ? Date::create($orderDate) : null;
+                    $filename = $orderName ? Str::slug("Приказ {$orderName} от {$orderDate}") : null;
+                    $data['order-document'] = $this->download($link->href, 'ruleset', $filename);
+                } else $data['listings'][] = ['name' => Str::replace('Постановление правительства №', 'pp', $link->text)];
+            }
+        } else {
+            list($orderName, $orderDate) = explode(' от ', $node->text);
+            $data['order-name'] = $orderName;
+            $data['order-date'] = $orderDate ? Date::create($orderDate) : null;
+        }
+        return $data;
+    }
+
+
+}

database/migrations/2017_08_08_193843_create_assets_table.php

@@ -19,7 +19,7 @@ class CreateAssetsTable extends Migration
             $table->bigInteger('user_id')->unsigned()->index()->nullable();
             $table->string('name')->index()->nullable();
             $table->string('type', 45)->index()->nullable();
-            $table->string('path', 100)->nullable();
+            $table->string('path')->nullable();
             $table->string('mime')->nullable();
             $table->string('filename')->index()->nullable();
             $table->string('extension', 10)->index()->nullable();

database/migrations/2023_06_21_195321_create_registry_categories_table.php

@@ -18,7 +18,7 @@ class CreateRegistryCategoriesTable extends Migration
             $table->char('uuid', 36)->index()->unique();
             $table->integer('registry_id')->index()->nullable();
             $table->integer('parent_id')->index()->default(0);
-            $table->string('name')->index()->nullable();
+            $table->string('name', 750)->index()->nullable();
             $table->integer('ord')->index()->default(0);
             $table->timestamps();
             $table->softDeletes();

database/migrations/2023_06_21_195350_create_registry_entries_table.php

@@ -20,7 +20,7 @@ class CreateRegistryEntriesTable extends Migration
             $table->integer('category_id')->index()->nullable();
             $table->integer('asset_id')->index()->nullable();
             $table->string('number')->index()->nullable();
-            $table->string('name')->index()->nullable();
+            $table->string('name', 750)->index()->nullable();
             $table->date('active_since')->index()->nullable();
             $table->date('active_till')->index()->nullable();
             $table->date('suspended_since')->index()->nullable();

database/seeders/Objects/FieldsTableSeeder.php

@@ -269,6 +269,10 @@ class FieldsTableSeeder extends Seeder {
             'title' => 'Техническое заключение',
             'type' => FieldType::DOCUMENT,
         ],
+        'product-purpose' => [
+            'title' => 'Назначение продукции',
+            'type' => FieldType::TEXT
+        ],
         'developer-name' => [
             'title' => 'Разработчик',
             'type' => FieldType::STRING

database/seeders/Objects/ObjectTypeFieldsTableSeeder.php

@@ -95,7 +95,8 @@ class ObjectTypeFieldsTableSeeder extends Seeder {
         ],
         'entry-properties-technical-certificate' => [
             'common' => [
-                'fields' => ['technical-conclusion', 'developer-name', 'developer-address', 'company-site', 'company-email', 'company-phone', 'producer-name', 'producer-address']
+                'fields' => ['technical-conclusion', 'product-purpose', 'developer-name', 'developer-address', 'company-site',
+                    'company-email', 'company-phone', 'producer-name', 'producer-address']
             ]
         ],
 

database/seeders/Pages/PagesTableSeeder.php

@@ -22,7 +22,7 @@ class PagesTableSeeder extends Seeder
                         'Нормативные правовые акты' => ['type' => PageType::REGISTRY, 'registry_type' => RegistryType::SIMPLE],
                         'Наблюдательный совет' => [],
                         'Государственное задание' => [],
-                        'Закупки' => ['type' => PageType::REGISTRY, 'registry_type' => RegistryType::SIMPLE],
+                        'Закупки' => ['type' => PageType::REGISTRY, 'registry_type' => RegistryType::CATEGORIZED],
                         'Бухгалтерская отчетность' => [],
                         'Антимонопольное законодательство' => [],
                     ]
@@ -69,16 +69,7 @@ class PagesTableSeeder extends Seeder
                         'Разработка ТР ЕАЭС' => [],
                     ]
                 ],
-                'СТУ' => [
-                    /*
-                    'children' => [
-                        'Запись на консультацию' => [],
-                        'Документы' => [],
-                        'Протоколы заседания НТС' => [],
-                        'Ответы на часто задаваемые вопросы' => [],
-                    ]
-                    */
-                ],
+                'СТУ' => ['type' => PageType::REGISTRY, 'registry_type' => RegistryType::CATEGORIZED],
                 'КСИ' => [],
                 'Добровольная сертификация' => [
                     'children' => [

routes/console.php

@@ -1,6 +1,9 @@
 <?php
 
+use App\Models\Registries\Registry;
+use App\Models\Registries\RegistryType;
 use App\Models\User;
+use App\Services\Registries\RulesetImportService;
 use Illuminate\Support\Facades\Artisan;
 
 /*
@@ -22,3 +25,12 @@ Artisan::command('dev:generate-personal-token {userId}', function ($userId) {
 })->describe('Generates a personal access token for a user');
 
 
+
+Artisan::command('htmlparser:import-rulesets', function() {
+    $registry = Registry::query()->where(['type' => RegistryType::RULESET])->first();
+    $url = "https://faufcc.ru/technical-regulation-in-constuction/formulary-list/";
+    $service = new RulesetImportService($registry, $url);
+    $service->import();
+});
+
+