From 4e67d8bb381891f4fd54f7fac7c9fb3fccfbb55e Mon Sep 17 00:00:00 2001 From: Adam Kelly Date: Wed, 1 Apr 2020 15:10:59 +0100 Subject: [PATCH] Lift book lookup from create_review to review action. --- fedireads/status.py | 5 +---- fedireads/view_actions.py | 6 +++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fedireads/status.py b/fedireads/status.py index c0504a64..6cbc5acd 100644 --- a/fedireads/status.py +++ b/fedireads/status.py @@ -23,11 +23,8 @@ def create_review_from_activity(author, activity): return review -def create_review(user, possible_book, name, content, rating): +def create_review(user, book, name, content, rating): ''' a book review has been added ''' - # throws a value error if the book is not found - book = get_or_create_book(possible_book) - content = sanitize(content) # no ratings outside of 0-5 diff --git a/fedireads/view_actions.py b/fedireads/view_actions.py index 62a25f03..fcfe3339 100644 --- a/fedireads/view_actions.py +++ b/fedireads/view_actions.py @@ -11,6 +11,7 @@ from fedireads import forms, models, books_manager, outgoing from fedireads.goodreads_import import GoodreadsCsv from fedireads.settings import DOMAIN from fedireads.views import get_user_from_username +from fedireads.books_manager import get_or_create_book def user_login(request): @@ -172,7 +173,10 @@ def review(request): content = form.data.get('content') rating = form.data.get('rating') - outgoing.handle_review(request.user, book_identifier, name, content, rating) + # throws a value error if the book is not found + book = get_or_create_book(book_identifier) + + outgoing.handle_review(request.user, book, name, content, rating) return redirect('/book/%s' % book_identifier)