From c9276532221444082e62573b0b7a1d33a585ec3b Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Sun, 23 Sep 2018 15:05:05 -0700
Subject: [PATCH] Reorganize bookmark create and delete endpoints.

---
 .../endpoints/bookmark_endpoints.py           | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/frontends/etiquette_flask/etiquette_flask/endpoints/bookmark_endpoints.py b/frontends/etiquette_flask/etiquette_flask/endpoints/bookmark_endpoints.py
index cff725a..87176b2 100644
--- a/frontends/etiquette_flask/etiquette_flask/endpoints/bookmark_endpoints.py
+++ b/frontends/etiquette_flask/etiquette_flask/endpoints/bookmark_endpoints.py
@@ -12,18 +12,6 @@ session_manager = common.session_manager
 
 # Individual bookmarks #############################################################################
 
-@site.route('/bookmarks/create_bookmark', methods=['POST'])
-@decorators.catch_etiquette_exception
-@decorators.required_fields(['url'], forbid_whitespace=True)
-def post_bookmark_create():
-    url = request.form['url']
-    title = request.form.get('title', None)
-    user = session_manager.get(request).user
-    bookmark = common.P.new_bookmark(url=url, title=title, author=user)
-    response = etiquette.jsonify.bookmark(bookmark)
-    response = jsonify.make_json_response(response)
-    return response
-
 @site.route('/bookmark/<bookmark_id>.json')
 @session_manager.give_token
 def get_bookmark_json(bookmark_id):
@@ -45,14 +33,6 @@ def post_bookmark_edit(bookmark_id):
     response = jsonify.make_json_response(response)
     return response
 
-@site.route('/bookmark/<bookmark_id>/delete', methods=['POST'])
-@decorators.catch_etiquette_exception
-def post_bookmark_delete(bookmark_id):
-    bookmark = common.P_bookmark(bookmark_id, response_type='json')
-    bookmark.delete()
-    return jsonify.make_json_response({})
-
-
 # Bookmark listings ################################################################################
 
 @site.route('/bookmarks')
@@ -67,3 +47,24 @@ def get_bookmarks_html():
 def get_bookmarks_json():
     bookmarks = [etiquette.jsonify.bookmark(b) for b in common.P.get_bookmarks()]
     return jsonify.make_json_response(bookmarks)
+
+# Bookmark create and delete #######################################################################
+
+@site.route('/bookmarks/create_bookmark', methods=['POST'])
+@decorators.catch_etiquette_exception
+@decorators.required_fields(['url'], forbid_whitespace=True)
+def post_bookmark_create():
+    url = request.form['url']
+    title = request.form.get('title', None)
+    user = session_manager.get(request).user
+    bookmark = common.P.new_bookmark(url=url, title=title, author=user)
+    response = etiquette.jsonify.bookmark(bookmark)
+    response = jsonify.make_json_response(response)
+    return response
+
+@site.route('/bookmark/<bookmark_id>/delete', methods=['POST'])
+@decorators.catch_etiquette_exception
+def post_bookmark_delete(bookmark_id):
+    bookmark = common.P_bookmark(bookmark_id, response_type='json')
+    bookmark.delete()
+    return jsonify.make_json_response({})