From 252b2997ba7e6bd0cb3d753d1e490432955d995a Mon Sep 17 00:00:00 2001
From: Kostiantyn Stoliarskyi <saintkos117@gmail.com>
Date: Tue, 30 May 2023 10:02:00 +0300
Subject: [PATCH 1/3] refactored comments

---
 app/templates/book/delete_comment_modal.html |   6 +-
 app/templates/book/edit_comment_modal.html   |   6 +-
 app/templates/book/qa_view.html              |  19 +--
 app/views/book/comment.py                    | 124 +++++--------------
 4 files changed, 36 insertions(+), 119 deletions(-)

diff --git a/app/templates/book/delete_comment_modal.html b/app/templates/book/delete_comment_modal.html
index e91abc9..b2f0886 100644
--- a/app/templates/book/delete_comment_modal.html
+++ b/app/templates/book/delete_comment_modal.html
@@ -3,11 +3,7 @@
   <div class="relative w-full max-w-2xl max-h-full">
     <!-- Modal content -->
     <form
-      {% if sub_collection %}
-        action="{{ url_for('book.comment_delete', book_id=book.id, collection_id=collection.id, sub_collection_id=sub_collection.id, section_id=section.id, interpretation_id=interpretation.id) }}"
-      {% else %}
-        action="{{ url_for('book.comment_delete', book_id=book.id, collection_id=collection.id, section_id=section.id, interpretation_id=interpretation.id) }}"
-      {% endif %}
+      action="{{ url_for('book.comment_delete', book_id=book.id, interpretation_id=interpretation.id) }}"
       method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
       {{ form_hidden_tag() }}
       <!-- Modal header -->
diff --git a/app/templates/book/edit_comment_modal.html b/app/templates/book/edit_comment_modal.html
index 6faca52..72bf071 100644
--- a/app/templates/book/edit_comment_modal.html
+++ b/app/templates/book/edit_comment_modal.html
@@ -3,11 +3,7 @@
   <div class="relative w-full max-w-2xl max-h-full">
     <!-- Modal content -->
     <form
-      {% if sub_collection %}
-        action="{{ url_for('book.comment_edit', book_id=book.id, collection_id=collection.id, sub_collection_id=sub_collection.id, section_id=section.id, interpretation_id=interpretation.id) }}"
-      {% else %}
-        action="{{ url_for('book.comment_edit', book_id=book.id, collection_id=collection.id, section_id=section.id, interpretation_id=interpretation.id) }}"
-      {% endif %}
+      action="{{ url_for('book.comment_edit', book_id=book.id, interpretation_id=interpretation.id) }}"
       method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
       {{ form_hidden_tag() }}
       <!-- Modal header -->
diff --git a/app/templates/book/qa_view.html b/app/templates/book/qa_view.html
index a6ff49d..bb70b7e 100644
--- a/app/templates/book/qa_view.html
+++ b/app/templates/book/qa_view.html
@@ -40,18 +40,7 @@
     {% endif %}
     {% if current_user.is_authenticated %}
     <form
-      {%
-      if
-      sub_collection
-      %}
-      action="{{ url_for('book.create_comment', book_id=book.id, collection_id=collection.id, sub_collection_id=sub_collection.id,section_id=section.id,interpretation_id=interpretation.id) }}"
-      {%
-      else
-      %}
-      action="{{ url_for('book.create_comment', book_id=book.id, collection_id=collection.id,section_id=section.id,interpretation_id=interpretation.id) }}"
-      {%
-      endif
-      %}
+      action="{{ url_for('book.create_comment', book_id=book.id,interpretation_id=interpretation.id) }}"
       method="post"
       class="prevent-submit-on-enter flex flex-col bg-white dark:bg-gray-900 max-w-full p-3 text-gray-900 divide-y divide-gray-200 dark:text-white dark:divide-gray-700 m-3 border-2 border-gray-200 border-solid rounded-lg dark:border-gray-700">
       {{ form_hidden_tag() }}
@@ -237,11 +226,7 @@
         <div id="accordion-collapse-body-{{loop.index}}" class="hidden" aria-labelledby="accordion-collapse-heading-1">
           <div class="p-5 border-t border-gray-200 dark:border-gray-700 dark:bg-gray-900">
               <form
-                {% if sub_collection %}
-                  action="{{ url_for('book.create_comment', book_id=book.id, collection_id=collection.id, sub_collection_id=sub_collection.id,section_id=section.id,interpretation_id=interpretation.id) }}"
-                {% else %}
-                  action="{{ url_for('book.create_comment', book_id=book.id, collection_id=collection.id,section_id=section.id,interpretation_id=interpretation.id) }}"
-                {% endif %}
+                action="{{ url_for('book.create_comment', book_id=book.id,interpretation_id=interpretation.id) }}"
                 method="post"
                 class="prevent-submit-on-enter flex flex-col bg-white dark:bg-gray-900 max-w-full p-3 text-gray-900 dark:text-white dark:divide-gray-700 m-3 border-2 border-gray-200 border-solid rounded-lg dark:border-gray-700"
               >
diff --git a/app/views/book/comment.py b/app/views/book/comment.py
index e608791..b553f9c 100644
--- a/app/views/book/comment.py
+++ b/app/views/book/comment.py
@@ -1,4 +1,4 @@
-from flask import flash, redirect, url_for, current_app
+from flask import flash, redirect, url_for, current_app, request
 from flask_login import login_required, current_user
 
 from app.controllers import (
@@ -14,63 +14,29 @@ from .bp import bp
 
 
 @bp.route(
-    "/<int:book_id>/<int:collection_id>/<int:section_id>/<int:interpretation_id>/create_comment",
-    methods=["POST"],
-)
-@bp.route(
-    (
-        "/<int:book_id>/<int:collection_id>/<int:sub_collection_id>/"
-        "<int:section_id>/<int:interpretation_id>/create_comment"
-    ),
+    "/<int:book_id>/<int:interpretation_id>/create_comment",
     methods=["POST"],
 )
 @login_required
 def create_comment(
     book_id: int,
-    collection_id: int,
-    section_id: int,
     interpretation_id: int,
-    sub_collection_id: int | None = None,
 ):
+    current_url = request.referrer
+    if not current_url:
+        current_url = url_for(
+            "book.collection_view",
+            book_id=book_id,
+        )
     book: m.Book = db.session.get(m.Book, book_id)
     if not book or book.is_deleted:
         log(log.INFO, "User: [%s] is not owner of book: [%s]", current_user, book)
         flash("You are not owner of this book!", "danger")
         return redirect(url_for("book.my_library"))
-
-    collection: m.Collection = db.session.get(m.Collection, collection_id)
-    if not collection or collection.is_deleted:
-        log(log.WARNING, "Collection with id [%s] not found", collection_id)
-        flash("Collection not found", "danger")
-        return redirect(url_for("book.collection_view", book_id=book_id))
-
-    sub_collection = None
-    if sub_collection_id:
-        sub_collection: m.Collection = db.session.get(m.Collection, sub_collection_id)
-        if not sub_collection or sub_collection.is_deleted:
-            log(log.WARNING, "Sub_collection with id [%s] not found", sub_collection_id)
-            flash("SubCollection not found", "danger")
-            return redirect(
-                url_for(
-                    "book.sub_collection_view",
-                    book_id=book_id,
-                    collection_id=collection_id,
-                )
-            )
-
     redirect_url = url_for(
-        "book.qa_view",
+        "book.collection_view",
         book_id=book_id,
-        collection_id=collection_id,
-        sub_collection_id=sub_collection_id,
-        section_id=section_id,
-        interpretation_id=interpretation_id,
     )
-    section: m.Section = db.session.get(m.Section, section_id)
-    if not section or section.is_deleted:
-        log(log.WARNING, "Section with id [%s] not found", section_id)
-        flash("Section not found", "danger")
-        return redirect(redirect_url)
 
     interpretation: m.Interpretation = db.session.get(
         m.Interpretation, interpretation_id
@@ -95,9 +61,8 @@ def create_comment(
 
         log(
             log.INFO,
-            "Create comment for interpretation [%s]. Section: [%s]",
+            "Create comment for interpretation [%s].",
             interpretation,
-            section,
         )
         comment.save()
 
@@ -105,7 +70,7 @@ def create_comment(
         set_comment_tags(comment, tags)
 
         flash("Success!", "success")
-        return redirect(redirect_url)
+        return redirect(current_url)
     else:
         log(log.ERROR, "Comment create errors: [%s]", form.errors)
         for field, errors in form.errors.items():
@@ -117,25 +82,21 @@ def create_comment(
 
 
 @bp.route(
-    "/<int:book_id>/<int:collection_id>/<int:section_id>/<int:interpretation_id>/comment_delete",
-    methods=["POST"],
-)
-@bp.route(
-    (
-        "/<int:book_id>/<int:collection_id>/<int:sub_collection_id>/"
-        "<int:section_id>/<int:interpretation_id>/comment_delete"
-    ),
+    "/<int:book_id>/<int:interpretation_id>/comment_delete",
     methods=["POST"],
 )
 @register_book_verify_route(bp.name)
 @login_required
 def comment_delete(
     book_id: int,
-    collection_id: int,
-    section_id: int,
     interpretation_id: int,
-    sub_collection_id: int | None = None,
 ):
+    current_url = request.referrer
+    if not current_url:
+        current_url = url_for(
+            "book.collection_view",
+            book_id=book_id,
+        )
     form = f.DeleteCommentForm()
     comment_id = form.comment_id.data
     comment: m.Comment = db.session.get(m.Comment, comment_id)
@@ -147,45 +108,32 @@ def comment_delete(
         comment.save()
 
         flash("Success!", "success")
-        return redirect(
-            url_for(
-                "book.qa_view",
-                book_id=book_id,
-                collection_id=collection_id,
-                sub_collection_id=sub_collection_id,
-                section_id=section_id,
-                interpretation_id=interpretation_id,
-            )
-        )
+        return redirect(current_url)
+    flash("Invalid id!", "danger")
     return redirect(
         url_for(
-            "book.sub_collection_view",
+            "book.collection_view",
             book_id=book_id,
-            collection_id=collection_id,
         )
     )
 
 
 @bp.route(
-    "/<int:book_id>/<int:collection_id>/<int:section_id>/<int:interpretation_id>/comment_edit",
-    methods=["POST"],
-)
-@bp.route(
-    (
-        "/<int:book_id>/<int:collection_id>/<int:sub_collection_id>/"
-        "<int:section_id>/<int:interpretation_id>/comment_edit"
-    ),
+    "/<int:book_id>/<int:interpretation_id>/comment_edit",
     methods=["POST"],
 )
 @register_book_verify_route(bp.name)
 @login_required
 def comment_edit(
     book_id: int,
-    collection_id: int,
-    section_id: int,
     interpretation_id: int,
-    sub_collection_id: int | None = None,
 ):
+    current_url = request.referrer
+    if not current_url:
+        current_url = url_for(
+            "book.collection_view",
+            book_id=book_id,
+        )
     form = f.EditCommentForm()
 
     if form.validate_on_submit():
@@ -202,20 +150,12 @@ def comment_edit(
         comment.save()
 
         flash("Success!", "success")
-        return redirect(
-            url_for(
-                "book.qa_view",
-                book_id=book_id,
-                collection_id=collection_id,
-                sub_collection_id=sub_collection_id,
-                section_id=section_id,
-                interpretation_id=interpretation_id,
-            )
-        )
+        return redirect(current_url)
+    flash("Invalid id!", "danger")
+
     return redirect(
         url_for(
-            "book.sub_collection_view",
+            "book.collection_view",
             book_id=book_id,
-            collection_id=collection_id,
         )
     )

From 4d6c1481e0fd4264868cf2c10a238241d7483395 Mon Sep 17 00:00:00 2001
From: Kostiantyn Stoliarskyi <saintkos117@gmail.com>
Date: Tue, 30 May 2023 10:14:59 +0300
Subject: [PATCH 2/3] tests

---
 tests/test_book.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/test_book.py b/tests/test_book.py
index f136b94..aa84c76 100644
--- a/tests/test_book.py
+++ b/tests/test_book.py
@@ -1017,9 +1017,8 @@ def test_crud_comment(client: FlaskClient, runner: FlaskCliRunner):
     comment_text = "Some comment text"
 
     response: Response = client.post(
-        f"/book/{book.id}/{collection.id}/{sub_collection.id}/{section_in_subcollection.id}/{interpretation.id}/create_comment",
+        f"/book/{book.id}/{interpretation.id}/create_comment",
         data=dict(
-            section_id=section_in_subcollection.id,
             text=comment_text,
             interpretation_id=interpretation.id,
         ),

From 05b000fb5879eafbd875f198f18d86f973003de8 Mon Sep 17 00:00:00 2001
From: Kostiantyn Stoliarskyi <saintkos117@gmail.com>
Date: Tue, 30 May 2023 10:24:25 +0300
Subject: [PATCH 3/3] fix tests

---
 app/views/book/comment.py | 32 ++++++++++----------------------
 tests/test_book.py        |  6 ++----
 tests/test_tag.py         |  8 +++-----
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/app/views/book/comment.py b/app/views/book/comment.py
index 49d2890..41ea4e0 100644
--- a/app/views/book/comment.py
+++ b/app/views/book/comment.py
@@ -1,4 +1,4 @@
-from flask import flash, redirect, url_for, current_app, request
+from flask import flash, redirect, url_for, current_app
 from flask_login import login_required, current_user
 
 from app.controllers import (
@@ -22,12 +22,6 @@ def create_comment(
     book_id: int,
     interpretation_id: int,
 ):
-    current_url = request.referrer
-    if not current_url:
-        current_url = url_for(
-            "book.collection_view",
-            book_id=book_id,
-        )
     book: m.Book = db.session.get(m.Book, book_id)
     if not book or book.is_deleted:
         log(log.INFO, "User: [%s] is not owner of book: [%s]", current_user, book)
@@ -69,7 +63,7 @@ def create_comment(
         set_comment_tags(comment, tags)
 
         flash("Success!", "success")
-        return redirect(current_url)
+        return redirect(redirect_url)
     else:
         log(log.ERROR, "Comment create errors: [%s]", form.errors)
         for field, errors in form.errors.items():
@@ -90,12 +84,9 @@ def comment_delete(
     book_id: int,
     interpretation_id: int,
 ):
-    current_url = request.referrer
-    if not current_url:
-        current_url = url_for(
-            "book.collection_view",
-            book_id=book_id,
-        )
+    redirect_url = url_for(
+        "book.qa_view", book_id=book_id, interpretation_id=interpretation_id
+    )
     form = f.DeleteCommentForm()
     comment_id = form.comment_id.data
     comment: m.Comment = db.session.get(m.Comment, comment_id)
@@ -107,7 +98,7 @@ def comment_delete(
         comment.save()
 
         flash("Success!", "success")
-        return redirect(current_url)
+        return redirect(redirect_url)
     flash("Invalid id!", "danger")
     return redirect(
         url_for(
@@ -127,12 +118,9 @@ def comment_edit(
     book_id: int,
     interpretation_id: int,
 ):
-    current_url = request.referrer
-    if not current_url:
-        current_url = url_for(
-            "book.collection_view",
-            book_id=book_id,
-        )
+    redirect_url = url_for(
+        "book.qa_view", book_id=book_id, interpretation_id=interpretation_id
+    )
     form = f.EditCommentForm()
 
     if form.validate_on_submit():
@@ -149,7 +137,7 @@ def comment_edit(
         comment.save()
 
         flash("Success!", "success")
-        return redirect(current_url)
+        return redirect(redirect_url)
     flash("Invalid id!", "danger")
 
     return redirect(
diff --git a/tests/test_book.py b/tests/test_book.py
index b87672e..197129c 100644
--- a/tests/test_book.py
+++ b/tests/test_book.py
@@ -1035,9 +1035,8 @@ def test_crud_comment(client: FlaskClient, runner: FlaskCliRunner):
 
     # edit
     response: Response = client.post(
-        f"/book/{book.id}/{collection.id}/{sub_collection.id}/{section_in_subcollection.id}/{interpretation.id}/comment_edit",
+        f"/book/{book.id}/{interpretation.id}/comment_edit",
         data=dict(
-            section_id=section_in_subcollection.id,
             text=new_text,
             interpretation_id=interpretation.id,
             comment_id=comment.id,
@@ -1053,9 +1052,8 @@ def test_crud_comment(client: FlaskClient, runner: FlaskCliRunner):
 
     # delete
     response: Response = client.post(
-        f"/book/{book.id}/{collection.id}/{sub_collection.id}/{section_in_subcollection.id}/{interpretation.id}/comment_delete",
+        f"/book/{book.id}/{interpretation.id}/comment_delete",
         data=dict(
-            section_id=section_in_subcollection.id,
             text=comment_text,
             interpretation_id=interpretation.id,
             comment_id=comment.id,
diff --git a/tests/test_tag.py b/tests/test_tag.py
index f0616b2..b6180bc 100644
--- a/tests/test_tag.py
+++ b/tests/test_tag.py
@@ -83,13 +83,12 @@ def test_create_tags_on_comment_create_and_edit(client: FlaskClient):
     create_test_book(user.id, 1)
 
     book = db.session.get(m.Book, 1)
-    collection = db.session.get(m.Collection, 1)
     section = db.session.get(m.Section, 1)
     interpretation = db.session.get(m.Interpretation, 1)
 
     tags = "[tag1] [tag2] [tag3]"
     response: Response = client.post(
-        f"/book/{book.id}/{collection.id}/{section.id}/{interpretation.id}/create_comment",
+        f"/book/{book.id}/{interpretation.id}/create_comment",
         data=dict(
             section_id=section.id,
             text="some text" + tags,
@@ -116,7 +115,7 @@ def test_create_tags_on_comment_create_and_edit(client: FlaskClient):
 
     tags = "[tag1] [tag5] [tag7]"
     response: Response = client.post(
-        f"/book/{book.id}/{collection.id}/{section.id}/{interpretation.id}/comment_edit",
+        f"/book/{book.id}/{interpretation.id}/comment_edit",
         data=dict(text="some text" + tags, comment_id=comment.id),
         follow_redirects=True,
     )
@@ -143,14 +142,13 @@ def test_create_tags_on_interpretation_create_and_edit(client: FlaskClient):
     create_test_book(user.id, 1)
 
     book = db.session.get(m.Book, 1)
-    collection = db.session.get(m.Collection, 1)
     section = db.session.get(m.Section, 1)
 
     tags = "[tag1] [tag2] [tag3]"
     text_1 = "Test Interpretation #1 Text"
 
     response: Response = client.post(
-        f"/book/{book.id}/{collection.id}/{section.id}/create_interpretation",
+        f"/book/{book.id}/{section.id}/create_interpretation",
         data=dict(section_id=section.id, text=text_1 + tags),
         follow_redirects=True,
     )