contact-person-profile-csv-imp-local 0.0.20__tar.gz → 0.0.22__tar.gz

{contact_person_profile_csv_imp_local-0.0.20 → contact_person_profile_csv_imp_local-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: contact-person-profile-csv-imp-local
-Version: 0.0.20
+Version: 0.0.22
 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 → contact_person_profile_csv_imp_local-0.0.22}/contact_person_profile_csv_imp_local/src/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(
@@ -395,7 +398,6 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         importer_id = self.__insert_importer(
             contact_id=contact_id, location_id=location_id,
             user_external_id=user_external_id,
-            google_people_api_resource_name=contact_dict.get("resource_name"),
             data_source_instance_id=data_source_instance_id,
             data_source_type_id=data_source_type_id
         )
@@ -448,7 +450,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 +472,28 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         return groups_linked
 
     def __insert_link_contact_persons(self, contact_dict: dict, contact_id: int) -> dict:
+        if not contact_dict.get("first_name") and not contact_dict.get("last_name"):
+            return {}
+        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 +502,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,20 +516,24 @@ 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()
+        insert_information = contact_notes.insert_contact_notes_text_block() or {}
         contact_note_id = insert_information.get("contact_note_id")
         return contact_note_id
 
     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 = []
         for phone_number in phone_numbers:
-            contact_phone_id = self.contact_phone.insert_contact_and_link_to_existing_or_new_phone(
+            process_phone_result_dict = self.contact_phone.insert_contact_and_link_to_existing_or_new_phone(
                 contact_dict=contact_dict,
                 phone_number=phone_number,
                 contact_id=contact_id,
@@ -525,7 +542,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 location_id=location_id,
                 country_id=country_id
             )
-            contact_phone_ids.append(contact_phone_id.get("contact_phone_id"))
+            contact_phone_ids.append(process_phone_result_dict.get("contact_phone_id"))
 
         return contact_phone_ids
 
@@ -540,10 +557,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
 
@@ -573,8 +593,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         return location_results
 
     def __insert_importer(self, contact_id: int, location_id: int, user_external_id: int,
-                          google_people_api_resource_name: str, data_source_type_id: int,
-                          data_source_instance_id: int) -> int:
+                          data_source_type_id: int, data_source_instance_id: int) -> int:
         # TODO: Shall we consider the url of csv's as the following? Use Sql2Code. Use const enum
         if data_source_type_id == 16:
             url = "www.google.com"
@@ -591,7 +610,6 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             entity_type_id=self.contact_entity_type_id,
             entity_id=contact_id, url=url,
             user_external_id=user_external_id,
-            google_people_api_resource_name=google_people_api_resource_name
         )
 
         return importer_id
@@ -738,7 +756,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                                       file_name: str,
                                       user_external_username: str, start_index: int, end_index: int) -> int:
         name = datetime.now(ZoneInfo("UTC")).strftime("%y%m%d %H%M%S") + " " + \
-               user_external_username + " 'Google Contact- Google Contact CSV'"
+            user_external_username + " 'Google Contact- Google Contact CSV'"
         # TODO: move to data_source
         data_source_instance_id = super().insert(
             schema_name="data_source_instance",

{contact_person_profile_csv_imp_local-0.0.20 → contact_person_profile_csv_imp_local-0.0.22}/contact_person_profile_csv_imp_local.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: contact-person-profile-csv-imp-local
-Version: 0.0.20
+Version: 0.0.22
 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 → contact_person_profile_csv_imp_local-0.0.22}/setup.py

@@ -5,7 +5,7 @@ package_dir = PACKAGE_NAME.replace("-", "_")
 
 setuptools.setup(
     name=PACKAGE_NAME,
-    version='0.0.20',  # https://pypi.org/project/contact-person-profile-csv-imp-local/
+    version='0.0.22',  # https://pypi.org/project/contact-person-profile-csv-imp-local/
     author="Circles",
     author_email="info@circles.ai",
     description="PyPI Package for Circles CSVToContactPersonProfile-local Local/Remote Python",