Fix response when dont have notes. Issue #44

matiasdelellis · Oct 3, 2020 · b471181 · b471181
1 parent c259645
commit b471181
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/Controller/NoteApiController.php b/lib/Controller/NoteApiController.php
@@ -54,14 +54,16 @@ public function __construct($AppName,
 	 */
 	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
@@ -52,14 +52,16 @@ public function __construct($AppName,
 	 */
 	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;