Fixes Loans process will not launch if any loans have due date before checkout date #928

Author: bltravis

src/folio_migration_tools/migration_tasks/loans_migrator.py

@@ -17,6 +17,7 @@
 from art import tprint
 
 from folio_migration_tools.circulation_helper import CirculationHelper
+from folio_migration_tools.custom_exceptions import TransformationRecordFailedError
 from folio_migration_tools.helper import Helper
 from folio_migration_tools.library_configuration import (
     FileDefinition,
@@ -302,7 +303,7 @@ def set_renewal_count(self, legacy_loan: LegacyLoan, res_checkout: TransactionRe
 
     def wrap_up(self):
         for k, v in self.failed.items():
-            self.failed_and_not_dupe[k] = [v.to_dict()]
+            self.failed_and_not_dupe[k] = [v if type(v) is dict else v.to_dict()]
         print(f"Wrapping up. Unique loans in failed:{len(self.failed_and_not_dupe)}")
 
         self.write_failed_loans_to_file()
@@ -404,6 +405,19 @@ def load_and_validate_legacy_loans(self, loans_reader, service_point_id: str) ->
                     ] = legacy_loan
                 else:
                     results.append(legacy_loan)
+            except TransformationRecordFailedError as trfe:
+                num_bad += 1
+                self.migration_report.add_general_statistics(
+                    i18n.t("Loans failed pre-validation")
+                )
+                self.migration_report.add(
+                    "DiscardedLoans",
+                    f"{trfe.message} - see data issues log",
+                )
+                trfe.log_it()
+                self.failed[
+                    legacy_loan_dict.get("item_barcode", f"no_barcode_{legacy_loan_count}")
+                ] = legacy_loan_dict
             except ValueError as ve:
                 logging.exception(ve)
         logging.info(

src/folio_migration_tools/transaction_migration/legacy_loan.py

@@ -8,7 +8,7 @@
 from dateutil.parser import parse, ParserError
 
 from folio_migration_tools.migration_report import MigrationReport
-from folio_migration_tools.custom_exceptions import TransformationProcessError
+from folio_migration_tools.custom_exceptions import TransformationRecordFailedError
 
 utc = ZoneInfo("UTC")
 
@@ -124,7 +124,13 @@ def correct_for_1_day_loans(self):
             if self.out_date.hour == 0:
                 self.out_date = self.out_date.replace(hour=0, minute=1)
         if self.due_date <= self.out_date:
-            raise TransformationProcessError(self.row, i18n.t("Due date is before out date, or date information is missing from both"), json.dumps(self.legacy_loan_dict, indent=2))
+            raise TransformationRecordFailedError(
+                self.row,
+                i18n.t(
+                    "Due date is before out date, or date information is missing from both"
+                ),
+                json.dumps(self.legacy_loan_dict, indent=2)
+            )
 
     def to_dict(self):
         return {

tests/test_legacy_loan.py

@@ -4,7 +4,7 @@
 
 from folio_migration_tools.migration_report import MigrationReport
 from folio_migration_tools.transaction_migration.legacy_loan import LegacyLoan
-from folio_migration_tools.custom_exceptions import TransformationProcessError
+from folio_migration_tools.custom_exceptions import TransformationProcessError, TransformationRecordFailedError
 
 
 def test_init():
@@ -272,10 +272,10 @@ def test_correct_for_1_day_loans_due_date_is_before_out_date() -> None:
     tenant_timezone = ZoneInfo("UTC")
     migration_report = MigrationReport()
     expected_err_message = (
-        "Critical Process issue. Check configuration, mapping files and reference data\t"
+        "Critical data issue. Record needs fixing\t"
         f"0\tDue date is before out date, or date information is missing from both\t{json.dumps(loan_dict, indent=2)}"
     )
-    with pytest.raises(TransformationProcessError, match=expected_err_message):
+    with pytest.raises(TransformationRecordFailedError, match=expected_err_message):
         LegacyLoan(loan_dict, "", migration_report, tenant_timezone)
 
 def test_correct_for_1_day_loans_no_out_or_due_date_info() -> None:
@@ -290,8 +290,8 @@ def test_correct_for_1_day_loans_no_out_or_due_date_info() -> None:
     tenant_timezone = ZoneInfo("UTC")
     migration_report = MigrationReport()
     expected_err_message = (
-        "Critical Process issue. Check configuration, mapping files and reference data\t"
+        "Critical data issue. Record needs fixing\t"
         f"0\tDue date is before out date, or date information is missing from both\t{json.dumps(loan_dict, indent=2)}"
     )
-    with pytest.raises(TransformationProcessError, match=expected_err_message):
+    with pytest.raises(TransformationRecordFailedError, match=expected_err_message):
         LegacyLoan(loan_dict, "", migration_report, tenant_timezone)