From b4711815efd8ebecd4b97be01f78e8723d1d58ad Mon Sep 17 00:00:00 2001 From: Matias De lellis Date: Sat, 3 Oct 2020 17:34:31 -0300 Subject: [PATCH] Fix response when dont have notes. Issue #44 --- lib/Controller/NoteApiController.php | 6 ++++-- lib/Controller/NoteController.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Controller/NoteApiController.php b/lib/Controller/NoteApiController.php index dbc1bc2..5e3eec3 100644 --- a/lib/Controller/NoteApiController.php +++ b/lib/Controller/NoteApiController.php @@ -54,14 +54,16 @@ class NoteApiController extends ApiController { */ public function index(): JSONResponse { $notes = $this->noteService->getAll($this->userId); - $etag = md5(json_encode($notes)); + if (count($notes) === 0) { + return new JSONResponse([]); + } $lastModified = new \DateTime(null, new \DateTimeZone('GMT')); $timestamp = max(array_map(function($note) { return $note->getTimestamp(); }, $notes)); $lastModified->setTimestamp($timestamp); $response = new JSONResponse($notes); - $response->setETag($etag); + $response->setETag(md5(json_encode($notes))); $response->setLastModified($lastModified); return $response; diff --git a/lib/Controller/NoteController.php b/lib/Controller/NoteController.php index 476ab97..88dbfdc 100644 --- a/lib/Controller/NoteController.php +++ b/lib/Controller/NoteController.php @@ -52,14 +52,16 @@ class NoteController extends Controller { */ public function index(): JSONResponse { $notes = $this->noteService->getAll($this->userId); - $etag = md5(json_encode($notes)); + if (count($notes) === 0) { + return new JSONResponse([]); + } $lastModified = new \DateTime(null, new \DateTimeZone('GMT')); $timestamp = max(array_map(function($note) { return $note->getTimestamp(); }, $notes)); $lastModified->setTimestamp($timestamp); $response = new JSONResponse($notes); - $response->setETag($etag); + $response->setETag(md5(json_encode($notes))); $response->setLastModified($lastModified); return $response;