Merge pull request #864 from portabilis/portabilis-patch-2022-07-10

[2.7] Portabilis patch 10/07/2022
portabilis · Jul 10, 2022 · c8310ae · c8310ae
2 parents 24321bf + 9560798
commit c8310ae
Show file tree

Hide file tree

Showing 24 changed files with 505 additions and 162 deletions.
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -40,6 +40,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
+            \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
             'bindings',
             'throttle:60,1',
         ],

diff --git a/app/Http/Middleware/SkipMiddleware.php b/app/Http/Middleware/SkipMiddleware.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class SkipMiddleware
+{
+    public function handle(Request $request, Closure $next): mixed
+    {
+        return $next($request);
+    }
+}
diff --git a/app/Models/LegacyMenuUserType.php b/app/Models/LegacyMenuUserType.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models;
+
+use App\Menu;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class LegacyMenuUserType extends Model
+{
+    use HasFactory;
+
+    protected $table = 'pmieducar.menu_tipo_usuario';
+
+    public $timestamps = false;
+    public $primaryKey = null;
+    public $incrementing = false;
+
+    protected $fillable = [
+        'ref_cod_tipo_usuario',
+        'menu_id',
+        'cadastra',
+        'visualiza',
+        'exclui',
+    ];
+
+    public function menus()
+    {
+        return $this->belongsTo(Menu::class);
+    }
+}
diff --git a/app/Models/LegacyUser.php b/app/Models/LegacyUser.php
@@ -2,10 +2,10 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use App\User as DefaultUser;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-class LegacyUser extends Model
+class LegacyUser extends DefaultUser
 {
     /**
      * @var string

diff --git a/app/Repositories/EducacensoRepository.php b/app/Repositories/EducacensoRepository.php
@@ -556,7 +556,7 @@ public function getEmployeeDataForRecord30($arrayEmployeeId)
                 SELECT ARRAY_REMOVE(ARRAY_AGG(educacenso_curso_superior.curso_id), NULL) course_id,
                        ARRAY_REMOVE(ARRAY_AGG(completion_year), NULL) completion_year,
                        ARRAY_REMOVE(ARRAY_AGG(educacenso_ies.ies_id), NULL) college_id,
-                       ARRAY_REMOVE(ARRAY_AGG(discipline_id), NULL) discipline_id
+                       ARRAY_REMOVE(ARRAY_AGG(coalesce(discipline_id, 0)), NULL) discipline_id
                  FROM employee_graduations
                  JOIN modules.educacenso_curso_superior ON educacenso_curso_superior.id = employee_graduations.course_id
                  JOIN modules.educacenso_ies ON educacenso_ies.id = employee_graduations.college_id

diff --git a/app/User.php b/app/User.php
@@ -12,6 +12,7 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Carbon;
+use Laravel\Sanctum\HasApiTokens;
 
 /**
  * @property int            $id
@@ -26,6 +27,7 @@
  */
 class User extends Authenticatable
 {
+    use HasApiTokens;
     use Notifiable;
 
     /**

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Software livre de gestão escolar",
     "type": "project",
     "license": "GPL-2.0-or-later",
-    "version": "2.7.2",
+    "version": "2.7.3",
     "keywords": [
         "Portabilis",
         "i-Educar"

diff --git a/composer.lock b/composer.lock
diff --git a/config/sanctum.php b/config/sanctum.php
@@ -60,8 +60,8 @@
     */
 
     'middleware' => [
-        'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class,
-        'encrypt_cookies' => App\Http\Middleware\EncryptCookies::class,
+        'verify_csrf_token' => App\Http\Middleware\SkipMiddleware::class,
+        'encrypt_cookies' => App\Http\Middleware\SkipMiddleware::class,
     ],
 
 ];
diff --git a/database/factories/LegacyMenuUserTypeFactory.php b/database/factories/LegacyMenuUserTypeFactory.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\LegacyMenuUserType;
+use App_Model_NivelTipoUsuario;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class LegacyMenuUserTypeFactory extends Factory
+{
+    protected $model = LegacyMenuUserType::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition()
+    {
+        return [
+            'ref_cod_tipo_usuario' => LegacyUserTypeFactory::new()->create(
+                [
+                    'nivel' => $this->faker->randomElement([
+                        App_Model_NivelTipoUsuario::POLI_INSTITUCIONAL,
+                        App_Model_NivelTipoUsuario::INSTITUCIONAL,
+                        App_Model_NivelTipoUsuario::ESCOLA,
+                        App_Model_NivelTipoUsuario::BIBLIOTECA
+                    ]),
+                ]
+            ),
+            'menu_id' => MenuFactory::new()->create()->getKey(),
+            'cadastra' => 1,
+            'visualiza' => 1,
+            'exclui' => 1,
+        ];
+    }
+
+    public function admin()
+    {
+        return $this->state(
+            [
+                'ref_cod_tipo_usuario' => LegacyUserTypeFactory::new()->create(
+                    ['nivel' => App_Model_NivelTipoUsuario::POLI_INSTITUCIONAL]
+                )
+            ]
+        );
+    }
+
+    public function institutional()
+    {
+        return $this->state(
+            [
+                'ref_cod_tipo_usuario' => LegacyUserTypeFactory::new()->create(
+                    ['nivel' => App_Model_NivelTipoUsuario::INSTITUCIONAL]
+                )
+            ]
+        );
+    }
+
+    public function school()
+    {
+        return $this->state(
+            [
+                'ref_cod_tipo_usuario' => LegacyUserTypeFactory::new()->create(
+                    ['nivel' => App_Model_NivelTipoUsuario::ESCOLA]
+                )
+            ]
+        );
+    }
+
+    public function library()
+    {
+        return $this->state(
+            [
+                'ref_cod_tipo_usuario' => LegacyUserTypeFactory::new()->create(
+                    ['nivel' => App_Model_NivelTipoUsuario::ESCOLA]
+                )
+            ]
+        );
+    }
+}
diff --git a/database/factories/LegacyUserFactory.php b/database/factories/LegacyUserFactory.php
@@ -37,6 +37,17 @@ public function definition(): array
         ];
     }
 
+    public function admin(): static
+    {
+        return $this->state([
+            'ref_cod_tipo_usuario' => function () {
+                return LegacyUserTypeFactory::new()->create([
+                    'nivel' => 1,
+                ]);
+            },
+        ]);
+    }
+
     public function unique()
     {
         return $this->state(function () {
@@ -53,4 +64,20 @@ public function unique()
             ];
         });
     }
+
+    public function withAccess($process, $view = true, $modify = true, $remove = true): static
+    {
+        return $this->afterCreating(function (LegacyUser $user) use ($process, $view, $modify, $remove) {
+            $menu = MenuFactory::new()->create(
+                ['process' => $process]
+            );
+            LegacyMenuUserTypeFactory::new()->create([
+                'menu_id' => $menu,
+                'ref_cod_tipo_usuario' => $user->type,
+                'cadastra' => $modify,
+                'visualiza' => $view,
+                'exclui' => $remove,
+            ]);
+        });
+    }
 }