Merge branch 'main' into community-2024-03-21

.github/workflows/tests.yml

@@ -77,4 +77,4 @@ jobs:
         run: php artisan legacy:create:tests
 
       - name: Unit tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/pest

.gitignore

@@ -53,7 +53,6 @@ yarn-error.log
 Vagrantfile
 deploy/.ruby-version
 ieducar/modules/Reports
-ieducar/intranet/filaunica
 ieducar/intranet/reservavaga
 
 

app/Contracts/AssetServiceContract.php

@@ -7,7 +7,7 @@ interface AssetServiceContract
     /**
      * AssetServiceContract constructor.
      */
-    public function __construct(string $version, bool $secure = null, bool $automatic_versioning = false);
+    public function __construct(string $version, ?bool $secure = null, bool $automatic_versioning = false);
 
     /**
      * Get assets version number.
@@ -29,5 +29,5 @@ public function getSecure(): ?bool;
     /**
      * Generate an asset path with version parameter for the application.
      */
-    public function get(string $path, bool $secure = null): string;
+    public function get(string $path, ?bool $secure = null): string;
 }

app/Http/Controllers/BatchEnrollmentController.php

@@ -20,15 +20,13 @@ class BatchEnrollmentController extends Controller
     /**
      * Renderiza a view da desenturmação em lote.
      *
-     * @param MessageBag        $fails
-     * @param MessageBag        $success
      * @return View
      */
     public function viewCancelEnrollments(
         LegacySchoolClass $schoolClass,
         Collection $enrollments,
-        MessageBag $fails = null,
-        MessageBag $success = null
+        ?MessageBag $fails = null,
+        ?MessageBag $success = null
     ) {
         $this->breadcrumb('Desenturmar em lote', [
             url('intranet/educar_index.php') => 'Escola',
@@ -49,15 +47,13 @@ public function viewCancelEnrollments(
     /**
      * Renderiza a view da enturmação em lote.
      *
-     * @param MessageBag        $fails
-     * @param MessageBag        $success
      * @return View
      */
     public function viewEnroll(
         LegacySchoolClass $schoolClass,
         Collection $registrations,
-        MessageBag $fails = null,
-        MessageBag $success = null
+        ?MessageBag $fails = null,
+        ?MessageBag $success = null
     ) {
         $this->breadcrumb('Enturmar em lote', [
             url('intranet/educar_index.php') => 'Escola',
@@ -171,8 +167,6 @@ public function enroll(
     }
 
     /**
-     * @param MessageBag $fail
-     * @param MessageBag $success
      * @return void
      */
     protected function setMessages(

app/Http/Controllers/EnrollmentInepController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\EnrollmentInep;
+use App\Models\LegacyEnrollment;
+use Illuminate\Http\Request;
+
+class EnrollmentInepController extends Controller
+{
+    public function edit(LegacyEnrollment $enrollment)
+    {
+        $this->breadcrumb('Educacenso Matrícula', [
+            url('intranet/educar_index.php') => 'Escola',
+        ]);
+
+        $this->menu(578); //dd($enrollment->toArray());
+
+        return view('enrollments.enrollmentInep', compact('enrollment'));
+    }
+
+    public function update(Request $request, LegacyEnrollment $enrollment)
+    {
+        if ($request->has('desconsiderar_educacenso')) {
+            $enrollment->update([
+                'desconsiderar_educacenso' => true,
+            ]);
+        } else {
+            $enrollment->update([
+                'desconsiderar_educacenso' => false,
+            ]);
+        }
+
+        EnrollmentInep::query()
+            ->updateOrCreate(
+                ['matricula_turma_id' => $enrollment->getKey()],
+                ['matricula_inep' => is_numeric($request->get('matricula_inep')) ? $request->get('matricula_inep') : null]
+            );
+
+        return redirect()->route('enrollments.enrollment-history', $enrollment->registration->getKey());
+    }
+}

app/Http/Controllers/FileExportController.php

@@ -37,7 +37,7 @@ public function store(FileExportRequest $request)
                 schoolId: $request->get('ref_cod_escola'),
                 schoolClassId: $request->get('ref_cod_turma'),
                 registrationId: $request->get('matricula')
-            )
+            ),
         ]);
 
         FileExporterJob::dispatch(
@@ -71,30 +71,30 @@ private function removeSpecialCharacters($string): string
         return preg_replace('/[^\w\s]/u', '', $string);
     }
 
-    private function buildFileName(int $schoolId, int $schoolClassId, int|null $registrationId): string
+    private function buildFileName(int $schoolId, int $schoolClassId, ?int $registrationId): string
     {
         if ($registrationId) {
             $registration = LegacyRegistration::query()->find($registrationId, [
                 'cod_matricula',
-                'ref_cod_aluno'
+                'ref_cod_aluno',
             ]);
 
             return mb_strtoupper($this->removeSpecialCharacters($registration->name)) . " ({$registration->ref_cod_aluno})";
         }
 
         $school = LegacySchool::query()->with([
             'person:idpes,nome',
-            'organization:idpes,fantasia'
+            'organization:idpes,fantasia',
         ])->find($schoolId, [
             'cod_escola',
-            'ref_idpes'
+            'ref_idpes',
         ]);
 
         $schoolClass = LegacySchoolClass::query()
             ->whereKey($schoolClassId)
             ->first([
                 'nm_turma',
-                'ano'
+                'ano',
             ]);
 
         $schoolName = mb_strtoupper($this->removeSpecialCharacters($school->name));

app/Http/Controllers/ResourceController.php

@@ -148,7 +148,7 @@ public function post(Model $model, Request $request): JsonResource
         return $this->newResource($model);
     }
 
-    public function get(Model|int $model, Request $request, string $class = null): JsonResource
+    public function get(Model|int $model, Request $request, ?string $class = null): JsonResource
     {
         $this->can('view');
 

app/Http/Middleware/ConnectTenantDatabase.php

@@ -28,6 +28,8 @@ public function handle($request, Closure $next)
 
         if (isset($connections[$tenant])) {
             DB::setDefaultConnection($tenant);
+        } elseif ($tenant !== config('app.default_host')) {
+            abort(404);
         }
 
         return $next($request);