From 79af354dfd6dfc6696b794c5c3bb6e67e7a92727 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 11:27:13 -0800 Subject: [PATCH 01/15] Don't produce error is author is unset in import --- bookwyrm/models/import_job.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index c46795856..8b6599e84 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -25,7 +25,7 @@ def construct_search_term(title, author): # Strip brackets (usually series title from search term) title = re.sub(r"\s*\([^)]*\)\s*", "", title) # Open library doesn't like including author initials in search term. - author = re.sub(r"(\w\.)+\s*", "", author) + author = re.sub(r"(\w\.)+\s*", "", author) if author else "" return " ".join([title, author]) @@ -114,6 +114,8 @@ class ImportItem(models.Model): def get_book_from_title_author(self): """search by title and author""" + if not self.title: + return None, 0 search_term = construct_search_term(self.title, self.author) search_result = connector_manager.first_search_result( search_term, min_confidence=0.1 From bb69c32a6cfa872797474bc1d9e9039ee9f4dfdc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 11:58:56 -0800 Subject: [PATCH 02/15] Adds support for openlibrary csv shelf name format --- bookwyrm/importers/__init__.py | 1 + bookwyrm/importers/importer.py | 10 +-- bookwyrm/importers/openlibrary_import.py | 8 ++ bookwyrm/importers/storygraph_import.py | 2 +- bookwyrm/tests/data/openlibrary.csv | 5 ++ .../importers/test_openlibrary_import.py | 86 +++++++++++++++++++ 6 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 bookwyrm/importers/openlibrary_import.py create mode 100644 bookwyrm/tests/data/openlibrary.csv create mode 100644 bookwyrm/tests/importers/test_openlibrary_import.py diff --git a/bookwyrm/importers/__init__.py b/bookwyrm/importers/__init__.py index d4890070b..dd3d62e8b 100644 --- a/bookwyrm/importers/__init__.py +++ b/bookwyrm/importers/__init__.py @@ -3,4 +3,5 @@ from .importer import Importer from .goodreads_import import GoodreadsImporter from .librarything_import import LibrarythingImporter +from .openlibrary_import import OpenLibraryImporter from .storygraph_import import StorygraphImporter diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index 94e6734e7..6cb56f768 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -26,7 +26,7 @@ class Importer: ("authors", ["author", "authors", "primary author"]), ("isbn_10", ["isbn10", "isbn"]), ("isbn_13", ["isbn13", "isbn", "isbns"]), - ("shelf", ["shelf", "exclusive shelf", "read status"]), + ("shelf", ["shelf", "exclusive shelf", "read status", "bookshelf"]), ("review_name", ["review name"]), ("review_body", ["my review", "review"]), ("rating", ["my rating", "rating", "star rating"]), @@ -36,9 +36,9 @@ class Importer: ] date_fields = ["date_added", "date_started", "date_finished"] shelf_mapping_guesses = { - "to-read": ["to-read"], - "read": ["read"], - "reading": ["currently-reading", "reading"], + "to-read": ["to-read", "want to read"], + "read": ["read", "already read"], + "reading": ["currently-reading", "reading", "currently reading"], } def create_job(self, user, csv_file, include_reviews, privacy): @@ -90,7 +90,7 @@ class Importer: def get_shelf(self, normalized_row): """determine which shelf to use""" - shelf_name = normalized_row["shelf"] + shelf_name = normalized_row["shelf"].lower() shelf = [ s for (s, gs) in self.shelf_mapping_guesses.items() if shelf_name in gs ] diff --git a/bookwyrm/importers/openlibrary_import.py b/bookwyrm/importers/openlibrary_import.py new file mode 100644 index 000000000..038ecb8c0 --- /dev/null +++ b/bookwyrm/importers/openlibrary_import.py @@ -0,0 +1,8 @@ +""" handle reading a csv from openlibrary""" +from . import Importer + + +class OpenLibraryImporter(Importer): + """csv downloads from OpenLibrary""" + + service = "OpenLibrary" diff --git a/bookwyrm/importers/storygraph_import.py b/bookwyrm/importers/storygraph_import.py index 9368115d4..67cbaa663 100644 --- a/bookwyrm/importers/storygraph_import.py +++ b/bookwyrm/importers/storygraph_import.py @@ -3,6 +3,6 @@ from . import Importer class StorygraphImporter(Importer): - """csv downloads from librarything""" + """csv downloads from Storygraph""" service = "Storygraph" diff --git a/bookwyrm/tests/data/openlibrary.csv b/bookwyrm/tests/data/openlibrary.csv new file mode 100644 index 000000000..827b78d6e --- /dev/null +++ b/bookwyrm/tests/data/openlibrary.csv @@ -0,0 +1,5 @@ +Work Id,Edition Id,Bookshelf +OL102749W,,Currently Reading +OL361393W,OL7798182M,Currently Reading +OL1652392W,OL7194114M,Want to Read +OL17062644W,OL25726365M,Already Read diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py new file mode 100644 index 000000000..8a5c6cdef --- /dev/null +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -0,0 +1,86 @@ +""" testing import """ +import pathlib +from unittest.mock import patch +import datetime +import pytz + +from django.test import TestCase + +from bookwyrm import models +from bookwyrm.importers import OpenLibraryImporter +from bookwyrm.importers.importer import handle_imported_book + + +def make_date(*args): + """helper function to easily generate a date obj""" + return datetime.datetime(*args, tzinfo=pytz.UTC) + + +# pylint: disable=consider-using-with +@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") +@patch("bookwyrm.activitystreams.populate_stream_task.delay") +@patch("bookwyrm.activitystreams.add_book_statuses_task.delay") +class OpenLibraryImport(TestCase): + """importing from openlibrary csv""" + + def setUp(self): + """use a test csv""" + self.importer = OpenLibraryImporter() + datafile = pathlib.Path(__file__).parent.joinpath("../data/openlibrary.csv") + self.csv = open(datafile, "r", encoding=self.importer.encoding) + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( + "bookwyrm.activitystreams.populate_stream_task.delay" + ): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True + ) + + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + + def test_create_job(self, *_): + """creates the import job entry and checks csv""" + import_job = self.importer.create_job( + self.local_user, self.csv, False, "public" + ) + + import_items = models.ImportItem.objects.filter(job=import_job).all() + self.assertEqual(len(import_items), 4) + self.assertEqual(import_items[0].index, 0) + self.assertEqual(import_items[0].data["Work Id"], "OL102749W") + self.assertEqual(import_items[1].data["Work Id"], "OL361393W") + self.assertEqual(import_items[1].data["Edition Id"], "OL7798182M") + + self.assertEqual(import_items[0].normalized_data["shelf"], "reading") + self.assertEqual(import_items[2].normalized_data["shelf"], "to-read") + self.assertEqual(import_items[3].normalized_data["shelf"], "read") + + def test_handle_imported_book(self, *_): + """openlibrary import added a book, this adds related connections""" + shelf = self.local_user.shelf_set.filter(identifier="read").first() + self.assertIsNone(shelf.books.first()) + + import_job = self.importer.create_job( + self.local_user, self.csv, False, "public" + ) + import_item = import_job.items.first() + import_item.book = self.book + import_item.save() + + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + handle_imported_book(import_item) + + shelf.refresh_from_db() + self.assertEqual(shelf.books.first(), self.book) + self.assertEqual( + shelf.shelfbook_set.first().shelved_date, make_date(2020, 10, 21) + ) + + readthrough = models.ReadThrough.objects.get(user=self.local_user) + self.assertEqual(readthrough.book, self.book) + self.assertEqual(readthrough.start_date, make_date(2020, 10, 21)) + self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25)) From 4f1d4d9bc05e8580f0bcefafefd404eb8b3229c3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 12:42:56 -0800 Subject: [PATCH 03/15] Adds openlibrary keys to data --- bookwyrm/importers/openlibrary_import.py | 5 +++++ bookwyrm/tests/importers/test_openlibrary_import.py | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/bookwyrm/importers/openlibrary_import.py b/bookwyrm/importers/openlibrary_import.py index 038ecb8c0..ef1030609 100644 --- a/bookwyrm/importers/openlibrary_import.py +++ b/bookwyrm/importers/openlibrary_import.py @@ -6,3 +6,8 @@ class OpenLibraryImporter(Importer): """csv downloads from OpenLibrary""" service = "OpenLibrary" + + def __init__(self, *args, **kwargs): + self.row_mappings_guesses.append(("openlibrary_key", ["edition id"])) + self.row_mappings_guesses.append(("openlibrary_work_key", ["work id"])) + super().__init__(*args, **kwargs) diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index 8a5c6cdef..467259137 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -56,6 +56,15 @@ class OpenLibraryImport(TestCase): self.assertEqual(import_items[1].data["Edition Id"], "OL7798182M") self.assertEqual(import_items[0].normalized_data["shelf"], "reading") + self.assertIsNone(import_items[0].normalized_data["openlibrary_key"]) + self.assertEqual( + import_items[0].normalized_data["openlibrary_work_key"], + "OL102749W" + ) + self.assertEqual( + import_items[1].normalized_data["openlibrary_key"], + "OL7798182M" + ) self.assertEqual(import_items[2].normalized_data["shelf"], "to-read") self.assertEqual(import_items[3].normalized_data["shelf"], "read") From bee3c862239e0697aaea4892a96c861aab8eedc3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 12:49:00 -0800 Subject: [PATCH 04/15] Lookup by openlibrary key --- bookwyrm/models/import_job.py | 17 +++++++++++++---- .../tests/importers/test_openlibrary_import.py | 8 +++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index 8b6599e84..919bbf0db 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -88,7 +88,9 @@ class ImportItem(models.Model): return if self.isbn: - self.book = self.get_book_from_isbn() + self.book = self.get_book_from_identifier() + elif self.openlibrary_key: + self.book = self.get_book_from_identifier(field="openlibrary_key") else: # don't fall back on title/author search if isbn is present. # you're too likely to mismatch @@ -98,10 +100,10 @@ class ImportItem(models.Model): else: self.book_guess = book - def get_book_from_isbn(self): - """search by isbn""" + def get_book_from_identifier(self, field="isbn"): + """search by isbn or other unique identifier""" search_result = connector_manager.first_search_result( - self.isbn, min_confidence=0.999 + getattr(self, field), min_confidence=0.999 ) if search_result: # it's already in the right format @@ -147,6 +149,13 @@ class ImportItem(models.Model): self.normalized_data.get("isbn_10") ) + @property + def openlibrary_key(self): + """the edition identifier is preferable to the work key""" + return self.normalized_data.get("openlibrary_key") or self.normalized_data.get( + "openlibrary_work_key" + ) + @property def shelf(self): """the goodreads shelf field""" diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index 467259137..b8e9a04c1 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -56,14 +56,12 @@ class OpenLibraryImport(TestCase): self.assertEqual(import_items[1].data["Edition Id"], "OL7798182M") self.assertEqual(import_items[0].normalized_data["shelf"], "reading") - self.assertIsNone(import_items[0].normalized_data["openlibrary_key"]) + self.assertEqual(import_items[0].normalized_data["openlibrary_key"], "") self.assertEqual( - import_items[0].normalized_data["openlibrary_work_key"], - "OL102749W" + import_items[0].normalized_data["openlibrary_work_key"], "OL102749W" ) self.assertEqual( - import_items[1].normalized_data["openlibrary_key"], - "OL7798182M" + import_items[1].normalized_data["openlibrary_key"], "OL7798182M" ) self.assertEqual(import_items[2].normalized_data["shelf"], "to-read") self.assertEqual(import_items[3].normalized_data["shelf"], "read") From ba390dc3ade794567e6155fb0b2aee7e731d49f2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 12:50:53 -0800 Subject: [PATCH 05/15] Safer user of "lower" --- bookwyrm/importers/importer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index 6cb56f768..88064bced 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -90,7 +90,10 @@ class Importer: def get_shelf(self, normalized_row): """determine which shelf to use""" - shelf_name = normalized_row["shelf"].lower() + shelf_name = normalized_row.get("shelf") + if not shelf_name: + return None + shelf_name = shelf_name.lower() shelf = [ s for (s, gs) in self.shelf_mapping_guesses.items() if shelf_name in gs ] From 73ea44e532cf3edf6ec247535d7e87f22af21553 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 12:59:24 -0800 Subject: [PATCH 06/15] Add openlibrary selector to list --- bookwyrm/templates/import/import.html | 3 +++ bookwyrm/templates/import/import_status.html | 10 ++++++++++ bookwyrm/views/imports/import_data.py | 3 +++ 3 files changed, 16 insertions(+) diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html index 314a6861f..fdeb0e55b 100644 --- a/bookwyrm/templates/import/import.html +++ b/bookwyrm/templates/import/import.html @@ -31,6 +31,9 @@ +
diff --git a/bookwyrm/templates/import/import_status.html b/bookwyrm/templates/import/import_status.html index 9b4379693..b3d209873 100644 --- a/bookwyrm/templates/import/import_status.html +++ b/bookwyrm/templates/import/import_status.html @@ -105,6 +105,11 @@ {% trans "ISBN" %} + {% if job.source == "OpenLibrary" %} + + {% trans "Openlibrary key" %} + + {% endif %} {% trans "Author" %} @@ -145,6 +150,11 @@ {{ item.isbn|default:'' }} + {% if job.source == "OpenLibrary" %} + + {{ item.openlibrary_key }} + + {% endif %} {{ item.normalized_data.authors }} diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py index 80386b3de..6e50a14cc 100644 --- a/bookwyrm/views/imports/import_data.py +++ b/bookwyrm/views/imports/import_data.py @@ -14,6 +14,7 @@ from bookwyrm.importers import ( LibrarythingImporter, GoodreadsImporter, StorygraphImporter, + OpenLibraryImporter, ) # pylint: disable= no-self-use @@ -49,6 +50,8 @@ class Import(View): importer = LibrarythingImporter() elif source == "Storygraph": importer = StorygraphImporter() + elif source == "OpenLibrary": + importer = OpenLibraryImporter() else: # Default : Goodreads importer = GoodreadsImporter() From a33b5b054f989dc78e3ae037e08438e38a60ad22 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 13:14:45 -0800 Subject: [PATCH 07/15] Retain source on retry jobs --- bookwyrm/importers/importer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index 88064bced..32800e772 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -109,6 +109,7 @@ class Importer: user=user, include_reviews=original_job.include_reviews, privacy=original_job.privacy, + source=original_job.source, # TODO: allow users to adjust mappings mappings=original_job.mappings, retry=True, From 09f5218f9cd0e070ae3eec0c8263580642005f4a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 13:47:09 -0800 Subject: [PATCH 08/15] Fixes accept header --- bookwyrm/connectors/abstract_connector.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 1dfc406cb..873bbd686 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -256,9 +256,7 @@ def get_data(url, params=None, timeout=10): params=params, headers={ # pylint: disable=line-too-long "Accept": ( - "application/activity+json," - ' application/ld+json; profile="https://www.w3.org/ns/activitystreams",' - " application/json; charset=utf-8" + 'application/json, application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8' ), "User-Agent": settings.USER_AGENT, }, @@ -266,15 +264,15 @@ def get_data(url, params=None, timeout=10): ) except RequestException as err: logger.exception(err) - raise ConnectorException() + raise ConnectorException(err) if not resp.ok: - raise ConnectorException() + raise ConnectorException(resp.err) try: data = resp.json() except ValueError as err: logger.exception(err) - raise ConnectorException() + raise ConnectorException(err) return data From 3545085a7d9d364c49aa80d99ee41d7bb85ca612 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 14:19:27 -0800 Subject: [PATCH 09/15] Fixes tests --- bookwyrm/connectors/abstract_connector.py | 2 +- bookwyrm/tests/importers/test_importer.py | 2 +- bookwyrm/tests/importers/test_openlibrary_import.py | 10 +--------- bookwyrm/tests/models/test_import_model.py | 4 ++-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 873bbd686..20a175264 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -267,7 +267,7 @@ def get_data(url, params=None, timeout=10): raise ConnectorException(err) if not resp.ok: - raise ConnectorException(resp.err) + raise ConnectorException() try: data = resp.json() except ValueError as err: diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 5c3b20310..0ebbf8af4 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -128,7 +128,7 @@ class GenericImporter(TestCase): import_item = models.ImportItem.objects.get(job=import_job, index=0) with patch( - "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" + "bookwyrm.models.import_job.ImportItem.get_book_from_identifier" ) as resolve: resolve.return_value = self.book diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index b8e9a04c1..d53f55967 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -68,7 +68,7 @@ class OpenLibraryImport(TestCase): def test_handle_imported_book(self, *_): """openlibrary import added a book, this adds related connections""" - shelf = self.local_user.shelf_set.filter(identifier="read").first() + shelf = self.local_user.shelf_set.filter(identifier="reading").first() self.assertIsNone(shelf.books.first()) import_job = self.importer.create_job( @@ -83,11 +83,3 @@ class OpenLibraryImport(TestCase): shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) - self.assertEqual( - shelf.shelfbook_set.first().shelved_date, make_date(2020, 10, 21) - ) - - readthrough = models.ReadThrough.objects.get(user=self.local_user) - self.assertEqual(readthrough.book, self.book) - self.assertEqual(readthrough.start_date, make_date(2020, 10, 21)) - self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25)) diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index f48143d0d..e67a03459 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -139,7 +139,7 @@ class ImportJob(TestCase): self.assertEqual(item.reads, expected) @responses.activate - def test_get_book_from_isbn(self): + def test_get_book_from_identifier(self): """search and load books by isbn (9780356506999)""" item = models.ImportItem.objects.create( index=1, @@ -197,6 +197,6 @@ class ImportJob(TestCase): with patch( "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ): - book = item.get_book_from_isbn() + book = item.get_book_from_identifier() self.assertEqual(book.title, "Sabriel") From 86fcaad72ce166d07d13f28f2811261ac7535ff7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 18:47:17 -0800 Subject: [PATCH 10/15] Comments out failing test --- bookwyrm/tests/importers/test_importer.py | 62 +++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 0ebbf8af4..4b52c4254 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -140,37 +140,37 @@ class GenericImporter(TestCase): self.assertEqual(kwargs["queue"], "low_priority") import_item.refresh_from_db() - def test_complete_job(self, *_): - """test notification""" - import_job = self.importer.create_job( - self.local_user, self.csv, False, "unlisted" - ) - items = import_job.items.all() - for item in items[:3]: - item.fail_reason = "hello" - item.save() - item.update_job() - self.assertFalse( - models.Notification.objects.filter( - user=self.local_user, - related_import=import_job, - notification_type="IMPORT", - ).exists() - ) - - item = items[3] - item.fail_reason = "hello" - item.save() - item.update_job() - import_job.refresh_from_db() - self.assertTrue(import_job.complete) - self.assertTrue( - models.Notification.objects.filter( - user=self.local_user, - related_import=import_job, - notification_type="IMPORT", - ).exists() - ) +# def test_complete_job(self, *_): +# """test notification""" +# import_job = self.importer.create_job( +# self.local_user, self.csv, False, "unlisted" +# ) +# items = import_job.items.all() +# for item in items[:3]: +# item.fail_reason = "hello" +# item.save() +# item.update_job() +# self.assertFalse( +# models.Notification.objects.filter( +# user=self.local_user, +# related_import=import_job, +# notification_type="IMPORT", +# ).exists() +# ) +# +# item = items[3] +# item.fail_reason = "hello" +# item.save() +# item.update_job() +# import_job.refresh_from_db() +# self.assertTrue(import_job.complete) +# self.assertTrue( +# models.Notification.objects.filter( +# user=self.local_user, +# related_import=import_job, +# notification_type="IMPORT", +# ).exists() +# ) def test_handle_imported_book(self, *_): """import added a book, this adds related connections""" From 8cb2e74c81351471dd2648c6ce52a01a8b2002a3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 19:05:45 -0800 Subject: [PATCH 11/15] Uncomment test --- bookwyrm/tests/importers/test_importer.py | 62 +++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 4b52c4254..0ebbf8af4 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -140,37 +140,37 @@ class GenericImporter(TestCase): self.assertEqual(kwargs["queue"], "low_priority") import_item.refresh_from_db() -# def test_complete_job(self, *_): -# """test notification""" -# import_job = self.importer.create_job( -# self.local_user, self.csv, False, "unlisted" -# ) -# items = import_job.items.all() -# for item in items[:3]: -# item.fail_reason = "hello" -# item.save() -# item.update_job() -# self.assertFalse( -# models.Notification.objects.filter( -# user=self.local_user, -# related_import=import_job, -# notification_type="IMPORT", -# ).exists() -# ) -# -# item = items[3] -# item.fail_reason = "hello" -# item.save() -# item.update_job() -# import_job.refresh_from_db() -# self.assertTrue(import_job.complete) -# self.assertTrue( -# models.Notification.objects.filter( -# user=self.local_user, -# related_import=import_job, -# notification_type="IMPORT", -# ).exists() -# ) + def test_complete_job(self, *_): + """test notification""" + import_job = self.importer.create_job( + self.local_user, self.csv, False, "unlisted" + ) + items = import_job.items.all() + for item in items[:3]: + item.fail_reason = "hello" + item.save() + item.update_job() + self.assertFalse( + models.Notification.objects.filter( + user=self.local_user, + related_import=import_job, + notification_type="IMPORT", + ).exists() + ) + + item = items[3] + item.fail_reason = "hello" + item.save() + item.update_job() + import_job.refresh_from_db() + self.assertTrue(import_job.complete) + self.assertTrue( + models.Notification.objects.filter( + user=self.local_user, + related_import=import_job, + notification_type="IMPORT", + ).exists() + ) def test_handle_imported_book(self, *_): """import added a book, this adds related connections""" From 6af2182879576d551cfb9aaafa501cd36779f20d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 19:20:29 -0800 Subject: [PATCH 12/15] Test print statements --- bookwyrm/tests/importers/test_importer.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 0ebbf8af4..295e2aeb7 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -146,6 +146,9 @@ class GenericImporter(TestCase): self.local_user, self.csv, False, "unlisted" ) items = import_job.items.all() + print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!") + print(items.count()) + print(import_job.pending_items.count()) for item in items[:3]: item.fail_reason = "hello" item.save() @@ -157,11 +160,13 @@ class GenericImporter(TestCase): notification_type="IMPORT", ).exists() ) + print(import_job.pending_items.count()) item = items[3] item.fail_reason = "hello" item.save() item.update_job() + print(import_job.pending_items.count()) import_job.refresh_from_db() self.assertTrue(import_job.complete) self.assertTrue( From 69204a1c94bd02684d4d27a54b9946e9bb74dab6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 19:38:28 -0800 Subject: [PATCH 13/15] More print statements --- bookwyrm/tests/importers/test_importer.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 295e2aeb7..ea0dbbe75 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -150,6 +150,7 @@ class GenericImporter(TestCase): print(items.count()) print(import_job.pending_items.count()) for item in items[:3]: + print(item.id) item.fail_reason = "hello" item.save() item.update_job() @@ -163,11 +164,14 @@ class GenericImporter(TestCase): print(import_job.pending_items.count()) item = items[3] + print(item.id) + print(item.fail_reason, item.book) item.fail_reason = "hello" item.save() item.update_job() print(import_job.pending_items.count()) import_job.refresh_from_db() + print(import_job.pending_items.count()) self.assertTrue(import_job.complete) self.assertTrue( models.Notification.objects.filter( From 6ba5d53d38a8bfa65a8daee5664245e45e1c9ad8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 19:46:35 -0800 Subject: [PATCH 14/15] trying item.last instead of going by list lookup --- bookwyrm/tests/importers/test_importer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index ea0dbbe75..812cabff1 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -163,13 +163,12 @@ class GenericImporter(TestCase): ) print(import_job.pending_items.count()) - item = items[3] + item = items.last() print(item.id) print(item.fail_reason, item.book) item.fail_reason = "hello" item.save() item.update_job() - print(import_job.pending_items.count()) import_job.refresh_from_db() print(import_job.pending_items.count()) self.assertTrue(import_job.complete) From e6d500df6bfe53c094847a85656b1e8aa7ee3875 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 14 Dec 2021 19:52:43 -0800 Subject: [PATCH 15/15] Removes debugging print statements --- bookwyrm/tests/importers/test_importer.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 812cabff1..4599568bf 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -146,11 +146,7 @@ class GenericImporter(TestCase): self.local_user, self.csv, False, "unlisted" ) items = import_job.items.all() - print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!") - print(items.count()) - print(import_job.pending_items.count()) for item in items[:3]: - print(item.id) item.fail_reason = "hello" item.save() item.update_job() @@ -161,16 +157,12 @@ class GenericImporter(TestCase): notification_type="IMPORT", ).exists() ) - print(import_job.pending_items.count()) item = items.last() - print(item.id) - print(item.fail_reason, item.book) item.fail_reason = "hello" item.save() item.update_job() import_job.refresh_from_db() - print(import_job.pending_items.count()) self.assertTrue(import_job.complete) self.assertTrue( models.Notification.objects.filter(