Fix: Pixilib/GaelO_Issues#295

Author: salimkanoun

GaelO2/app/GaelO/Entities/UserEntity.php

@@ -20,7 +20,7 @@ class UserEntity
     public ?String $onboardingVersion;
     public ?string $emailVerifiedAt;
     public ?string $lastConnection;
-    
+
     public CenterEntity $mainCenter;
     public array $affiliatedCenters;
 
@@ -47,7 +47,7 @@ public static function fillFromDBReponseArray(array $array): UserEntity
         return $userEntity;
     }
 
-    public static function fillMinimalFromDBReponseArray(array $array): UserEntity
+    public static function fillMinimalFromDBReponseArray(array $array, bool $withOnboarding = false): UserEntity
     {
         $userEntity  = new UserEntity();
         $userEntity->id = $array['id'];
@@ -56,6 +56,7 @@ public static function fillMinimalFromDBReponseArray(array $array): UserEntity
         $userEntity->centerCode = $array['center_code'];
         $userEntity->email = $array['email'];
         $userEntity->phone = $array['phone'];
+        if ($withOnboarding) $userEntity->onboardingVersion = $array['onboarding_version'];
         return $userEntity;
     }
 
@@ -74,12 +75,12 @@ public function addRoles(array $roles): void
         $this->roles = $roles;
     }
 
-    public function setMainCenter(CenterEntity $mainCenter) :void 
+    public function setMainCenter(CenterEntity $mainCenter): void
     {
         $this->mainCenter = $mainCenter;
     }
 
-    public function setAffiliatedCenters(array $affiliatedCenters) :void
+    public function setAffiliatedCenters(array $affiliatedCenters): void
     {
         $this->affiliatedCenters = $affiliatedCenters;
     }

GaelO2/app/GaelO/UseCases/GetUsersFromStudy/GetUsersFromStudy.php

@@ -39,7 +39,7 @@ public function execute(GetUsersFromStudyRequest $getUsersFromStudyRequest, GetU
             foreach ($dbData as $data) {
                 $userEntity = [];
                 if ($role === Constants::ROLE_SUPERVISOR) {
-                    $userEntity = UserEntity::fillMinimalFromDBReponseArray($data);
+                    $userEntity = UserEntity::fillMinimalFromDBReponseArray($data, true);
                     $userEntity->setMainCenter(CenterEntity::fillFromDBReponseArray($data['main_center']));
                     $affiliatedCenters = array_map(function($center){return CenterEntity::fillFromDBReponseArray($center);}, $data['affiliated_centers']);
                     $userEntity->setAffiliatedCenters($affiliatedCenters);