folio-migration-tools 1.9.0rc6__py3-none-any.whl → 1.9.0rc7__py3-none-any.whl

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

{folio_migration_tools-1.9.0rc6.dist-info → folio_migration_tools-1.9.0rc7.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ folio_migration_tools/circulation_helper.py,sha256=2kAkLM6caPiep0ZtBkMICbRDh53Kd
 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=fRdMt5AwH_XddZ-bts5ByslN5gYthkLdh7o22JroQeE,2686
+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=yyVvbkM9PbczSHNI8vK0Ru7i0x4nbYGzrRriXrnIh38,6715
 folio_migration_tools/helper.py,sha256=KkOkNAGO_fuYqxdLrsbLzCJLQHUrFZG1NzD4RmpQ-KM,2804
@@ -15,16 +15,16 @@ folio_migration_tools/mapper_base.py,sha256=ftYQJ6UDsP96EvCr5t3yMJemsmSNXsSH5zCh
 folio_migration_tools/mapping_file_transformation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 folio_migration_tools/mapping_file_transformation/courses_mapper.py,sha256=mJQxxeTn1bCYb2zwFYyXJ6EGZpJ0DsmwOY3nED7D_gQ,8091
 folio_migration_tools/mapping_file_transformation/holdings_mapper.py,sha256=nJS-xx1LszvbYfw0qdTUHX9xXHlxS7wP5mYmixFMh8A,7221
-folio_migration_tools/mapping_file_transformation/item_mapper.py,sha256=CkpxQhwn-ZUpZu4nvybAyrQhdRVX2-wtCgT35-8JLh0,11005
+folio_migration_tools/mapping_file_transformation/item_mapper.py,sha256=KiE-y6ZcKAV2XMqrgax3mx3KHB_oRxBfCBSanIBs95E,10853
 folio_migration_tools/mapping_file_transformation/manual_fee_fines_mapper.py,sha256=nCkqbxaDHKxMuqQHh_afxQp48YrVD-SeCZ0L1iGvnkk,13402
-folio_migration_tools/mapping_file_transformation/mapping_file_mapper_base.py,sha256=RacwSOP6r6i28EOywaepq5K5FimD8Ld5MlBo89FYO7c,37963
+folio_migration_tools/mapping_file_transformation/mapping_file_mapper_base.py,sha256=vu-5dw20NbxpDTDNq2zIgbto8KkWMf6ImXj2U0XbHPg,37812
 folio_migration_tools/mapping_file_transformation/notes_mapper.py,sha256=auLQZqa4rSJo_MIV4Lc5-LG8RcBpp2bnKH243qNYq_0,3470
 folio_migration_tools/mapping_file_transformation/order_mapper.py,sha256=k-kIuf2ceXrPWe3oVnfhuQlE7eglcx6PDLVJtddkeiM,17680
 folio_migration_tools/mapping_file_transformation/organization_mapper.py,sha256=0zjw0-C-qTYH9GC6FDBElucWCZWdoOiTHOY7q9_4NQg,14571
 folio_migration_tools/mapping_file_transformation/ref_data_mapping.py,sha256=qFsn_LwKZeKFdOudfEQnNA3DEHOdNQVKzTPdZAlDPX0,8864
 folio_migration_tools/mapping_file_transformation/user_mapper.py,sha256=oWuIPRQL0anF_qTVFibHtc1oOaqyKCBH4O1hX5rQAZQ,7806
 folio_migration_tools/marc_rules_transformation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-folio_migration_tools/marc_rules_transformation/conditions.py,sha256=am_VQ5P8vx-AFbVNBVeu0WkIbIh4cQJBLROxNTj_yUE,39143
+folio_migration_tools/marc_rules_transformation/conditions.py,sha256=ttTZISieqveu3YpvpnawHh3In1_DNQMTziI5yasfmWU,39142
 folio_migration_tools/marc_rules_transformation/holdings_statementsparser.py,sha256=lTb5QWEAgwyFHy5vdSK6oDl1Q5v2GnzuV04xWV3p4rc,12401
 folio_migration_tools/marc_rules_transformation/hrid_handler.py,sha256=Ihdv0_1q7gL_pZ3HWU3GcfV_jjpIfOLithWk9z_uH3Y,9997
 folio_migration_tools/marc_rules_transformation/loc_language_codes.xml,sha256=ztn2_yKws6qySL4oSsZh7sOjxq5bCC1PhAnXJdtgmJ0,382912
@@ -33,7 +33,7 @@ folio_migration_tools/marc_rules_transformation/marc_reader_wrapper.py,sha256=9A
 folio_migration_tools/marc_rules_transformation/rules_mapper_authorities.py,sha256=GFw8j9UtCxnUdLShmPzJa1MpCK8a0NkQIN5C3jyouRs,9604
 folio_migration_tools/marc_rules_transformation/rules_mapper_base.py,sha256=-vJDMNZe-7JbARgybVj6lLtZM79PgWU9V_k23330uLM,41195
 folio_migration_tools/marc_rules_transformation/rules_mapper_bibs.py,sha256=ckVeysbpW9s19pmHvogdRFOCouzz17Y6oKJD0_QfQAk,28924
-folio_migration_tools/marc_rules_transformation/rules_mapper_holdings.py,sha256=gPJaWcvt-CKIJxrEzheRzohnc3mFEnsznuZIXLPhyZM,18954
+folio_migration_tools/marc_rules_transformation/rules_mapper_holdings.py,sha256=p_WIsn-6VphLNVCeDyvTEv-tdYFU5QuV4GhnM4gvwt8,19046
 folio_migration_tools/migration_report.py,sha256=BkRspM1hwTBnWeqsHamf7yVEofzLj560Q-9G--O00hw,4258
 folio_migration_tools/migration_tasks/__init__.py,sha256=ZkbY_yGyB84Ke8OMlYUzyyBj4cxxNrhMTwQlu_GbdDs,211
 folio_migration_tools/migration_tasks/authority_transformer.py,sha256=AoXg9s-GLO3yEEDCrQV7hc4YVXxwxsdxDdpj1zhHydE,4251
@@ -55,13 +55,13 @@ folio_migration_tools/task_configuration.py,sha256=C5-OQtZLH7b4lVeyj5v8OXsqKNN4t
 folio_migration_tools/test_infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 folio_migration_tools/test_infrastructure/mocked_classes.py,sha256=rNes6UlRqIWGwPurfiQK97IvgB5OPwnZTbv1T28jHzk,9150
 folio_migration_tools/transaction_migration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-folio_migration_tools/transaction_migration/legacy_loan.py,sha256=M48ZU45yEL1h93Jbld5qKwF1DEKt6sGYPc-t_JgLYX0,5896
+folio_migration_tools/transaction_migration/legacy_loan.py,sha256=3PDyC1wbJzF0CcNWelvZ0tC8hjl3p5hbLVJHrz78ORM,6006
 folio_migration_tools/transaction_migration/legacy_request.py,sha256=1ulyFzPQw_InOjyPzkWpGnNptgXdQ18nmri0J8Nlpkc,6124
 folio_migration_tools/transaction_migration/legacy_reserve.py,sha256=d0qbh2fWpwlVSYRL6wZyZG20__NAYNxh7sPSsB-LAes,1804
 folio_migration_tools/transaction_migration/transaction_result.py,sha256=cTdCN0BnlI9_ZJB2Z3Fdkl9gpymIi-9mGZsRFlQcmDk,656
 folio_migration_tools/translations/en.json,sha256=HOVpkb_T-SN_x0NpDp8gyvV1hMLCui3SsG7ByyIv0OU,38669
-folio_migration_tools-1.9.0rc6.dist-info/LICENSE,sha256=PhIEkitVi3ejgq56tt6sWoJIG_zmv82cjjd_aYPPGdI,1072
-folio_migration_tools-1.9.0rc6.dist-info/METADATA,sha256=EL9MObYfZSyJ1otUDkUQEL0T2P8yxU5E77qZ4HhKFrk,7415
-folio_migration_tools-1.9.0rc6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-folio_migration_tools-1.9.0rc6.dist-info/entry_points.txt,sha256=Hbe-HjqMcU8FwVshVIkeWyZd9XwgT1CCMNf06EpHQu8,77
-folio_migration_tools-1.9.0rc6.dist-info/RECORD,,
+folio_migration_tools-1.9.0rc7.dist-info/LICENSE,sha256=PhIEkitVi3ejgq56tt6sWoJIG_zmv82cjjd_aYPPGdI,1072
+folio_migration_tools-1.9.0rc7.dist-info/METADATA,sha256=ZBN-JMKfGXNzGGKEgecmOsbOS49pl09CF7KtyfVBhKs,7415
+folio_migration_tools-1.9.0rc7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+folio_migration_tools-1.9.0rc7.dist-info/entry_points.txt,sha256=Hbe-HjqMcU8FwVshVIkeWyZd9XwgT1CCMNf06EpHQu8,77
+folio_migration_tools-1.9.0rc7.dist-info/RECORD,,