Merge pull request #7 from k-kaufmann/getRecipeById

getRecipeById
k-kaufmann · Mar 20, 2021 · 71b7327 · 71b7327
2 parents 0c98098 + 4274682
commit 71b7327
Show file tree

Hide file tree

Showing 7 changed files with 423 additions and 29 deletions.
diff --git a/src/ApiClient.php b/src/ApiClient.php
@@ -7,6 +7,7 @@
 use chefkoch\clients\RecipeClient;
 use chefkoch\clients\UserClient;
 use chefkoch\model\Category;
+use chefkoch\model\Recipe;
 use chefkoch\model\User;
 
 class ApiClient
@@ -45,6 +46,11 @@ public function getRecipesByCategories(array $categories, string $offset = "0"):
         return $this->recipeClient->getRecipesByCategories($categories, $offset);
     }
 
+    public function getRecipeById(string $id): Recipe
+    {
+        return $this->recipeClient->getRecipeById($id);
+    }
+
     public function getCateogries(): array
     {
         return $this->categoryClient->getCategories();

diff --git a/src/ChefkochFactory.php b/src/ChefkochFactory.php
@@ -8,6 +8,7 @@
 use chefkoch\clients\UserClient;
 use chefkoch\mapper\CategoryMapper;
 use chefkoch\mapper\RecipeMapper;
+use chefkoch\mapper\RecipeSimpleMapper;
 use chefkoch\mapper\UserMapper;
 use GuzzleHttp\Client;
 
@@ -37,6 +38,7 @@ public function createApiClient(): ApiClient
             ),
             new RecipeClient(
                 new Client($this->basicRecipeClientConfiguration),
+                new RecipeSimpleMapper(),
                 new RecipeMapper()
             ),
             new CategoryClient(

diff --git a/src/clients/RecipeClient.php b/src/clients/RecipeClient.php
@@ -3,19 +3,25 @@
 
 namespace chefkoch\clients;
 
-use chefkoch\exceptions\RecipeMappingException;
+use chefkoch\exceptions\RecipeSimpleMappingException;
 use chefkoch\mapper\RecipeMapper;
+use chefkoch\mapper\RecipeSimpleMapper;
+use chefkoch\model\Category;
+use chefkoch\model\Recipe;
 use chefkoch\model\RecipeSimple;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 
 class RecipeClient
 {
     private Client $client;
+    private RecipeSimpleMapper $recipeSimpleMapper;
     private RecipeMapper $recipeMapper;
 
-    public function __construct(Client $client, RecipeMapper $recipeMapper)
+    public function __construct(Client $client, RecipeSimpleMapper $recipeSimpleMapper, RecipeMapper $recipeMapper)
     {
         $this->client = $client;
+        $this->recipeSimpleMapper = $recipeSimpleMapper;
         $this->recipeMapper = $recipeMapper;
     }
 
@@ -39,14 +45,20 @@ public function getRecipes(string $offset = "0"): array
         $response = json_decode($response->getBody()->getContents(), true);
         foreach ($response['results'] as $result) {
             try {
-                $recipesSimple[] = $this->recipeMapper->mapArray($result["recipe"]);
-            } catch (RecipeMappingException $recipeMappingException) {
+                $recipesSimple[] = $this->recipeSimpleMapper->mapArray($result["recipe"]);
+            } catch (RecipeSimpleMappingException $recipeMappingException) {
                 // TODO logging for recipeMappingExceptions
             }
         }
         return $recipesSimple;
     }
 
+    /**
+     * @param array $categories
+     * @param string $offset
+     * @return Category[]
+     * @throws GuzzleException]
+     */
     public function getRecipesByCategories(array $categories, string $offset): array
     {
         $recipesSimple = [];
@@ -65,14 +77,25 @@ public function getRecipesByCategories(array $categories, string $offset): array
         $response = json_decode($response->getBody()->getContents(), true);
         foreach ($response['results'] as $result) {
             try {
-                $recipesSimple[] = $this->recipeMapper->mapArray($result["recipe"]);
-            } catch (RecipeMappingException $recipeMappingException) {
+                $recipesSimple[] = $this->recipeSimpleMapper->mapArray($result["recipe"]);
+            } catch (RecipeSimpleMappingException $recipeMappingException) {
                 // TODO logging for recipeMappingExceptions
             }
         }
         return $recipesSimple;
     }
 
+    public function getRecipeById(string $id): Recipe
+    {
+        $response = $this->client->get($id);
+        return $this->recipeMapper->mapArray(
+            json_decode(
+                $response->getBody()->getContents(),
+                true
+            )
+        );
+    }
+
     private function buildQueryString(array $queryParams): string
     {
         $query = "";

diff --git a/src/exceptions/RecipeSimpleMappingException.php b/src/exceptions/RecipeSimpleMappingException.php
@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+
+namespace chefkoch\exceptions;
+
+use Exception;
+
+class RecipeSimpleMappingException extends Exception
+{
+
+}
diff --git a/src/mapper/RecipeMapper.php b/src/mapper/RecipeMapper.php
@@ -4,36 +4,51 @@
 namespace chefkoch\mapper;
 
 use chefkoch\exceptions\RecipeMappingException;
-use chefkoch\model\RecipeSimple;
+use chefkoch\model\Recipe;
 use DateTime;
 use Exception;
 
 class RecipeMapper
 {
-    public function mapArray(array $recipeSimple): RecipeSimple
+    public function mapArray(array $recipe): Recipe
     {
         try {
-            return new RecipeSimple(
-                $recipeSimple["id"],
-                (int)$recipeSimple["type"],
-                $recipeSimple["title"],
-                $recipeSimple["subtitle"],
-                $recipeSimple["owner"],
-                $recipeSimple["rating"],
-                (int)$recipeSimple["difficulty"],
-                (bool)$recipeSimple["hasImage"],
-                (bool)$recipeSimple["hasVideo"],
-                $recipeSimple["previewImageId"],
-                (int)$recipeSimple["preparationTime"],
-                (bool)$recipeSimple["isSubmitted"],
-                (bool)$recipeSimple["isRejected"],
-                new DateTime($recipeSimple["createdAt"]),
-                (int)$recipeSimple["imageCount"],
-                $recipeSimple["editor"],
-                ($recipeSimple["submissionDate"] === null) ? null : new DateTime($recipeSimple["submissionDate"]),
-                (bool)$recipeSimple["isPremium"],
-                (int)$recipeSimple["status"],
-                $recipeSimple["id"],
+            return new Recipe(
+                $recipe["id"],
+                $recipe["type"],
+                $recipe["title"],
+                $recipe["subtitle"],
+                $recipe["owner"],
+                $recipe["rating"],
+                $recipe["difficulty"],
+                $recipe["hasImage"],
+                $recipe["hasVideo"],
+                $recipe["previewImageId"],
+                $recipe["preparationTime"],
+                $recipe["isSubmitted"],
+                $recipe["isRejected"],
+                new DateTime($recipe["createdAt"]),
+                $recipe["imageCount"],
+                $recipe["editor"],
+                ($recipe["submissionDate"] == null) ? null : new DateTime($recipe["submissionDate"]),
+                $recipe["isPremium"],
+                $recipe["status"],
+                $recipe["servings"],
+                $recipe["kCalories"],
+                $recipe["instructions"],
+                $recipe["miscellaneousText"],
+                $recipe["ingredientsText"],
+                $recipe["tags"],
+                $recipe["fullTags"],
+                $recipe["viewCount"],
+                $recipe["cookingTime"],
+                $recipe["restingTime"],
+                $recipe["totalTime"],
+                $recipe["ingredientGroups"],
+                $recipe["categoryIds"],
+                $recipe["recipeVideoId"],
+                $recipe["isIndexable"],
+                $recipe["siteUrl"]
             );
         } catch (Exception $exception) {
             throw new RecipeMappingException($exception->getMessage());

diff --git a/src/mapper/RecipeSimpleMapper.php b/src/mapper/RecipeSimpleMapper.php
@@ -0,0 +1,42 @@
+<?php
+declare(strict_types=1);
+
+namespace chefkoch\mapper;
+
+use chefkoch\exceptions\RecipeSimpleMappingException;
+use chefkoch\model\RecipeSimple;
+use DateTime;
+use Exception;
+
+class RecipeSimpleMapper
+{
+    public function mapArray(array $recipeSimple): RecipeSimple
+    {
+        try {
+            return new RecipeSimple(
+                $recipeSimple["id"],
+                (int)$recipeSimple["type"],
+                $recipeSimple["title"],
+                $recipeSimple["subtitle"],
+                $recipeSimple["owner"],
+                $recipeSimple["rating"],
+                (int)$recipeSimple["difficulty"],
+                (bool)$recipeSimple["hasImage"],
+                (bool)$recipeSimple["hasVideo"],
+                $recipeSimple["previewImageId"],
+                (int)$recipeSimple["preparationTime"],
+                (bool)$recipeSimple["isSubmitted"],
+                (bool)$recipeSimple["isRejected"],
+                new DateTime($recipeSimple["createdAt"]),
+                (int)$recipeSimple["imageCount"],
+                $recipeSimple["editor"],
+                ($recipeSimple["submissionDate"] === null) ? null : new DateTime($recipeSimple["submissionDate"]),
+                (bool)$recipeSimple["isPremium"],
+                (int)$recipeSimple["status"],
+                $recipeSimple["id"],
+            );
+        } catch (Exception $exception) {
+            throw new RecipeSimpleMappingException($exception->getMessage());
+        }
+    }
+}