Merge pull request #725 from WesternFriend/add-redirects-to-all-impor…

…t-scripts

Add redirects to import scripts

content_migration/management/import_archive_issues_handler.py

@@ -1,9 +1,44 @@
 from tqdm import tqdm
-from content_migration.management.shared import parse_csv_file
-
+from content_migration.management.shared import (
+    parse_csv_file,
+    create_permanent_redirect,
+)
 from magazine.models import ArchiveIssue, DeepArchiveIndexPage
 
 
+def create_or_update_archive_issue(
+    issue_data: dict,
+    deep_archive_index_page: DeepArchiveIndexPage,
+) -> ArchiveIssue:
+    issue_exists = ArchiveIssue.objects.filter(
+        internet_archive_identifier=issue_data["internet_archive_identifier"]
+    ).exists()
+
+    if issue_exists:
+        # update existing issue
+        archive_issue = ArchiveIssue.objects.get(
+            internet_archive_identifier=issue_data["internet_archive_identifier"]
+        )
+        archive_issue.title = issue_data["title"]
+        archive_issue.publication_date = issue_data["publication_date"]
+        archive_issue.western_friend_volume = issue_data["western_friend_volume"]
+
+        archive_issue.save()
+    else:
+        archive_issue = ArchiveIssue(
+            title=issue_data["title"],
+            publication_date=issue_data["publication_date"],
+            internet_archive_identifier=issue_data["internet_archive_identifier"],
+            western_friend_volume=issue_data["western_friend_volume"],
+        )
+
+        # Add issue to site page hiererchy
+        deep_archive_index_page.add_child(instance=archive_issue)
+        deep_archive_index_page.save()
+
+    return archive_issue
+
+
 def handle_import_archive_issues(file_name: str) -> None:
     # Get the only instance of Deep Archive Index Page
     deep_archive_index_page = DeepArchiveIndexPage.objects.get()
@@ -15,20 +50,12 @@ def handle_import_archive_issues(file_name: str) -> None:
         desc="Archive issues",
         unit="row",
     ):
-        issue_exists = ArchiveIssue.objects.filter(
-            internet_archive_identifier=issue["internet_archive_identifier"]
-        ).exists()
-
-        if issue_exists:
-            continue
-
-        import_issue = ArchiveIssue(
-            title=issue["title"],
-            publication_date=issue["publication_date"],
-            internet_archive_identifier=issue["internet_archive_identifier"],
-            western_friend_volume=issue["western_friend_volume"],
+        archive_issue = create_or_update_archive_issue(
+            issue_data=issue,
+            deep_archive_index_page=deep_archive_index_page,
         )
 
-        # Add issue to site page hiererchy
-        deep_archive_index_page.add_child(instance=import_issue)
-        deep_archive_index_page.save()
+        create_permanent_redirect(
+            redirect_path=issue["url_path"],
+            redirect_entity=archive_issue,
+        )

content_migration/management/import_magazine_articles_handler.py

@@ -15,6 +15,7 @@
 )
 
 from content_migration.management.shared import (
+    create_permanent_redirect,
     get_existing_magazine_author_from_db,
     parse_csv_file,
     parse_media_blocks,
@@ -68,8 +69,10 @@ def assign_article_to_issue(
         related_issue = MagazineIssue.objects.get(
             drupal_node_id=drupal_issue_node_id,
         )
-    except ObjectDoesNotExist:
-        print("Can't find issue: ", drupal_issue_node_id)
+    except ObjectDoesNotExist as error:
+        error_message = f"Could not find issue from Drupal ID: { drupal_issue_node_id }"
+        logger.error(error_message)
+        raise ObjectDoesNotExist(error_message) from error
 
     related_issue.add_child(
         instance=article,
@@ -139,3 +142,8 @@ def handle_import_magazine_articles(file_name: str) -> None:
                 article.tags.add(keyword)
 
         article.save()
+
+        create_permanent_redirect(
+            redirect_path=row["url_path"],
+            redirect_entity=article,
+        )

content_migration/management/import_magazine_authors_handler.py

@@ -10,7 +10,9 @@
     Person,
     PersonIndexPage,
 )
-from content_migration.management.shared import parse_csv_file
+from content_migration.management.shared import (
+    parse_csv_file,
+)
 
 logging.basicConfig(
     filename="import_log_magazine_authors.log",
@@ -24,7 +26,7 @@
 def create_meeting(
     author: dict,
     meeting_index_page: MeetingIndexPage,
-) -> None:
+) -> Meeting:
     # check if meeting already exists
     # if it does, update it
     # if it doesn't, create it
@@ -56,11 +58,13 @@ def create_meeting(
 
         meeting_index_page.save()
 
+    return meeting
+
 
 def create_organization(
     author: dict,
     organization_index_page: OrganizationIndexPage,
-) -> None:
+) -> Organization:
     organization_exists = Organization.objects.filter(
         drupal_author_id=author["drupal_author_id"]
     ).exists()
@@ -89,11 +93,13 @@ def create_organization(
 
         organization_index_page.save()
 
+    return organization
+
 
 def create_person(
     author: dict,
     person_index_page: PersonIndexPage,
-) -> None:
+) -> Person:
     person_exists = Person.objects.filter(
         drupal_author_id=author["drupal_author_id"]
     ).exists()
@@ -124,6 +130,8 @@ def create_person(
 
         person_index_page.save()
 
+    return person
+
 
 def import_author_records(authors_list: list[dict]) -> None:
     meeting_index_page = MeetingIndexPage.objects.get()

content_migration/management/import_magazine_issues_handler.py

@@ -7,7 +7,10 @@
 from django.utils.timezone import make_aware
 from tqdm import tqdm
 from wagtail.images.models import Image
-from content_migration.management.shared import parse_csv_file
+from content_migration.management.shared import (
+    create_permanent_redirect,
+    parse_csv_file,
+)
 
 from magazine.models import MagazineIndexPage, MagazineIssue
 
@@ -56,3 +59,8 @@ def handle_import_magazine_issues(file_name: str) -> None:
             # Add issue to site page hiererchy
             magazine_index_page.add_child(instance=import_issue)
             magazine_index_page.save()
+
+            create_permanent_redirect(
+                redirect_path=issue["url_path"],
+                redirect_entity=import_issue,
+            )

content_migration/management/import_memorials_handler.py

@@ -8,6 +8,7 @@
     DuplicateContactError,
 )
 from content_migration.management.shared import (
+    create_permanent_redirect,
     get_existing_magazine_author_from_db,
     parse_csv_file,
 )
@@ -128,3 +129,9 @@ def handle_import_memorials(file_name: str) -> None:
 
         else:
             memorial.save()
+
+        # Create a permanent redirect from the old URL to the new one
+        create_permanent_redirect(
+            redirect_path=memorial_data["url_path"],
+            redirect_entity=memorial,
+        )