folio-migration-tools 1.9.4__py3-none-any.whl → 1.9.5__py3-none-any.whl

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/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/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/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):

{folio_migration_tools-1.9.4.dist-info → folio_migration_tools-1.9.5.dist-info}/METADATA

@@ -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.dist-info → folio_migration_tools-1.9.5.dist-info}/RECORD

@@ -1,13 +1,13 @@
 folio_migration_tools/__init__.py,sha256=DXvzUKFSpSZjflFWaNm0L8yhFk0u7RVIvQMskwMmKFc,238
 folio_migration_tools/__main__.py,sha256=kfo4iKf3GJD7deh4RvIizKnC4zvIgCpNo-Bs7HBM34s,8453
-folio_migration_tools/circulation_helper.py,sha256=V2VM30i2OigOKb64B4FFKTeHu9NTkhptalaOfziPhTo,14199
+folio_migration_tools/circulation_helper.py,sha256=iib2p0WGzOcAnwaJppDYiONc-1Jdna66dPAtBmAIuCE,14538
 folio_migration_tools/colors.py,sha256=GP0wdI_GZ2WD5SjrbPN-S3u8vvN_u6rGQIBBcWv_0ZM,227
 folio_migration_tools/config_file_load.py,sha256=zHHa6NDkN6EJiQE4DgjrFQPVKsd70POsfbGkB8308jg,2822
 folio_migration_tools/custom_dict.py,sha256=-FUnhKp90Dg8EHlY6twx-PYQxBUWEO7FgxL2b7pf-xk,678
 folio_migration_tools/custom_exceptions.py,sha256=1zgOKy3NBUVGG6i9YxK6w2Hntlea8MHmm7mdnjBtzvQ,2687
 folio_migration_tools/extradata_writer.py,sha256=fuchNcMc6BYb9IyfAcvXg7X4J2TfX6YiROfT2hr0JMw,1678
 folio_migration_tools/folder_structure.py,sha256=bZlmKGtxdytWcqjnM2lE4Vpx4nHyYRk7CNL1tZhLtXY,6917
-folio_migration_tools/helper.py,sha256=KkOkNAGO_fuYqxdLrsbLzCJLQHUrFZG1NzD4RmpQ-KM,2804
+folio_migration_tools/helper.py,sha256=iWQhdcuzbGzVpEAiHQczO4hdhIH_iciLEp1SCGDynMI,2983
 folio_migration_tools/holdings_helper.py,sha256=yJpz6aJrKRBiJ1MtT5bs2vXAc88uJuGh2_KDuCySOKc,7559
 folio_migration_tools/i18n_config.py,sha256=3AH_2b9zTsxE4XTe4isM_zYtPJSlK0ix6eBmV7kAYUM,228
 folio_migration_tools/library_configuration.py,sha256=LzICsZQdOkXwIqdDfh59x0-Cx77Lb18qVnWroNqekS8,7046
@@ -43,7 +43,7 @@ folio_migration_tools/migration_tasks/courses_migrator.py,sha256=CzXnsu-KGP7B4zc
 folio_migration_tools/migration_tasks/holdings_csv_transformer.py,sha256=kMhtHE8DJjA4d6kXBcfflueha3R3nwlBQjdec8CaY8c,21926
 folio_migration_tools/migration_tasks/holdings_marc_transformer.py,sha256=c_ruhOgidyJdSnnRwWUs3wwFMiLqbVMPOhhCaYuH_TI,14343
 folio_migration_tools/migration_tasks/items_transformer.py,sha256=oTbFX2saF7-ZCb1mO3baLvODnBSEbbN5F_GtSth3iG4,19755
-folio_migration_tools/migration_tasks/loans_migrator.py,sha256=9DQf58CZpgTM1m_miZTzsfVOGBWLsHrSFalQBO7g9DE,39406
+folio_migration_tools/migration_tasks/loans_migrator.py,sha256=PF8DNpGKsppSDr7wX96Ao13UTFu6dl9cz2URLqSsOzE,40052
 folio_migration_tools/migration_tasks/manual_fee_fines_transformer.py,sha256=CnmlTge7nChUJ10EiUkriQtJlVxWqglgfhjgneh2_yM,7247
 folio_migration_tools/migration_tasks/migration_task_base.py,sha256=Q-57h6rmt74bC9LidA9ZoagEcwVd_ytq8IUWelVOm2E,22521
 folio_migration_tools/migration_tasks/orders_transformer.py,sha256=6SnzU_rUTu2B5hQykI2nRA7vI1rg-uxuF9Ncupe0AEY,14302
@@ -55,13 +55,13 @@ folio_migration_tools/task_configuration.py,sha256=73OWc8TX--fwPRptv3eQVEVv0-XmN
 folio_migration_tools/test_infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 folio_migration_tools/test_infrastructure/mocked_classes.py,sha256=BurU3NGU_Q8as_BGmW98q9O6bujZDkOfFmvKKdVw9t8,15056
 folio_migration_tools/transaction_migration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-folio_migration_tools/transaction_migration/legacy_loan.py,sha256=2GHqHDVShdZuoUlW2yvePcsesJZ5-Huq3leD71tNtaE,6618
+folio_migration_tools/transaction_migration/legacy_loan.py,sha256=sLw2fCBao1VWZykOx-BWpMndLHjJNj-HJZFYqbpVV5A,7561
 folio_migration_tools/transaction_migration/legacy_request.py,sha256=1ulyFzPQw_InOjyPzkWpGnNptgXdQ18nmri0J8Nlpkc,6124
 folio_migration_tools/transaction_migration/legacy_reserve.py,sha256=qzw0okg4axAE_ezXopP9gFsQ_e60o0zh7zqRzFBSWHY,1806
 folio_migration_tools/transaction_migration/transaction_result.py,sha256=cTdCN0BnlI9_ZJB2Z3Fdkl9gpymIi-9mGZsRFlQcmDk,656
 folio_migration_tools/translations/en.json,sha256=6IpYYNFCtQoXACndPM0d1Oa25GYuaF-G-b4YpzTjQH0,41656
-folio_migration_tools-1.9.4.dist-info/LICENSE,sha256=PhIEkitVi3ejgq56tt6sWoJIG_zmv82cjjd_aYPPGdI,1072
-folio_migration_tools-1.9.4.dist-info/METADATA,sha256=L36bpdFWAhsV2r8FBIjpZ-1N4Vl0u4EMV0f7g5ObNgg,7494
-folio_migration_tools-1.9.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-folio_migration_tools-1.9.4.dist-info/entry_points.txt,sha256=Hbe-HjqMcU8FwVshVIkeWyZd9XwgT1CCMNf06EpHQu8,77
-folio_migration_tools-1.9.4.dist-info/RECORD,,
+folio_migration_tools-1.9.5.dist-info/LICENSE,sha256=PhIEkitVi3ejgq56tt6sWoJIG_zmv82cjjd_aYPPGdI,1072
+folio_migration_tools-1.9.5.dist-info/METADATA,sha256=nkA-xhhnIR5-fawBRyzv7cLMqEycu7IqM00H5QqQpKs,7494
+folio_migration_tools-1.9.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+folio_migration_tools-1.9.5.dist-info/entry_points.txt,sha256=Hbe-HjqMcU8FwVshVIkeWyZd9XwgT1CCMNf06EpHQu8,77
+folio_migration_tools-1.9.5.dist-info/RECORD,,