folio-data-import 0.2.7__tar.gz → 0.2.8rc2__tar.gz

{folio_data_import-0.2.7 → folio_data_import-0.2.8rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: folio_data_import
-Version: 0.2.7
+Version: 0.2.8rc2
 Summary: A python module to interact with the data importing capabilities of the open-source FOLIO ILS
 License: MIT
 Author: Brooks Travis

{folio_data_import-0.2.7 → folio_data_import-0.2.8rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "folio_data_import"
-version = "0.2.7"
+version = "0.2.8rc2"
 description = "A python module to interact with the data importing capabilities of the open-source FOLIO ILS"
 authors = ["Brooks Travis <brooks.travis@gmail.com>"]
 license = "MIT"

{folio_data_import-0.2.7 → folio_data_import-0.2.8rc2}/src/folio_data_import/UserImport.py

@@ -5,6 +5,7 @@ import getpass
 import json
 import os
 import time
+import uuid
 from datetime import datetime as dt
 from pathlib import Path
 from typing import Tuple
@@ -94,6 +95,23 @@ class UserImporter:  # noqa: R0902
         """
         return {x[name]: x["id"] for x in folio_client.folio_get_all(endpoint, key)}
 
+    @staticmethod
+    def validate_uuid(uuid_string: str) -> bool:
+        """
+        Validate a UUID string.
+
+        Args:
+            uuid_string (str): The UUID string to validate.
+
+        Returns:
+            bool: True if the UUID is valid, otherwise False.
+        """
+        try:
+            uuid.UUID(uuid_string)
+            return True
+        except ValueError:
+            return False
+
     async def do_import(self) -> None:
         """
         Main method to import users.
@@ -203,10 +221,20 @@ class UserImporter:  # noqa: R0902
             mapped_addresses = []
             for address in addresses:
                 try:
-                    address["addressTypeId"] = self.address_type_map[
-                        address["addressTypeId"]
-                    ]
-                    mapped_addresses.append(address)
+                    if (
+                        self.validate_uuid(address["addressTypeId"])
+                        and address["addressTypeId"] in self.address_type_map.values()
+                    ):
+                        await self.logfile.write(
+                            f"Row {line_number}: Address type {address['addressTypeId']} is a UUID, "
+                            f"skipping mapping\n"
+                        )
+                        mapped_addresses.append(address)
+                    else:
+                        address["addressTypeId"] = self.address_type_map[
+                            address["addressTypeId"]
+                        ]
+                        mapped_addresses.append(address)
                 except KeyError:
                     if address["addressTypeId"] not in self.address_type_map.values():
                         print(
@@ -232,7 +260,16 @@ class UserImporter:  # noqa: R0902
             None
         """
         try:
-            user_obj["patronGroup"] = self.patron_group_map[user_obj["patronGroup"]]
+            if (
+                self.validate_uuid(user_obj["patronGroup"])
+                and user_obj["patronGroup"] in self.patron_group_map.values()
+            ):
+                await self.logfile.write(
+                    f"Row {line_number}: Patron group {user_obj['patronGroup']} is a UUID, "
+                    f"skipping mapping\n"
+                )
+            else:
+                user_obj["patronGroup"] = self.patron_group_map[user_obj["patronGroup"]]
         except KeyError:
             if user_obj["patronGroup"] not in self.patron_group_map.values():
                 print(
@@ -259,7 +296,16 @@ class UserImporter:  # noqa: R0902
         mapped_departments = []
         for department in user_obj.pop("departments", []):
             try:
-                mapped_departments.append(self.department_map[department])
+                if (
+                    self.validate_uuid(department)
+                    and department in self.department_map.values()
+                ):
+                    await self.logfile.write(
+                        f"Row {line_number}: Department {department} is a UUID, skipping mapping\n"
+                    )
+                    mapped_departments.append(department)
+                else:
+                    mapped_departments.append(self.department_map[department])
             except KeyError:
                 print(
                     f'Row {line_number}: Department "{department}" not found, '  # noqa: B907
@@ -493,7 +539,7 @@ class UserImporter:  # noqa: R0902
                    and the existing PU object (existing_pu).
         """
         rp_obj = user_obj.pop("requestPreference", {})
-        spu_obj = user_obj.pop("servicePointsUser")
+        spu_obj = user_obj.pop("servicePointsUser", {})
         existing_user = await self.get_existing_user(user_obj)
         if existing_user:
             existing_rp = await self.get_existing_rp(user_obj, existing_user)
@@ -677,7 +723,13 @@ class UserImporter:  # noqa: R0902
             mapped_service_points = []
             for sp in spu_obj.pop("servicePointsIds", []):
                 try:
-                    mapped_service_points.append(self.service_point_map[sp])
+                    if self.validate_uuid(sp) and sp in self.service_point_map.values():
+                        await self.logfile.write(
+                            f"Service point {sp} is a UUID, skipping mapping\n"
+                        )
+                        mapped_service_points.append(sp)
+                    else:
+                        mapped_service_points.append(self.service_point_map[sp])
                 except KeyError:
                     print(
                         f'Service point "{sp}" not found, excluding service point from user: '
@@ -688,7 +740,13 @@ class UserImporter:  # noqa: R0902
         if "defaultServicePointId" in spu_obj:
             sp_code = spu_obj.pop('defaultServicePointId', '')
             try:
-                mapped_sp_id = self.service_point_map[sp_code]
+                if self.validate_uuid(sp_code) and sp_code in self.service_point_map.values():
+                    await self.logfile.write(
+                        f"Default service point {sp_code} is a UUID, skipping mapping\n"
+                    )
+                    mapped_sp_id = sp_code
+                else:
+                    mapped_sp_id = self.service_point_map[sp_code]
                 if mapped_sp_id not in spu_obj.get('servicePointsIds', []):
                     print(
                         f'Default service point "{sp_code}" not found in assigned service points, '
@@ -711,7 +769,7 @@ class UserImporter:  # noqa: R0902
             existing_spu (dict): The existing service-points-user object, if it exists.
             existing_user (dict): The existing user object associated with the spu_obj.
         """
-        if spu_obj is not None:
+        if spu_obj:
             await self.map_service_points(spu_obj, existing_user)
             if existing_spu:
                 await self.update_existing_spu(spu_obj, existing_spu)