From 1022e4568e834864e538f05d197f19c3b14b4225 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 29 Jul 2020 23:47:52 +0300
Subject: [PATCH] feat(rest-api): fix entries rest api next round #435

---
 src/flextype/app/Endpoints/entries.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/flextype/app/Endpoints/entries.php b/src/flextype/app/Endpoints/entries.php
index cf5b421f..a0b1b172 100644
--- a/src/flextype/app/Endpoints/entries.php
+++ b/src/flextype/app/Endpoints/entries.php
@@ -62,16 +62,18 @@ $app->get('/api/entries', function (Request $request, Response $response) use ($
                     return $response->withJson($api_errors['0003'], $api_errors['0003']['http_status_code']);
                 }
 
-                // Fetch entries collection
-                if ($filter !== null) {
-                    $response_data['data'] = collect_filter($flextype['entries']->fetch($id, true), $filter);
+                if ($filter === null) {
+                    $response_data['data'] = $flextype['entries']->fetchSingle($id);
+                } else {
+                    $response_data['data'] = collect_filter($flextype['entries']->fetchCollection($id), $filter);
                 }
 
-                // Fetch single entry
-                $response_data['data'] = $flextype['entries']->fetch($id);
-
                 // Set response code
-                $response_code = count($response_data['data']) > 0 ? 200 : 404;
+                if (is_array($response_data['data'])) {
+                    $response_code = count($response_data['data']) > 0 ? 200 : 404;
+                } else {
+                    $response_code = $response_data['data'] > 0 ? 200 : 404;
+                }
 
                 // Update calls counter
                 Filesystem::write($entries_token_file_path, $flextype['yaml']->encode(array_replace_recursive($entries_token_file_data, ['calls' => $entries_token_file_data['calls'] + 1])));