feat: export change column

change export data structure after first client review

app/Http/Resources/EvaluationExportResource.php

@@ -83,7 +83,7 @@ private function _getActionPlanString(Collection $mesureLevels): string
         $actionPlan = [];
         foreach ($mesureLevels as $mesureLevel) {
             if ($mesureLevel->expected_level > $mesureLevel->actual_level) {
-                $actionPlan[] = implode(' ', [
+                $actionPlan[] = implode(';', [
                     $mesureLevel->measure->short_name,
                     '[' . $mesureLevel->actual_level . ' >> ' . $mesureLevel->expected_level . ']',
                     (new Carbon($mesureLevel->end_date))->isoFormat('DD/MM/YYYY'),

app/Http/Resources/OrganizationExportResource.php

@@ -24,10 +24,6 @@ public function toArray($request): array
         /** @var Organization $organization */
         $organization = $this->resource;
 
-        $referentsStringArray = [(string) $organization->referent];
-        $referentsStringArray = (bool) $organization->referentCyber ? [...$referentsStringArray, $organization->referentCyber . ' (référent cyber)'] : $referentsStringArray;
-        $referentsStringArray = (bool) $organization->referentElu ? [...$referentsStringArray, $organization->referentElu . ' (référent élu)'] : $referentsStringArray;
-
         $evaluation = $organization->doneEvaluations()->limit(2)->get();
         /** @var ?Evaluation $lastEvaluation */
         $lastEvaluation = $evaluation->first();
@@ -43,9 +39,11 @@ public function toArray($request): array
             'siren' => $organization->siren, //    - siren
             'active' => $organization->active, //    - actif
             'website' => $organization->website, //    - site internet
-            'info' => $organization->info, //    - infos complementaire
-            'fullAddress' => (string) $organization->address, //    - adresses (tous les chamsp)
-            'ref' => implode(PHP_EOL, $referentsStringArray), //     - référents et responsable (tous les champs)
+            'info' => $organization->info, //    - infos complémentaires
+            'fullAddress' => (string) $organization->address, //    - adresses (tous les champs)
+            'referent' => (string) $organization->referent, //     - référents et responsable (tous les champs)
+            'referentCyber' => (string) $organization->referentCyber,
+            'referentElu' => (string) $organization->referentElu,
             'lastEvaluation.cyberMaturity' => (float) $lastEvaluation?->maturity_cyber, //     - score indice maturité cyber
             'previousEvaluation.cyberMaturity' => (float) $previousEvaluation?->maturity_cyber, //    - score indice maturité cyber n-1
         ];
@@ -87,7 +85,7 @@ public function toArray($request): array
             'maturityLevel.organization' => (string) $this->_getAnswerForQuestionName($maturityLevelAnswers, MaturityQuestionNames::ORGANIZATION)?->name,  //     - niveau d'organisation
             'maturityLevel.motivation' => (string) $this->_getAnswerForQuestionName($maturityLevelAnswers, MaturityQuestionNames::MOTIVATION)?->name,  //     - niveau de motivation
 
-            'alert' => (bool) $lastEvaluation?->isThresholdExceeded(),  //     - alerte seuil dépassé (true/false)
+            'alert' => (bool) $lastEvaluation?->isThresholdNotExceeded(),  //     - seuil non dépassé (true/false)
         ];
     }
 

app/Models/Evaluation.php

@@ -196,7 +196,7 @@ public function saveAutomaticAnswers()
             }
 
             $evalAnswer->maturity_question_id = $question->id;
-            $evalAnswer->maturity_answer_id = $answer->id;
+            $evalAnswer->maturity_answer_id = $answer?->id;
             $evalAnswer->evaluation_id = $this->id;
             $evalAnswer->save();
         }
@@ -210,14 +210,14 @@ public static function getThreshold(): float
     /**
      * true if OK.
      */
-    public function isThresholdExceeded(): bool
+    public function isThresholdNotExceeded(): bool
     {
         foreach ($this->measureLevels as $measureLevel) {
             if ($measureLevel->actual_level < self::getThreshold()) {
-                return false;
+                return true;
             }
         }
 
-        return true;
+        return false;
     }
 }

lang/fr/exports.php

@@ -12,7 +12,9 @@
         'website' => 'site internet',
         'info' => 'infos complémentaire',
         'fullAddress' => 'adresse',
-        'ref' => 'référents et  responsable',
+        'referent' => 'référent',
+        'referentElu' => 'référent élu',
+        'referentCyber' => 'référent cyber',
         'lastEvaluation' => [
             'cyberMaturity' => 'score indice maturité cyber',
             'reference' => 'version du référentiel',