Merge pull request #14 from RyanNerd/fix-dupe-resident-record

Reactivation and dupe detection for Residents
RyanNerd · May 21, 2021 · ce8b395 · ce8b395
2 parents 2dbe5d5 + e5a8f2a
commit ce8b395
Show file tree

Hide file tree

Showing 20 changed files with 180 additions and 36 deletions.
diff --git a/app/Controllers/ApiValidator.php b/app/Controllers/ApiValidator.php
@@ -17,7 +17,7 @@ public function __invoke(Request $request, RequestHandler $handler): ResponseInt
         if (!$responseBody->getIsAuthenticated()) {
             // Short circuit the request by returning a response with status of 401;
             $responseBody = $responseBody
-                ->setStatus(401)
+                ->setStatus(ResponseBody::HTTP_UNAUTHORIZED)
                 ->setMessage('Invalid or missing API Key');
             return $responseBody();
         }

diff --git a/app/Controllers/Authenticate/AuthenticatePostAction.php b/app/Controllers/Authenticate/AuthenticatePostAction.php
@@ -42,7 +42,7 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
         // Is the user not found or is the password not valid?
         if ($user === null || !password_verify($body['password'], $user->PasswordHash)) {
             $responseBody = $responseBody
-                ->setStatus(401)
+                ->setStatus(ResponseBody::HTTP_UNAUTHORIZED)
                 ->setData(null)
                 ->setMessage('Not authorized');
             return $responseBody();
@@ -69,7 +69,7 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
         if (!$user->save()) {
             // Save failed for some reason, so reject the request.
             $responseBody = $responseBody
-                ->setStatus(500)
+                ->setStatus(ResponseBody::HTTP_INTERNAL_SERVER_ERROR)
                 ->setData(null)
                 ->setMessage('Unable to set new API_KEY');
             return $responseBody();
@@ -78,7 +78,7 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
         // Request is valid and authenticated!
         $responseBody = $responseBody
             ->setIsAuthenticated()
-            ->setStatus(200)
+            ->setStatus(ResponseBody::HTTP_OK)
             ->setData([
                 'apiKey' => $user->API_KEY,
                 'organization' => $user->Organization

diff --git a/app/Controllers/Authenticate/AuthenticatePostValidator.php b/app/Controllers/Authenticate/AuthenticatePostValidator.php
@@ -38,7 +38,7 @@ public function __invoke(Request $request, RequestHandler $handler): ResponseInt
         // If there are any missing required, or invalid data points then we short circuit and return invalid request.
         if ($responseBody->hasMissingRequiredOrInvalid()) {
             $responseBody = $responseBody
-                ->setStatus(400)
+                ->setStatus(ResponseBody::HTTP_BAD_REQUEST)
                 ->setMessage('Missing or invalid request');
             return $responseBody();
         }

diff --git a/app/Controllers/GetActionBase.php b/app/Controllers/GetActionBase.php
@@ -32,13 +32,12 @@ public function __invoke(Request $request, Response $response, array $args): Res
         // If the record is not found then 404 error, otherwise status is 200.
         if ($model === null) {
             $data = null;
-            $status = 404;
+            $status = ResponseBody::HTTP_NOT_FOUND;
         } else {
             // Remove any protected fields from the response
             $data = $model->toArray();
             $this->sanitize($data, $model::FIELDS);
-
-            $status = 200;
+            $status = ResponseBody::HTTP_OK;
         }
 
         // Set the status and data of the ResponseBody

diff --git a/app/Controllers/MedHistory/MedHistoryDeleteAction.php b/app/Controllers/MedHistory/MedHistoryDeleteAction.php
@@ -40,9 +40,9 @@ public function __invoke(Request $request, Response $response, array $args): Res
 
         // Destroy the model given the id.
         if ($model->destroy($args['id']) === 1) {
-            $status = 200;
+            $status = ResponseBody::HTTP_OK;
         } else {
-            $status = 404;
+            $status = ResponseBody::HTTP_NOT_FOUND;
         }
 
         // Set the status and data of the ResponseBody

diff --git a/app/Controllers/Medicine/MedicineDeleteAction.php b/app/Controllers/Medicine/MedicineDeleteAction.php
@@ -40,9 +40,9 @@ public function __invoke(Request $request, Response $response, array $args): Res
 
         // Destroy the model given the id.
         if ($model->destroy($args['id']) === 1) {
-            $status = 200;
+            $status = ResponseBody::HTTP_OK;
         } else {
-            $status = 404;
+            $status = ResponseBody::HTTP_NOT_FOUND;
         }
 
         // Set the status and data of the ResponseBody

diff --git a/app/Controllers/PasswordReset/PasswordResetPostAction.php b/app/Controllers/PasswordReset/PasswordResetPostAction.php
@@ -43,7 +43,7 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
         // Is the user not found or is the old_password not valid or the api_key is invalid?
         if ($user === null || $user->API_KEY != $body['api_key'] || !password_verify($body['old_password'], $user->PasswordHash)) {
             $responseBody = $responseBody
-                ->setStatus(401)
+                ->setStatus(ResponseBody::HTTP_UNAUTHORIZED)
                 ->setData(null)
                 ->setMessage('Not authorized');
             return $responseBody();
@@ -59,7 +59,7 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
         if (!$user->save()) {
             // Save failed for some reason, so reject the request.
             $responseBody = $responseBody
-                ->setStatus(500)
+                ->setStatus(ResponseBody::HTTP_INTERNAL_SERVER_ERROR)
                 ->setData(null)
                 ->setMessage('Unable to set new password');
             return $responseBody();
@@ -68,7 +68,7 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
         // Request is valid and authenticated with new API_KEY
         $responseBody = $responseBody
             ->setIsAuthenticated()
-            ->setStatus(200)
+            ->setStatus(ResponseBody::HTTP_OK)
             ->setData(['apiKey' => $user->API_KEY])
             ->setMessage('Password reset');
         return $responseBody();

diff --git a/app/Controllers/PasswordReset/PasswordResetPostValidator.php b/app/Controllers/PasswordReset/PasswordResetPostValidator.php
@@ -48,7 +48,7 @@ public function __invoke(Request $request, RequestHandler $handler): ResponseInt
         // If there are any missing required, or invalid data points then we short circuit and return invalid request.
         if ($responseBody->hasMissingRequiredOrInvalid()) {
             $responseBody = $responseBody
-                ->setStatus(400)
+                ->setStatus(ResponseBody::HTTP_BAD_REQUEST)
                 ->setMessage('Missing or invalid request');
             return $responseBody();
         }

diff --git a/app/Controllers/Resident/ResidentDeleteAction.php b/app/Controllers/Resident/ResidentDeleteAction.php
@@ -40,9 +40,9 @@ public function __invoke(Request $request, Response $response, array $args): Res
 
         // Destroy the model given the id.
         if ($model->destroy($args['id']) === 1) {
-            $status = 200;
+            $status = ResponseBody::HTTP_OK;
         } else {
-            $status = 404;
+            $status = ResponseBody::HTTP_NOT_FOUND;
         }
 
         // Set the status and data of the ResponseBody

diff --git a/app/Controllers/Resident/ResidentPostAction.php b/app/Controllers/Resident/ResidentPostAction.php
@@ -3,7 +3,11 @@
 
 namespace Willow\Controllers\Resident;
 
+use Psr\Http\Message\ResponseInterface;
+use Slim\Psr7\Request;
+use Slim\Psr7\Response;
 use Willow\Controllers\WriteActionBase;
+use Willow\Middleware\ResponseBody;
 use Willow\Models\Resident;
 use Willow\Models\ModelBase;
 
@@ -15,4 +19,64 @@ public function __construct(Resident $model)
     {
         $this->model = $model;
     }
+
+    /**
+     * We override this checking for trashed clients to restore or to prevent duplicates
+     * @param Request $request
+     * @param Response $response
+     * @return ResponseInterface
+     */
+    public function __invoke(Request $request, Response $response): ResponseInterface {
+        /** @var ResponseBody $responseBody */
+        $responseBody = $request->getAttribute('response_body');
+        $residentModel = clone $this->model;
+        $modelColumns = $residentModel::FIELDS;
+
+        // Get the request body
+        $parsedBody = $responseBody->getParsedRequest();
+
+        // Get the id/Id from the request
+        $id = $parsedBody['Id'] ?? null;
+
+        // Are we inserting a new record?
+        if ($id === null) {
+            // Force UserScope and look for existing records including trashed records
+            $residentModel = $residentModel->
+            where('UserId', '=', $responseBody->getUserId())->
+            where('FirstName', '=', $parsedBody['FirstName'])->
+            where('LastName', '=', $parsedBody['LastName'])->
+            where('DOB_YEAR', '=', $parsedBody['DOB_YEAR'])->
+            where('DOB_MONTH', '=', $parsedBody['DOB_MONTH'])->
+            where('DOB_DAY', '=', $parsedBody['DOB_DAY'])->
+            withTrashed()->
+            first();
+
+            // Did we get any results?
+            if ($residentModel !== null) {
+                // Is the client deactivated (trashed)?
+                if ($residentModel->trashed()) {
+                    // Undelete the record
+                    if ($residentModel->restore()) {
+                        $data = $residentModel->toArray();
+                        $this->sanitize($data, $modelColumns);
+
+                        // Return the response as the restored record.
+                        $responseBody = $responseBody
+                            ->setData($data)
+                            ->setStatus(ResponseBody::HTTP_OK);
+                        return $responseBody();
+                    }
+                } else {
+                    // Prevent inserting duplicate clients
+                    $responseBody = $responseBody
+                        ->setData(null)
+                        ->setStatus(ResponseBody::HTTP_CONFLICT)
+                        ->setMessage('Duplicates not allowed');
+                    return $responseBody();
+                }
+            }
+        }
+
+        return parent::__invoke($request, $response);
+    }
 }
diff --git a/app/Controllers/RestoreActionBase.php b/app/Controllers/RestoreActionBase.php
@@ -41,14 +41,14 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
             // Was the record successfully restored? Return the record and status of 200, otherwise return status 500;
             if ($record->restore()) {
                 $data = $record->toArray();
-                $status = 200;
+                $status = ResponseBody::HTTP_OK;
             } else {
                 $data = null;
-                $status = 500;
+                $status = ResponseBody::HTTP_INTERNAL_SERVER_ERROR;
                 $message = 'Unable to restore.';
             }
         } else {
-            $status = 404;
+            $status = ResponseBody::HTTP_NOT_FOUND;
             $data = null;
         }
 

diff --git a/app/Controllers/RestoreValidatorBase.php b/app/Controllers/RestoreValidatorBase.php
@@ -29,7 +29,7 @@ public function __invoke(Request $request, RequestHandler $handler): ResponseInt
         // Is there an invalid or missing parameter in the request? Respond with status 400.
         if ($responseBody->hasMissingRequiredOrInvalid()) {
             $responseBody = $responseBody
-                ->setStatus(400)
+                ->setStatus(ResponseBody::HTTP_BAD_REQUEST)
                 ->setData(null);
             return $responseBody();
         }

diff --git a/app/Controllers/SearchActionBase.php b/app/Controllers/SearchActionBase.php
@@ -95,10 +95,10 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
                 $this->sanitize($datum, $modelColumns);
             }
 
-            $status = 200;
+            $status = ResponseBody::HTTP_OK;
         } else {
             $data = null;
-            $status = 404;
+            $status = ResponseBody::HTTP_NOT_FOUND;
         }
 
         $responseBody = $responseBody

diff --git a/app/Controllers/SearchValidatorBase.php b/app/Controllers/SearchValidatorBase.php
@@ -36,7 +36,8 @@ class SearchValidatorBase
 
     /**
      * @param Request $request
-     * @param RequestHandler $handler
+     * @param RequestHandler $handlernamespace Willow\Controllers;
+
      * @return ResponseInterface
      */
     public function __invoke(Request $request, RequestHandler $handler): ResponseInterface
@@ -100,7 +101,7 @@ public function __invoke(Request $request, RequestHandler $handler): ResponseInt
         if ($responseBody->hasMissingRequiredOrInvalid()) {
             $responseBody = $responseBody
                 ->setData(null)
-                ->setStatus(400);
+                ->setStatus(ResponseBody::HTTP_BAD_REQUEST);
             return $responseBody();
         }
 

diff --git a/app/Controllers/WriteActionBase.php b/app/Controllers/WriteActionBase.php
@@ -31,7 +31,7 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
             if ($model === null) {
                 $responseBody = $responseBody
                     ->setData(null)
-                    ->setStatus(404);
+                    ->setStatus(ResponseBody::HTTP_NOT_FOUND);
                 return $responseBody();
             }
         }
@@ -71,12 +71,12 @@ public function __invoke(Request $request, Response $response): ResponseInterfac
 
             $responseBody = $responseBody
                 ->setData($modelArray)
-                ->setStatus(200);
+                ->setStatus(ResponseBody::HTTP_OK);
         } else {
             // Unable to save for some reason so we return error status.
             $responseBody = $responseBody
                 ->setData(null)
-                ->setStatus(500)
+                ->setStatus(ResponseBody::HTTP_INTERNAL_SERVER_ERROR)
                 ->setMessage('Unable to save changes to ' . $model->getTableName());
         }
 

diff --git a/app/Controllers/WriteValidatorBase.php b/app/Controllers/WriteValidatorBase.php
@@ -21,7 +21,7 @@ public function __invoke(Request $request, RequestHandler $handler): ResponseInt
         // If there are any missing or required data points then we short circuit and return invalid request.
         if ($responseBody->hasMissingRequiredOrInvalid()) {
             $responseBody = $responseBody
-                ->setStatus(400)
+                ->setStatus(ResponseBody::HTTP_BAD_REQUEST)
                 ->setMessage('Missing or invalid request');
             return $responseBody();
         }

diff --git a/app/Middleware/JsonBodyParser.php b/app/Middleware/JsonBodyParser.php
@@ -30,7 +30,9 @@ public function process(Request $request, RequestHandler $handler): Response
             } else {
                 // Short circuit the request by returning a response with status of 400 (invalid request).
                 $responseBody = new ResponseBody();
-                $responseBody = $responseBody->setStatus(400)->setMessage('Invalid JSON');
+                $responseBody = $responseBody->
+                    setStatus(ResponseBody::HTTP_BAD_REQUEST)->
+                    setMessage('Invalid JSON');
                 return $responseBody();
             }
         } else {
@@ -40,7 +42,9 @@ public function process(Request $request, RequestHandler $handler): Response
             if ($method === 'POST' || $method === 'PATCH') {
                 // Short circuit the request by returning a response with status of 400 (invalid request).
                 $responseBody = new ResponseBody();
-                $responseBody = $responseBody->setStatus(400)->setMessage("Invalid Content-Type: $contentType");
+                $responseBody = $responseBody->
+                    setStatus(ResponseBody::HTTP_BAD_REQUEST)->
+                    setMessage("Invalid Content-Type: $contentType");
                 return $responseBody();
             }
         }

diff --git a/app/Middleware/ResponseBody.php b/app/Middleware/ResponseBody.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Slim\Psr7\Response;
 
-class ResponseBody
+class ResponseBody extends ResponseCodes
 {
     protected ?array $parsedRequest = null;
     protected bool $isAuthenticated = false;
@@ -132,7 +132,7 @@ public function getUserId(): int
     {
         return $this->userId;
     }
-    /**
+    /** trashed records
      * Returns true if there are missing or required datapoints in the request
      *
      * @return bool