Fix styles and unit tests

openemr · adunsulag · Oct 18, 2022 · Oct 12, 2022 · Oct 12, 2022 · Oct 12, 2022
commit 5f88f92d821591044b6cf2a8d6656eb37b81feea
diff --git a/_rest_routes.inc.php b/_rest_routes.inc.php
@@ -11590,8 +11590,7 @@
         // for the currently logged in user
         if ($request->getRequestUserUUIDString() == $uuid) {
             $return = (new FhirPersonRestController())->getOne($uuid);
-        }
-        else if (!$request->isPatientRequest()) {
+        } else if (!$request->isPatientRequest()) {
             // not a patient ,make sure we have access to the users ACL
             RestConfig::authorization_check("admin", "users");
             $return = (new FhirPersonRestController())->getOne($uuid);
@@ -12566,7 +12565,7 @@
      *      )
      *  )
      */
-    "GET /fhir/OperationDefinition" => function(HttpRestRequest $request) {
+    "GET /fhir/OperationDefinition" => function (HttpRestRequest $request) {
         // for now we will just hard code the custom resources
         $operationDefinitionController = new \OpenEMR\RestControllers\FHIR\Operations\FhirOperationDefinitionRestController();
         $return = $operationDefinitionController->getAll($request->getQueryParams());
@@ -12628,7 +12627,7 @@
      *      ),
      *  )
      */
-    "GET /fhir/OperationDefinition/:operation" => function($operation, HttpRestRequest $request) {
+    "GET /fhir/OperationDefinition/:operation" => function ($operation, HttpRestRequest $request) {
         // for now we will just hard code the custom resources
         $operationDefinitionController = new \OpenEMR\RestControllers\FHIR\Operations\FhirOperationDefinitionRestController();
         $return = $operationDefinitionController->getOne($operation);

diff --git a/library/classes/Document.class.php b/library/classes/Document.class.php
@@ -283,11 +283,11 @@ public function has_expired()
         return false;
     }
 
-    public function can_patient_access($pid) {
+    public function can_patient_access($pid)
+    {
         $foreignId = $this->get_foreign_id();
         // TODO: if any information blocking rule checks were to be applied, they can be done here
-        if (!empty($foreignId) && $foreignId == $pid)
-        {
+        if (!empty($foreignId) && $foreignId == $pid) {
             return true;
         }
         return false;

diff --git a/src/Common/Http/HttpRestRouteHandler.php b/src/Common/Http/HttpRestRouteHandler.php
@@ -303,7 +303,8 @@ private static function checkSecurity(HttpRestRequest $restRequest)
         $config::scope_check($scopeType, $resource, $permission);
     }
 
-    public static function fhirRestRequestSkipSecurityCheck(HttpRestRequest $restRequest) : bool {
+    public static function fhirRestRequestSkipSecurityCheck(HttpRestRequest $restRequest): bool
+    {
         $resource = $restRequest->getResource();
         // capability statement, smart well knowns, and operation definitions are skipped.
         $skippedChecks = ['metadata', '.well-known', 'OperationDefinition'];

diff --git a/src/RestControllers/FHIR/Operations/FhirOperationDefinitionRestController.php b/src/RestControllers/FHIR/Operations/FhirOperationDefinitionRestController.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace OpenEMR\RestControllers\FHIR\Operations;
 
-
 use OpenEMR\Common\Http\Psr17Factory;
 use OpenEMR\Common\Http\StatusCode;
 use OpenEMR\FHIR\R4\FHIRDomainResource\FHIROperationDefinition;
@@ -45,7 +43,8 @@ public function getAll($searchParams)
         return $response;
     }
 
-    public function getOne($operationId) {
+    public function getOne($operationId)
+    {
         $processingResult = new ProcessingResult();
         $statusCode = 200;
         if ($operationId == '$bulkdata-status') {
@@ -64,7 +63,8 @@ private function createResponseForCode($statusCode)
         return $response->withAddedHeader('Content-Type', 'application/json');
     }
 
-    private function getBulkDataStatusDefinition() {
+    private function getBulkDataStatusDefinition()
+    {
         $opDef = new FHIROperationDefinition();
         $opDef->setName('$bulkdata-status');
         $opDef->setStatus("active");
@@ -84,4 +84,4 @@ private function getBulkDataStatusDefinition() {
         $opDef->addParameter($opDefParameter);
         return $opDef;
     }
-}
+}
diff --git a/src/RestControllers/RestControllerHelper.php b/src/RestControllers/RestControllerHelper.php
@@ -267,7 +267,7 @@ public function addOperations($resource, $items, FHIRCapabilityStatementResource
             $fhirOperation->setDefinition(new FHIRCanonical('http://hl7.org/fhir/uv/bulkdata/OperationDefinition/' . $operationName));
             $capResource->addOperation($fhirOperation);
         } else if ($operation === '$bulkdata-status') {
-            $fhirOperation= new FHIRCapabilityStatementOperation();
+            $fhirOperation = new FHIRCapabilityStatementOperation();
             $fhirOperation->setName($operation);
             $capResource->addOperation($fhirOperation);
             // TODO: @adunsulag we should document in our capability statement how to use the bulkdata-status operation
@@ -387,7 +387,8 @@ public function getCapabilityRESTObject($routes, $serviceClassNameSpace = self::
      * @param string $resource
      * @return string
      */
-    private static function getResourceTypeForResource(string $resource) {
+    private static function getResourceTypeForResource(string $resource)
+    {
         $firstChar = $resource[0] ?? '';
         if ($firstChar == '$') {
             return 'OperationDefinition';

diff --git a/src/Services/PatientService.php b/src/Services/PatientService.php
@@ -605,7 +605,8 @@ public function getUuid($pid)
         return self::getUuidById($pid, self::TABLE_NAME, 'pid');
     }
 
-    public function getPidByUuid($uuid) {
+    public function getPidByUuid($uuid)
+    {
         return self::getIdByUuid($uuid, self::TABLE_NAME, 'pid');
     }
 

diff --git a/tests/Tests/Unit/Common/Http/HttpRestParsedRouteTest.php b/tests/Tests/Unit/Common/Http/HttpRestParsedRouteTest.php
@@ -59,7 +59,7 @@ public function testGetResourceWithDocumentBinaryFormat()
         $definition = 'GET /fhir/Binary/:id';
 
         $parsedRoute = new HttpRestParsedRoute("GET", $request, $definition);
-        $this->assertEquals("Document", $parsedRoute->getResource());
+        $this->assertEquals("Binary", $parsedRoute->getResource());
     }
 
     public function testIsOperation()