contact-person-profile-csv-imp-local 0.0.20__py3-none-any.whl → 0.0.21__py3-none-any.whl

contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py

@@ -19,6 +19,7 @@ from database_mysql_local.generic_crud import GenericCRUD
 from contact_user_external_local.contact_user_external_local import ContactUserExternalLocal
 from contact_profile_local.contact_profiles_local import ContactProfilesLocal
 from contact_phone_local.contact_phone_local import ContactPhoneLocal
+from phones_local.phones_local import PhonesLocal
 from contact_persons_local.contact_persons_local import ContactPersonsLocal
 from contact_notes_local.contact_notes_local import ContactNotesLocal
 from contact_location_local.contact_location_local import ContactLocationLocal
@@ -341,6 +342,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     def __insert_contact_details_to_db(self, *, contact_id: int, contact_dict: dict, user_external_id: int,
                                        data_source_instance_id: int, data_source_type_id: int) -> int:
+
+        location_id = DEFAULT_LOCATION_ID
         # insert organization
         organization_id = self.__insert_organization(contact_dict=contact_dict)
 
@@ -363,9 +366,9 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         # insert link contact_profiles
         contact_profile_info = self.__insert_contact_profiles(
-            contact_dict=contact_dict, contact_id=contact_id) or {}
+            contact_dict=contact_dict, contact_id=contact_id, person_id=person_id) or {}
 
-        profile_id = contact_profile_info.get("profile_id") or DEFAULT_PROFILE_ID
+        profile_id = contact_profile_info.get("profile_id")
 
         # insert organization-profile
         self.__insert_organization_profile(
@@ -373,7 +376,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         # insert link contact_email_addresses
         self.__insert_link_contact_email_addresses(
-            contact_dict=contact_dict, contact_id=contact_id)
+            contact_dict=contact_dict, contact_id=contact_id, person_id=person_id, profile_id=profile_id)
 
         # insert link contact_notes
         self.__insert_link_contact_notes_and_text_blocks(
@@ -448,7 +451,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
     def __insert_organization_profile(self, organization_id: int, profile_id: int) -> int or None:
 
         if not organization_id or not profile_id:
-            return
+            return None
 
         organization_profile_id = self.organization_profiles.insert_mapping_if_not_exists(
             organization_id=organization_id, profile_id=profile_id)
@@ -470,19 +473,25 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         return groups_linked
 
     def __insert_link_contact_persons(self, contact_dict: dict, contact_id: int) -> dict:
+        phones_local = PhonesLocal(is_test_data=self.is_test_data)
+        contact_phone_number = contact_dict.get("phone1")
+        if contact_phone_number:
+            result_dict = phones_local.normalize_phone_number(original_number=contact_phone_number, region=None)
+            if result_dict:
+                contact_normalized_phone_number = result_dict.get("full_number_normalized")
+        else:
+            contact_normalized_phone_number = None
         contact_person_results_dict = self.contact_persons.insert_contact_and_link_to_existing_or_new_person(
             contact_dict=contact_dict,
             contact_email_address=contact_dict["email1"],
-            contact_id=contact_id,
-            contact_normalized_phone_number=contact_dict.get("phone1"),
-            # TODO: what about phone2 etc?
+            contact_normalized_phone_number=contact_normalized_phone_number,
+            contact_id=contact_id
         )
-        # contact_person_id = contact_person_results_dict.get("contact_person_id")
 
         return contact_person_results_dict
 
-    def __insert_link_contact_email_addresses(self, contact_dict, contact_id) -> list[int]:
-
+    def __insert_link_contact_email_addresses(self, contact_dict: dict, contact_id: int, person_id: int = None,
+                                              profile_id: int = None) -> list[int]:
         email_addresses = self.contacts_local.get_contact_email_addresses_from_contact_dict(
             contact_dict=contact_dict)
         contact_email_addresses = self.contact_email_addresses
@@ -491,7 +500,9 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             contact_email_address_id = contact_email_addresses.insert_contact_and_link_to_email_address(
                 contact_dict=contact_dict,
                 contact_email_address_str=email_address,
-                contact_id=contact_id
+                contact_id=contact_id,
+                person_id=person_id,
+                profile_id=profile_id
             )
             contact_email_address_ids.append(contact_email_address_id)
 
@@ -503,6 +514,9 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         if not contact_dict.get("notes"):
             return
         # TODO: I think we should change ContactNotesLocal - send the args to the method and not the class
+        if profile_id is None:
+            # TODO: check if this method works with profile_id = None
+            profile_id = DEFAULT_PROFILE_ID
         contact_notes = ContactNotesLocal(
             contact_dict=contact_dict, contact_id=contact_id, profile_id=profile_id)
         insert_information = contact_notes.insert_contact_notes_text_block()
@@ -511,7 +525,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     def __insert_link_contact_phones(self, contact_dict: dict, contact_id: int, profile_id: int, person_id: int,
                                      location_id: int, country_id: int) -> list[int]:
-
+        if location_id == DEFAULT_LOCATION_ID:
+            location_id = None
         phone_numbers = self.contacts_local.get_contact_phone_numbers_from_contact_dict(
             contact_dict=contact_dict)
         contact_phone_ids = []
@@ -540,10 +555,13 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return contact_user_external_id
 
-    def __insert_contact_profiles(self, contact_dict: dict, contact_id: int) -> dict:
+    def __insert_contact_profiles(self, contact_dict: dict, contact_id: int, person_id: int = None) -> dict:
 
         insert_information = self.contact_profiles.insert_and_link_contact_profile(
-            contact_dict=contact_dict, contact_id=contact_id)
+            contact_dict=contact_dict,
+            contact_id=contact_id,
+            person_id=person_id
+        )
 
         return insert_information
 

{contact_person_profile_csv_imp_local-0.0.20.dist-info → contact_person_profile_csv_imp_local-0.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: contact-person-profile-csv-imp-local
-Version: 0.0.20
+Version: 0.0.21
 Summary: PyPI Package for Circles CSVToContactPersonProfile-local Local/Remote Python
 Home-page: https://github.com/circles-zone/contact-person-profile-csv-imp-local-python-package
 Author: Circles

{contact_person_profile_csv_imp_local-0.0.20.dist-info → contact_person_profile_csv_imp_local-0.0.21.dist-info}/RECORD

@@ -1,7 +1,7 @@
-contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py,sha256=hZqF8C-Av_uj-ztIZAaHAN7vmyXb20-Ht2uF5H6ZJ6U,40471
+contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py,sha256=ClFAP6ntBayUJuH-k4dgJkrml8-Wy55E4mJc3a0YHeg,41424
 contact_person_profile_csv_imp_local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 contact_person_profile_csv_imp_local/contact_person_profile_csv_imp_local_constants.py,sha256=eE0Bg2dCPrmG72K20k0_KOckc61C9cGSgH0Zgae_lbk,957
-contact_person_profile_csv_imp_local-0.0.20.dist-info/METADATA,sha256=nmVSB0kelHtnhD2JAAkHJKoqwpiguiV3ZbCfSMQPgz4,1450
-contact_person_profile_csv_imp_local-0.0.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-contact_person_profile_csv_imp_local-0.0.20.dist-info/top_level.txt,sha256=at6BnVzULDB109KZx9Cl9ClCHU4c0ykfV38WX-QR71U,37
-contact_person_profile_csv_imp_local-0.0.20.dist-info/RECORD,,
+contact_person_profile_csv_imp_local-0.0.21.dist-info/METADATA,sha256=2yl92Bd2snQzELayCR4qIbBIMPypqqU4PvZy5EBXAUM,1450
+contact_person_profile_csv_imp_local-0.0.21.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+contact_person_profile_csv_imp_local-0.0.21.dist-info/top_level.txt,sha256=at6BnVzULDB109KZx9Cl9ClCHU4c0ykfV38WX-QR71U,37
+contact_person_profile_csv_imp_local-0.0.21.dist-info/RECORD,,