From 6f9d44ce865838af6cf3a4a54f60b125bd4927ab Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 26 Mar 2018 15:11:07 +0200
Subject: [PATCH] Fixed API endpoint for single bookmark lookup

---
 digimarks.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/digimarks.py b/digimarks.py
index 9d637ea..334688c 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -618,12 +618,15 @@ def bookmarks_json(userkey, filtermethod=None, sortmethod=None):
 @app.route('/api/v1/<userkey>/<urlhash>')
 def bookmark_json(userkey, urlhash):
     """ Serialise bookmark to json """
-    bookmark = Bookmark.select(
-        Bookmark.url_hash == urlhash,
-        Bookmark.userkey == userkey,
-        Bookmark.status == Bookmark.VISIBLE
-    )[0]
-    return jsonify(bookmark.to_dict())
+    try:
+        bookmark = Bookmark.get(
+            Bookmark.url_hash == urlhash,
+            Bookmark.userkey == userkey,
+            Bookmark.status == Bookmark.VISIBLE
+        )
+        return jsonify(bookmark.to_dict())
+    except Bookmark.DoesNotExist:
+        return jsonify({'message': 'Bookmark not found', 'status': 'error 404'})
 
 
 @app.route('/api/v1/<userkey>/search/<filter_text>')