folio-migration-tools 1.9.0rc6__tar.gz → 1.9.0rc7__tar.gz

{folio_migration_tools-1.9.0rc6 → folio_migration_tools-1.9.0rc7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: folio_migration_tools
-Version: 1.9.0rc6
+Version: 1.9.0rc7
 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.0rc6 → folio_migration_tools-1.9.0rc7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "folio_migration_tools"
-version = "1.9.0rc6"
+version = "1.9.0rc7"
 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.0rc6 → folio_migration_tools-1.9.0rc7}/src/folio_migration_tools/custom_exceptions.py

@@ -5,12 +5,12 @@ import i18n
 from folio_migration_tools import StrCoercible
 
 
-class TransfomationError(Exception):
+class TransformationError(Exception):
     pass
 
 
-class TransformationFieldMappingError(TransfomationError):
-    """Raised when the a field mapping fails, but the error is not critical.
+class TransformationFieldMappingError(TransformationError):
+    """Raised when the field mapping fails, but the error is not critical.
     The issue should be logged for the library to act upon it"""
 
     def __init__(self, index_or_id="", message="", data_value: Union[str, StrCoercible]=""):
@@ -35,8 +35,8 @@ class TransformationFieldMappingError(TransfomationError):
         )
 
 
-class TransformationRecordFailedError(TransfomationError):
-    """Raised when the a field mapping fails, Error is critical and means tranformation fails"""
+class TransformationRecordFailedError(TransformationError):
+    """Raised when the field mapping fails, Error is critical and means transformation fails"""
 
     def __init__(self, index_or_id, message="", data_value=""):
         self.index_or_id = index_or_id
@@ -61,8 +61,8 @@ class TransformationRecordFailedError(TransfomationError):
         )
 
 
-class TransformationProcessError(TransfomationError):
-    """Raised when the transformation fails due to incorrect configuraiton,
+class TransformationProcessError(TransformationError):
+    """Raised when the transformation fails due to incorrect configuration,
     mapping or reference data. This error should take the process to a halt."""
 
     def __init__(

{folio_migration_tools-1.9.0rc6 → folio_migration_tools-1.9.0rc7}/src/folio_migration_tools/mapping_file_transformation/item_mapper.py

@@ -75,9 +75,7 @@ class ItemMapper(MappingFileMapperBase):
                 self.folio_client,
                 "/locations",
                 "locations",
-                self.validate_location_map(
-                    temporary_location_mapping, self.folio_client.locations
-                ),
+                temporary_location_mapping,
                 "code",
                 "TemporaryLocationMapping",
             )
@@ -118,7 +116,7 @@ class ItemMapper(MappingFileMapperBase):
             self.folio_client,
             "/locations",
             "locations",
-            self.validate_location_map(location_map, self.folio_client.locations),
+            location_map,
             "code",
             "LocationMapping",
         )

{folio_migration_tools-1.9.0rc6 → folio_migration_tools-1.9.0rc7}/src/folio_migration_tools/mapping_file_transformation/mapping_file_mapper_base.py

@@ -755,12 +755,8 @@ class MappingFileMapperBase(MapperBase):
             for k in data
             if k["folio_field"] == folio_prop_name
             and any(
-                [
-                    is_set_or_bool_or_numeric(k.get("value", "")),
-                    is_set_or_bool_or_numeric(k.get("legacy_field", "")),
-                    is_set_or_bool_or_numeric(k.get("fallback_legacy_field", "")),
-                    is_set_or_bool_or_numeric(k.get("fallback_value", "")),
-                ]
+                is_set_or_bool_or_numeric(k.get(key, ""))
+                for key in ("value", "legacy_field", "fallback_legacy_field", "fallback_value")
             )
         )
 
@@ -972,4 +968,4 @@ def in_deep(dictionary, keys):
 
 
 def is_set_or_bool_or_numeric(any_value):
-    return any(isinstance(any_value, t) for t in [int, bool, float, complex]) or any_value.strip()
+    return (isinstance(any_value, str) and (any_value.strip() not in empty_vals)) or isinstance(any_value, (int, float, complex))

{folio_migration_tools-1.9.0rc6 → folio_migration_tools-1.9.0rc7}/src/folio_migration_tools/marc_rules_transformation/conditions.py

@@ -818,7 +818,7 @@ class Conditions:
         """
         This method handles the mapping of electronic access relationship IDs.
         If the record type being mapped is FOLIO holdings, it provides an (optional) alternative
-        mapping baseed on a provided name parameter, bypassing the FOLIO MARC-to-Holdings mapping
+        mapping based on a provided name parameter, bypassing the FOLIO MARC-to-Holdings mapping
         engine behavior. This requires use of a supplemental mapping rules file in the
         HoldingsMarcTransformer task definition containing the name parameter.
         """

{folio_migration_tools-1.9.0rc6 → folio_migration_tools-1.9.0rc7}/src/folio_migration_tools/marc_rules_transformation/rules_mapper_holdings.py

@@ -61,7 +61,10 @@ class RulesMapperHoldings(RulesMapperBase):
         self.boundwith_relationship_map = self.setup_boundwith_relationship_map(
             boundwith_relationship_map
         )
-        self.location_map = location_map
+        self.location_map = self.validate_location_map(
+            location_map,
+            self.folio_client.locations,
+        )
         self.holdings_id_map: dict = {}
         self.ref_data_dicts: dict = {}
         self.fallback_holdings_type_id = self.task_configuration.fallback_holdings_type_id

{folio_migration_tools-1.9.0rc6 → folio_migration_tools-1.9.0rc7}/src/folio_migration_tools/transaction_migration/legacy_loan.py

@@ -3,9 +3,10 @@ from datetime import datetime
 from zoneinfo import ZoneInfo
 
 from dateutil import tz
-from dateutil.parser import parse
+from dateutil.parser import parse, ParserError
 
 from folio_migration_tools.migration_report import MigrationReport
+from folio_migration_tools.custom_exceptions import TransformationProcessError
 
 utc = ZoneInfo("UTC")
 
@@ -42,46 +43,47 @@ class LegacyLoan(object):
 
         self.tenant_timezone = tenant_timezone
         self.errors = []
+        self.row = row
         for prop in correct_headers:
             if prop not in legacy_loan_dict and prop not in optional_headers:
-                self.errors.append(("Missing properties in legacy data", prop))
+                self.errors.append((f"Missing properties in legacy data {row=}", prop))
             if (
                 prop != "next_item_status"
                 and not legacy_loan_dict.get(prop, "").strip()
                 and prop not in optional_headers
             ):
-                self.errors.append(("Empty properties in legacy data", prop))
+                self.errors.append((f"Empty properties in legacy data {row=}", prop))
         try:
             temp_date_due: datetime = parse(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(
-                    f"Provided due_date is not UTC, "
-                    f"setting tzinfo to tenant timezone ({self.tenant_timezone})"
+                    f"Provided due_date is not UTC in {row=}, "
+                    f"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(
-                    "Hour and minute not specified for due date. "
+                    f"Hour and minute not specified for due date in {row=}. "
                     "Assuming end of local calendar day (23:59)..."
                 )
-        except Exception as ee:
+        except (ParserError, OverflowError) as ee:
             logging.error(ee)
-            self.errors.append(("Parse date failure. Setting UTC NOW", "due_date"))
+            self.errors.append((f"Parse date failure in {row=}. Setting UTC NOW", "due_date"))
             temp_date_due = datetime.now(ZoneInfo("UTC"))
         try:
             temp_date_out: datetime = parse(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(
-                    f"Provided out_date is not UTC, "
-                    f"setting tzinfo to tenant timezone ({self.tenant_timezone})"
+                    f"Provided out_date is not UTC in {row=}, "
+                    f"setting tz-info to tenant timezone ({self.tenant_timezone})"
                 )
-        except Exception:
+        except (ParserError, OverflowError):
             temp_date_out = datetime.now(
                 ZoneInfo("UTC")
             )  # TODO: Consider moving this assignment block above the temp_date_due
-            self.errors.append(("Parse date failure. Setting UTC NOW", "out_date"))
+            self.errors.append((f"Parse date failure in {row=}. Setting UTC NOW", "out_date"))
 
         # good to go, set properties
         self.item_barcode: str = legacy_loan_dict["item_barcode"].strip()
@@ -94,7 +96,7 @@ class LegacyLoan(object):
         self.renewal_count = self.set_renewal_count(legacy_loan_dict)
         self.next_item_status = legacy_loan_dict.get("next_item_status", "").strip()
         if self.next_item_status not in legal_statuses:
-            self.errors.append(("Not an allowed status", self.next_item_status))
+            self.errors.append((f"Not an allowed status {row=}", self.next_item_status))
         self.service_point_id = (
             legacy_loan_dict["service_point_id"]
             if legacy_loan_dict.get("service_point_id", "")
@@ -107,23 +109,19 @@ class LegacyLoan(object):
             try:
                 return int(renewal_count)
             except ValueError:
-                self.report(
-                    f"Unresolvable {renewal_count=} was replaced with 0.")
+                self.report(f"Unresolvable {renewal_count=} was replaced with 0.")
         else:
             self.report(f"Missing renewal count was replaced with 0.")
         return 0
 
     def correct_for_1_day_loans(self):
-        try:
-            if self.due_date.date() <= self.out_date.date():
-                if self.due_date.hour == 0:
-                    self.due_date = self.due_date.replace(hour=23, minute=59)
-                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 ValueError("Due date is before out date")
-        except Exception:
-            self.errors.append(("Time alignment issues", "both dates"))
+        if self.due_date.date() <= self.out_date.date():
+            if self.due_date.hour == 0:
+                self.due_date = self.due_date.replace(hour=23, minute=59)
+            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, "Due date is before out date")
 
     def to_dict(self):
         return {
@@ -140,8 +138,8 @@ class LegacyLoan(object):
             if self.tenant_timezone != ZoneInfo("UTC"):
                 self.due_date = self.due_date.astimezone(ZoneInfo("UTC"))
                 self.out_date = self.out_date.astimezone(ZoneInfo("UTC"))
-        except Exception:
-            self.errors.append(("UTC correction issues", "both dates"))
+        except TypeError:
+            self.errors.append((f"UTC correction issues {self.row}", "both dates"))
 
     def report(self, what_to_report: str):
         self.migration_report.add("Details", what_to_report)