folio-migration-tools 1.9.4__tar.gz → 1.9.5__tar.gz

{folio_migration_tools-1.9.4 → folio_migration_tools-1.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: folio_migration_tools
-Version: 1.9.4
+Version: 1.9.5
 Summary: A tool allowing you to migrate data from legacy ILS:s (Library systems) into FOLIO LSP
 License: MIT
 Keywords: FOLIO,ILS,LSP,Library Systems,MARC21,Library data

{folio_migration_tools-1.9.4 → folio_migration_tools-1.9.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "folio_migration_tools"
-version = "1.9.4"
+version = "1.9.5"
 description =  "A tool allowing you to migrate data from legacy ILS:s (Library systems) into FOLIO LSP"
 authors = [
 	{name = "Theodor Tolstoy", email = "github.teddes@tolstoy.se"},

{folio_migration_tools-1.9.4 → folio_migration_tools-1.9.5}/src/folio_migration_tools/circulation_helper.py

@@ -198,6 +198,14 @@ class CirculationHelper:
                         error_message_from_folio,
                         error_message_from_folio,
                     )
+                elif "Item is already checked out" in error_message_from_folio:
+                    return TransactionResult(
+                        False,
+                        True,
+                        None,
+                        error_message_from_folio,
+                        error_message_from_folio,
+                    )
                 logging.error(
                     f"{error_message} "
                     f"Patron barcode: {legacy_loan.patron_barcode} "

{folio_migration_tools-1.9.4 → folio_migration_tools-1.9.5}/src/folio_migration_tools/helper.py

@@ -56,6 +56,10 @@ class Helper:
     @staticmethod
     def log_data_issue(index_or_id, message, legacy_value):
         logging.log(26, "DATA ISSUE\t%s\t%s\t%s", index_or_id, message, legacy_value)
+    
+    @staticmethod
+    def log_data_issue_failed(index_or_id, message, legacy_value):
+        logging.log(26, "RECORD FAILED\t%s\t%s\t%s", index_or_id, message, legacy_value)
 
     @staticmethod
     def write_to_file(file, folio_record):

{folio_migration_tools-1.9.4 → folio_migration_tools-1.9.5}/src/folio_migration_tools/migration_tasks/loans_migrator.py

@@ -6,7 +6,7 @@ import sys
 import time
 import traceback
 from datetime import datetime, timedelta
-from typing import Annotated, Literal, Optional
+from typing import Annotated, List, Literal, Optional
 from urllib.error import HTTPError
 from zoneinfo import ZoneInfo
 from pydantic import Field
@@ -110,7 +110,7 @@ class LoansMigrator(MigrationTaskBase):
         self.failed: dict = {}
         self.failed_and_not_dupe: dict = {}
         self.migration_report = MigrationReport()
-        self.valid_legacy_loans = []
+        self.valid_legacy_loans: List[LegacyLoan] = []
         super().__init__(library_config, task_configuration, folio_client)
         self.circulation_helper = CirculationHelper(
             self.folio_client,
@@ -227,6 +227,12 @@ class LoansMigrator(MigrationTaskBase):
                 )
                 try:
                     self.checkout_single_loan(legacy_loan)
+                except TransformationRecordFailedError as ee:
+                    logging.error(
+                        f"Transformation failed in row {num_loans}  Item barcode: {legacy_loan.item_barcode} "
+                        f"Patron barcode: {legacy_loan.patron_barcode}"
+                    )
+                    ee.log_it()
                 except Exception as ee:
                     logging.exception(
                         f"Error in row {num_loans}  Item barcode: {legacy_loan.item_barcode} "
@@ -277,11 +283,6 @@ class LoansMigrator(MigrationTaskBase):
                 else:
                     self.failed[legacy_loan.item_barcode] = legacy_loan
                     self.migration_report.add_general_statistics(i18n.t("Failed loans"))
-                    Helper.log_data_issue(
-                        "",
-                        "Loans failing during checkout",
-                        json.dumps(legacy_loan.to_dict()),
-                    )
                     logging.error(
                         "Failed on second try: %s", res_checkout2.error_message
                     )
@@ -290,6 +291,11 @@ class LoansMigrator(MigrationTaskBase):
                         i18n.t("Second failure")
                         + f": {res_checkout2.migration_report_message}",
                     )
+                    raise TransformationRecordFailedError(
+                        f"Row {legacy_loan.row}",
+                        i18n.t("Loans failing during checkout, second try"),
+                        json.dumps(legacy_loan.to_dict()),
+                    )
         elif not res_checkout.should_be_retried:
             logging.error(
                 "Failed first time. No retries: %s", res_checkout.error_message
@@ -301,8 +307,10 @@ class LoansMigrator(MigrationTaskBase):
                 + f": {res_checkout.migration_report_message}",
             )
             self.failed[legacy_loan.item_barcode] = legacy_loan
-            Helper.log_data_issue(
-                "", "Loans failing during checkout", json.dumps(legacy_loan.to_dict())
+            raise TransformationRecordFailedError(
+                f"Row {legacy_loan.row}",
+                i18n.t("Loans failing during checkout"),
+                json.dumps(legacy_loan.to_dict()),
             )
 
     def set_new_status(self, legacy_loan: LegacyLoan, res_checkout: TransactionResult):
@@ -400,7 +408,7 @@ class LoansMigrator(MigrationTaskBase):
                     + f": {has_proxy_barcode}",
                 )
             if not has_item_barcode:
-                Helper.log_data_issue(
+                Helper.log_data_issue_failed(
                     "", "Loan without matched item barcode", json.dumps(loan.to_dict())
                 )
             if not has_patron_barcode:
@@ -410,7 +418,7 @@ class LoansMigrator(MigrationTaskBase):
                     json.dumps(loan.to_dict()),
                 )
             if not has_proxy_barcode:
-                Helper.log_data_issue(
+                Helper.log_data_issue_failed(
                     "",
                     "Loan without matched proxy patron barcode",
                     json.dumps(loan.to_dict()),
@@ -502,6 +510,8 @@ class LoansMigrator(MigrationTaskBase):
             "Cannot check out item that already has an open loan"
         ):
             return self.handle_checked_out_item(legacy_loan)
+        elif "Item is already checked out" in folio_checkout.error_message:
+            return self.handle_checked_out_item(legacy_loan)
         elif "Aged to lost" in folio_checkout.error_message:
             return self.handle_lost_item(legacy_loan, "Aged to lost")
         elif folio_checkout.error_message == "Declared lost":

{folio_migration_tools-1.9.4 → folio_migration_tools-1.9.5}/src/folio_migration_tools/transaction_migration/legacy_loan.py

@@ -7,6 +7,7 @@ from zoneinfo import ZoneInfo
 from dateutil import tz
 from dateutil.parser import parse, ParserError
 
+from folio_migration_tools.helper import Helper
 from folio_migration_tools.migration_report import MigrationReport
 from folio_migration_tools.custom_exceptions import TransformationRecordFailedError
 
@@ -62,15 +63,25 @@ class LegacyLoan(object):
             temp_date_due: datetime = parse(self.legacy_loan_dict["due_date"])
             if temp_date_due.tzinfo != tz.UTC:
                 temp_date_due = temp_date_due.replace(tzinfo=self.tenant_timezone)
-                self.report(
+                Helper.log_data_issue(
+                    self.row,
                     f"Provided due_date is not UTC in {row=}, "
-                    f"setting tz-info to tenant timezone ({self.tenant_timezone})"
+                    f"setting tz-info to tenant timezone ({self.tenant_timezone})",
+                    json.dumps(self.legacy_loan_dict)
+                )
+                self.report(
+                    f"Provided due_date is not UTC, setting tz-info to tenant timezone ({self.tenant_timezone})"
                 )
             if temp_date_due.hour == 0 and temp_date_due.minute == 0:
                 temp_date_due = temp_date_due.replace(hour=23, minute=59)
-                self.report(
+                Helper.log_data_issue(
+                    self.row,
                     f"Hour and minute not specified for due date in {row=}. "
-                    "Assuming end of local calendar day (23:59)..."
+                    "Assuming end of local calendar day (23:59)...",
+                    json.dumps(self.legacy_loan_dict)
+                )
+                self.report(
+                    "Hour and minute not specified for due date"
                 )
         except (ParserError, OverflowError) as ee:
             logging.error(ee)
@@ -82,9 +93,14 @@ class LegacyLoan(object):
             temp_date_out: datetime = parse(self.legacy_loan_dict["out_date"])
             if temp_date_out.tzinfo != tz.UTC:
                 temp_date_out = temp_date_out.replace(tzinfo=self.tenant_timezone)
-                self.report(
+                Helper.log_data_issue(
+                    self.row,
                     f"Provided out_date is not UTC in {row=}, "
-                    f"setting tz-info to tenant timezone ({self.tenant_timezone})"
+                    f"setting tz-info to tenant timezone ({self.tenant_timezone})",
+                    json.dumps(self.legacy_loan_dict)
+                )
+                self.report(
+                    f"Provided out_date is not UTC, setting tz-info to tenant timezone ({self.tenant_timezone})"
                 )
         except (ParserError, OverflowError):
             temp_date_out = datetime.now(
@@ -122,11 +138,17 @@ class LegacyLoan(object):
             try:
                 return int(renewal_count)
             except ValueError:
-                self.report(
-                    i18n.t("Unresolvable %{renewal_count=} was replaced with 0.")
+                Helper.log_data_issue(
+                    self.row,
+                    i18n.t("Unresolvable %{renewal_count=} was replaced with 0."),
+                    json.dumps(loan)
                 )
         else:
-            self.report(i18n.t("Missing renewal count was replaced with 0."))
+            Helper.log_data_issue(
+                self.row,
+                i18n.t("Missing renewal count was replaced with 0."),
+                json.dumps(loan)
+            )
         return 0
 
     def correct_for_1_day_loans(self):