Pixilib/GaelO_Issues#328

Author: salimkanoun

GaelO2/app/GaelO/UseCases/ModifyVisitDate/ModifyVisitDate.php

@@ -4,6 +4,7 @@
 
 use App\GaelO\Constants\Constants;
 use App\GaelO\Exceptions\AbstractGaelOException;
+use App\GaelO\Exceptions\GaelOBadRequestException;
 use App\GaelO\Exceptions\GaelOForbiddenException;
 use App\GaelO\Interfaces\Repositories\TrackerRepositoryInterface;
 use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
@@ -32,11 +33,16 @@ public function execute(ModifyVisitDateRequest $modifyVisitDateRequest, ModifyVi
             $visitId = $modifyVisitDateRequest->visitId;
             $currentUserId = $modifyVisitDateRequest->currentUserId;
             $newVisitDate = $modifyVisitDateRequest->visitDate;
+            $reason = $modifyVisitDateRequest->reason ?? null;
+
+            if (!$reason || empty($reason)) {
+                throw new GaelOBadRequestException('Reason must be specified');
+            }
 
             $visitContext = $this->visitRepositoryInterface->getVisitContext($visitId);
             $studyName = $visitContext['patient']['study_name'];
 
-            if($modifyVisitDateRequest->studyName !== $studyName){
+            if ($modifyVisitDateRequest->studyName !== $studyName) {
                 throw new GaelOForbiddenException("should be called from original study");
             }
 

GaelO2/app/GaelO/UseCases/ModifyVisitDate/ModifyVisitDateRequest.php

@@ -8,4 +8,5 @@ class ModifyVisitDateRequest
     public string $studyName;
     public int $visitId;
     public string $visitDate;
+    public string $reason;
 }

GaelO2/tests/Feature/TestVisits/ModifyVisitDateTest.php

@@ -27,7 +27,8 @@ public function testModifyVisitDate()
         AuthorizationTools::addRoleToUser($currentUserId, Constants::ROLE_SUPERVISOR, $this->studyName);
 
         $payload = [
-            'visitDate' => now()
+            'visitDate' => now(),
+            'reason' => 'changeDate'
         ];
 
         $response = $this->put('/api/visits/'.$this->visit->id.'/visit-date?studyName='.$this->studyName, $payload);
@@ -36,13 +37,29 @@ public function testModifyVisitDate()
 
     }
 
+    public function testModifyVisitDateShouldFailMissingReason()
+    {
+        $currentUserId = AuthorizationTools::actAsAdmin(false);
+        AuthorizationTools::addRoleToUser($currentUserId, Constants::ROLE_SUPERVISOR, $this->studyName);
+
+        $payload = [
+            'visitDate' => now(),
+        ];
+
+        $response = $this->put('/api/visits/'.$this->visit->id.'/visit-date?studyName='.$this->studyName, $payload);
+
+        $response->assertStatus(400);
+
+    }
+
     public function testModifyVisitDateShouldFailWrongStudy()
     {
         $currentUserId = AuthorizationTools::actAsAdmin(false);
         AuthorizationTools::addRoleToUser($currentUserId, Constants::ROLE_SUPERVISOR, $this->studyName);
 
         $payload = [
-            'visitDate' => now()
+            'visitDate' => now(),
+            'reason' => 'changeDate'
         ];
 
         $response = $this->put('/api/visits/'.$this->visit->id.'/visit-date?studyName='.$this->studyName. 'wrong', $payload);
@@ -57,7 +74,8 @@ public function testModifyVisitDateShouldFailNoRole()
         AuthorizationTools::addRoleToUser($currentUserId, Constants::ROLE_INVESTIGATOR, $this->studyName);
 
         $payload = [
-            'visitDate' => now()
+            'visitDate' => now(),
+            'reason' => 'changeDate'
         ];
 
         $response = $this->put('/api/visits/'.$this->visit->id.'/visit-date?studyName='.$this->studyName, $payload);