Refactoring: Move the HTTP method logic to user routes

Author: pH-7

src/Route/user.routes.php

@@ -1,11 +1,12 @@
 <?php
 namespace PH7\ApiSimpleMenu\Route;
 
+use PH7\ApiSimpleMenu\Route\Exception\NotFoundException;
 use PH7\ApiSimpleMenu\Service\User;
 use PH7\ApiSimpleMenu\Validation\Exception\InvalidValidationException;
 
 use PH7\JustHttp\StatusCode;
-use PH7\PhpHttpResponseHeader\Http;
+use PH7\PhpHttpResponseHeader\Http as HttpResponse;
 
 enum UserAction: string
 {
@@ -28,16 +29,29 @@ public function getResponse(): string
 
         $user = new User();
         try {
+            // check first if HTTP method for the requested endpoint is valid
+            $expectHttpMethod = match ($this) {
+                self::CREATE => Http::POST_METHOD,
+                self::UPDATE => Http::POST_METHOD,
+                self::RETRIEVE_ALL => Http::GET_METHOD,
+                self::RETRIEVE => Http::GET_METHOD,
+                self::REMOVE => Http::DELETE_METHOD
+            };
+
+            if (Http::doesHttpMethodMatch($expectHttpMethod) === false) {
+                throw new NotFoundException('HTTP method is incorrect. Request not found');
+            }
+
             $response = match ($this) {
                 self::CREATE => $user->create($postBody),
+                self::UPDATE => $user->update($postBody),
                 self::RETRIEVE_ALL => $user->retrieveAll(),
                 self::RETRIEVE => $user->retrieve($userId),
                 self::REMOVE => $user->remove($postBody),
-                self::UPDATE => $user->update($postBody),
             };
         } catch (InvalidValidationException $e) {
             // Send 400 http status code
-            Http::setHeadersByCode(StatusCode::BAD_REQUEST);
+            HttpResponse::setHeadersByCode(StatusCode::BAD_REQUEST);
 
             $response = [
                 'errors' => [

src/Service/User.php

@@ -2,26 +2,20 @@
 namespace PH7\ApiSimpleMenu\Service;
 
 use PH7\ApiSimpleMenu\Dal\UserDal;
-use PH7\ApiSimpleMenu\Route\Exception\NotFoundException;
 use PH7\ApiSimpleMenu\Validation\Exception\InvalidValidationException;
 use PH7\ApiSimpleMenu\Validation\UserValidation;
 use PH7\JustHttp\StatusCode;
 use PH7\PhpHttpResponseHeader\Http as HttpResponse;
 use Ramsey\Uuid\Uuid;
 use Respect\Validation\Validator as v;
 use PH7\ApiSimpleMenu\Entity\User as UserEntity;
-use PH7\ApiSimpleMenu\Route\Http;
 
 class User
 {
     public const DATE_TIME_FORMAT = 'Y-m-d H:i:s';
 
     public function create(mixed $data): array|object
     {
-        if (!Http::doesHttpMethodMatch(Http::POST_METHOD)) {
-            throw new NotFoundException('HTTP method is incorrect. Request not found');
-        }
-
         $userValidation = new UserValidation($data);
         if ($userValidation->isCreationSchemaValid()) {
             $userUuid = Uuid::uuid4()->toString(); // assigning a UUID to the user
@@ -55,10 +49,6 @@ public function create(mixed $data): array|object
 
     public function update(mixed $postBody): array|object
     {
-        if (!Http::doesHttpMethodMatch(Http::POST_METHOD)) {
-            throw new NotFoundException('HTTP method is incorrect. Request not found');
-        }
-
         $userValidation = new UserValidation($postBody);
         if ($userValidation->isUpdateSchemaValid()) {
             $userUuid = $postBody->userUuid;
@@ -123,10 +113,6 @@ public function retrieve(string $userUuid): array
      */
     public function remove(mixed $data): bool
     {
-        if (!Http::doesHttpMethodMatch(Http::DELETE_METHOD)) {
-            throw new NotFoundException('HTTP method is incorrect. Request not found');
-        }
-
         $userValidation = new UserValidation($data);
         if ($userValidation->isRemoveSchemaValid()) {
             // Send a 204 if the user got removed