Merge pull request #697 from portabilis/portabilis-patch-2019-01-19

[2.2] Portabilis patch 19/01/2019

app/Http/Controllers/EnrollmentController.php

@@ -82,8 +82,11 @@ public function enroll(
 
         $previousEnrollment = $enrollmentService->getPreviousEnrollmentAccordingToRelocationDate($registration);
 
+        // Se for um remanejamento e a matrícula anterior tiver data de saída antes da data base (ou não houver data base)
+        // marca a matrícula como "remanejada" e reordena o sequencial da turma de origem
         if ($request->input('is_relocation') && $previousEnrollment) {
             $enrollmentService->markAsRelocated($previousEnrollment);
+            $enrollmentService->reorderSchoolClass($previousEnrollment);
         }
 
         try {

app/Models/LegacyVacancyReservationCandidate.php

@@ -81,4 +81,12 @@ public function school()
     {
         return $this->belongsTo(LegacySchool::class, 'ref_cod_escola');
     }
+
+    /**
+     * @return BelongsTo
+     */
+    public function student()
+    {
+        return $this->belongsTo(LegacyStudent::class, 'ref_cod_aluno');
+    }
 }

app/Providers/AppServiceProvider.php

@@ -12,6 +12,7 @@
 use iEducar\Modules\ErrorTracking\Tracker;
 use iEducar\Support\Navigation\Breadcrumb;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
@@ -99,6 +100,10 @@ public function boot()
         Schema::defaultStringLength(191);
 
         Paginator::defaultView('vendor.pagination.default');
+
+        Builder::macro('whereUnaccent', function ($column, $value) {
+            $this->whereRaw('unaccent(' . $column . ') ilike unaccent(\'%\' || ? || \'%\')', [$value]);
+        });
     }
 
     /**

app/Services/Educacenso/HandleFileService.php

@@ -59,7 +59,7 @@ public function createImportProcess($school)
         $import->finished = false;
         $import->save();
 
-        $school = array_map('utf8_encode', $school);
+        $school = array_map('utf8_decode', $school);
 
         EducacensoImportJob::dispatch($import, $school, DB::getDefaultConnection());
     }

app/Services/Educacenso/Version2019/Registro40Import.php

@@ -99,7 +99,7 @@ private function createOrUpdateManager(Employee $employee) : void
         $manager->role_id = $this->model->cargo;
         $manager->access_criteria_id = $this->model->criterioAcesso ?: null;
         $manager->access_criteria_description = $this->model->especificacaoCriterioAcesso;
-        $manager->link_type_id = $this->model->tipoVinculo ?: null;
+        $manager->link_type_id = (int)$this->model->tipoVinculo ?: null;
         if (!$this->existsChiefSchoolManager($school)) {
             $manager->chief = true;
         }

app/Services/EnrollmentService.php

@@ -165,6 +165,14 @@ public function cancelEnrollment(LegacyEnrollment $enrollment, DateTime $date)
         $enrollment->data_exclusao = $date;
         $enrollment->ativo = 0;
 
+        $relocationDate = $enrollment->schoolClass->school->institution->relocation_date;
+
+        // Se a matrícula anterior data de saída antes da data base (ou não houver data base)
+        // reordena o sequencial da turma de origem
+        if (!$relocationDate || $date < $relocationDate) {
+            $this->reorderSchoolClass($enrollment);
+        }
+
         return $enrollment->saveOrFail();
     }
 
@@ -318,10 +326,8 @@ public function getPreviousEnrollmentAccordingToRelocationDate(LegacyRegistratio
 
         $dateDeparted = $previousEnrollment->date_departed;
 
-        $relocationDate = $previousEnrollment->schoolClass->school->institution->relocation_date;
-
-        if (!$relocationDate || $relocationDate < $dateDeparted) {
-           return $previousEnrollment;
+        if ($this->withoutRelocationDateOrDateIsBefore($previousEnrollment, $dateDeparted)) {
+            return $previousEnrollment;
         }
     }
 
@@ -341,4 +347,52 @@ public function reorder(LegacyRegistration $registration)
 
         return true;
     }
+
+    /**
+     * Reordena os sequenciais da turma baseado em uma matrícula que vai ser remanejada
+     *
+     * Altera o sequencial da matrícula anterior para null
+     * e atualiza todos os sequenciais da turma de origem a partir do sequencial do aluno
+     * remanejado devem ser atualizados subtraindo 1
+     *
+     * @param LegacyEnrollment $enrollment
+     * @param DateTime $date
+     */
+    public function reorderSchoolClass(LegacyEnrollment $enrollment)
+    {
+        if (!$enrollment->sequencial_fechamento) {
+            return;
+        }
+
+        $schoolClass = $enrollment->schoolClass;
+        $schoolClass->enrollments()->where('sequencial_fechamento', '>', $enrollment->sequencial_fechamento)
+            ->orderBy('sequencial_fechamento')
+            ->get()
+            ->each(function (LegacyEnrollment $enrollment) {
+                $enrollment->sequencial_fechamento -= 1;
+                $enrollment->save();
+        });
+
+        $enrollment->sequencial_fechamento = 9999;
+        $enrollment->save();
+    }
+
+    /**
+     * Verifica se a instituição não usa database
+     * ou se a data informada é antes da database
+     *
+     * @param LegacyEnrollment $enrollment
+     * @param DateTime $date
+     * @return bool
+     */
+    private function withoutRelocationDateOrDateIsBefore($enrollment, $date)
+    {
+        $relocationDate = $enrollment->schoolClass->school->institution->relocation_date;
+
+        if (!$relocationDate || $date < $relocationDate) {
+            return true;
+        }
+
+        return false;
+    }
 }