Merge PR #22

.gitignore

@@ -5,8 +5,10 @@
 /storage/*.key
 /storage/debugbar
 /storage/git
+/storage/metadata
 /tests/report
 /vendor
+/storage/logs
 .env
 .env.backup
 .env.dusk.local
@@ -17,4 +19,4 @@ envoy
 npm-debug.log
 yarn-error.log
 /docker/8.1/id_ed25519*
-/docker/8.1/known_hosts
+/docker/8.1/known_hosts

app/Console/Commands/DumpFromGit.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Facades\EntityFacade;
+use App\Models\User;
+use App\Traits\DumpFromGit\CreateCategoriesAndGroupsTrait;
+use App\Traits\DumpFromGit\CreateEntitiesTrait;
+use App\Traits\DumpFromGit\CreateFederationTrait;
+use App\Traits\DumpFromGit\EntitiesHelp\FixEntityTrait;
+use App\Traits\DumpFromGit\EntitiesHelp\UpdateEntity;
+use App\Traits\EntityFolderTrait;
+use App\Traits\FederationTrait;
+use App\Traits\GitTrait;
+use Illuminate\Console\Command;
+use App\Traits\ValidatorTrait;
+use Illuminate\Support\Facades\Artisan;
+
+
+class DumpFromGit extends Command
+{
+    use GitTrait, ValidatorTrait,EntityFolderTrait;
+    use CreateFederationTrait,CreateEntitiesTrait,CreateCategoriesAndGroupsTrait;
+    use UpdateEntity,FederationTrait,FixEntityTrait;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:dump-from-git';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+
+
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $firstAdminId = User::where('admin', 1)->first()->id;
+        $this->initializeGit();
+        $this->createFederations();
+        $this->createEntities($firstAdminId);
+        $this->createCategoriesAndGroups();
+        $this->updateGroupsAndCategories();
+        $this->updateEntitiesXml();
+        $this->updateFederationFolders();
+        $this->fixEntities();
+        $this->createAllMetadataFiles();
+    }
+}

app/Console/Commands/ValidateMetaConsole.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Entity;
+use App\Traits\DumpFromGit\EntitiesHelp\FixEntityTrait;
+use App\Traits\ValidatorTrait;
+use Illuminate\Console\Command;
+
+class ValidateMetaConsole extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:val';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+
+    use ValidatorTrait,FixEntityTrait;
+
+    /**
+     * Execute the console command.
+     */
+
+    private function doc()
+    {
+        foreach (Entity::select()->get() as $entity)
+        {
+            $ent = Entity::where('id', $entity->id)->select()->first();
+
+
+            // $res = json_decode($this->validateMetadata($ent->metadata),true);
+            $res = json_decode($this->validateMetadata($ent->xml_file,true),true);
+            $res['ent_id'] = $ent->id;
+            $errorArray = $res['errorArray'];
+
+
+            if($res['code']==1)
+            {
+                dump($res);
+            }
+            else
+            {
+                dump($res['ent_id']);
+            }
+        }
+    }
+
+    private function meta()
+    {
+        foreach (Entity::select()->get() as $entity)
+        {
+
+            $ent = Entity::where('id', $entity->id)->select()->first();
+
+            $curr = 345;
+
+            if($ent->id < $curr)
+                continue;
+            if($ent->id > $curr)
+                break;
+
+
+            $res = json_decode($this->validateMetadata($ent->metadata),true);
+            $res['ent_id'] = $ent->id;
+
+
+            dump($res);
+            if( $res['code']==1)
+            {
+
+            }
+        }
+    }
+
+
+    public function handle()
+    {
+
+       // $this->fixEntities();
+        $this->doc();
+
+
+    }
+}

app/Facades/EntityFacade.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class EntityFacade extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return 'entity';
+    }
+}

app/Jobs/SaveMetadataToFolders.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Facades\EntityFacade;
+use App\Models\Entity;
+use App\Models\Federation;
+use App\Traits\FederationTrait;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+
+class SaveMetadataToFolders implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     */
+
+    protected  int $entity_id;
+    protected  int $federation_id;
+
+    public function __construct($entity_id, $federation_id)
+    {
+        $this->entity_id = $entity_id;
+        $this->federation_id = $federation_id;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        EntityFacade::SaveEntityMetadataToFile($this->entity_id,$this->federation_id);
+
+    }
+}

app/Models/Category.php

@@ -13,6 +13,7 @@ class Category extends Model
         'name',
         'description',
         'tagfile',
+        'xml_value'
     ];
 
     public function entities()

app/Models/Entity.php

@@ -15,6 +15,7 @@ class Entity extends Model
         'type',
         'entityid',
         'file',
+        'xml_file',
         'name_en',
         'name_cs',
         'description_en',

app/Providers/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Services\EntityService;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\ServiceProvider;
@@ -15,7 +16,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        //
+
     }
 
     /**

app/Providers/EntityFacadeServiceProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Providers;
+
+use App\Services\EntityService;
+use Illuminate\Support\ServiceProvider;
+
+class EntityFacadeServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        $this->app->singleton('entity', function ($app) {
+            return new EntityService();
+        });
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        //
+    }
+}

app/Services/EntityService.php

@@ -0,0 +1,27 @@
+<?php
+namespace App\Services;
+use App\Models\Entity;
+use App\Models\Federation;
+use Illuminate\Support\Facades\Storage;
+
+class EntityService
+{
+    public function SaveEntityMetadataToFile($entity_id,$federation_id)
+    {
+        $entity = Entity::find($entity_id);
+        $federation = Federation::find($federation_id);
+
+        if(!$entity || !$federation){
+            return;
+        }
+        $folderName = $federation->name;
+        $fileName = $entity->file;
+        if(!Storage::disk('metadata')->exists($folderName))
+        {
+            Storage::disk('metadata')->makeDirectory($folderName);
+        }
+        $filePath = $folderName . '/' . $fileName . 'xml';
+        $content = $entity->xml_file;
+        Storage::disk('metadata')->put($filePath, $content);
+    }
+}