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

contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py

@@ -279,9 +279,10 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 contact_dict["data_source_instance_id"] = data_source_instance_id
                 contact_dict["source"] = "Import"
                 contact_id = self.contacts_local.upsert_contact_dict(contact_dict=contact_dict)
+                contact_dict["contact_id"] = contact_id
                 if contact_id:
                     self.__insert_contact_details_to_db(
-                        contact_id=contact_id, contact_dict=contact_dict, user_external_id=user_external_id,
+                        contact_dict=contact_dict, user_external_id=user_external_id,
                         data_source_instance_id=data_source_instance_id,
                         data_source_type_id=data_source_type_id)
                     contact_data_by_contact_id_dict[contact_id] = contact_dict
@@ -340,33 +341,32 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             select_clause_value="location_type_id", column_name="title", column_value=location_type_name)
         return location_type_id
 
-    def __insert_contact_details_to_db(self, *, contact_id: int, contact_dict: dict, user_external_id: int,
+    def __insert_contact_details_to_db(self, *, 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)
 
         # insert link contact_location
         # The location is in contact_dict
         location_results = self.__insert_link_contact_location(
-            contact_dict=contact_dict, contact_id=contact_id) or [{}]
-        location_id = location_results[0].get(
-            "location_id") or DEFAULT_LOCATION_ID
-        country_id = location_results[0].get("country_id")
+            contact_dict=contact_dict) or [{}]
+        contact_dict["location_id"] = location_results[0].get(
+            "location_id")
+        contact_dict["country_id"] = location_results[0].get("country_id")
 
         # insert link contact_group
         self.__insert_link_contact_groups(
-            contact_dict=contact_dict, contact_id=contact_id)
+            contact_dict=contact_dict)
 
         # insert link contact_persons
         contact_person_result_dict = self.__insert_link_contact_persons(
-            contact_dict=contact_dict, contact_id=contact_id) or {}
-        person_id = contact_person_result_dict.get("person_id")
+            contact_dict=contact_dict) or {}
+        contact_dict["person_id"] = contact_person_result_dict.get("person_id")
 
         # insert link contact_profiles
         contact_profile_info = self.__insert_contact_profiles(
-            contact_dict=contact_dict, contact_id=contact_id, person_id=person_id) or {}
+            contact_dict=contact_dict) or {}
 
         profile_id = contact_profile_info.get("profile_id")
 
@@ -376,29 +376,27 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         # insert link contact_email_addresses
         self.__insert_link_contact_email_addresses(
-            contact_dict=contact_dict, contact_id=contact_id, person_id=person_id, profile_id=profile_id)
+            contact_dict=contact_dict, profile_id=profile_id)
 
         # insert link contact_notes
-        self.__insert_link_contact_notes_and_text_blocks(
-            contact_dict=contact_dict, contact_id=contact_id, profile_id=profile_id)
+        CSVToContactPersonProfile.__insert_link_contact_notes_and_text_blocks(
+            contact_dict=contact_dict, profile_id=profile_id)
 
         # insert link contact_phones
         self.__insert_link_contact_phones(
-            contact_dict=contact_dict, contact_id=contact_id, profile_id=profile_id,
-            person_id=person_id, location_id=location_id, country_id=country_id)
+            contact_dict=contact_dict, profile_id=profile_id)
 
         # inset link contact_user_externals
         self.__insert_link_contact_user_external(
-            contact_dict=contact_dict, contact_id=contact_id)
+            contact_dict=contact_dict)
 
         # insert link contact_internet_domains
         self.__insert_link_contact_domains(
-            contact_dict=contact_dict, contact_id=contact_id)
+            contact_dict=contact_dict)
 
         importer_id = self.__insert_importer(
-            contact_id=contact_id, location_id=location_id,
+            contact_id=contact_dict.get("contact_id"), location_id=contact_dict.get("location_id") or DEFAULT_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
         )
@@ -458,8 +456,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return organization_profile_id
 
-    def __insert_link_contact_groups(self, contact_dict: dict, contact_id: int) -> list:
-
+    def __insert_link_contact_groups(self, contact_dict: dict) -> list:
+        contact_id = contact_dict.get("contact_id")
         groups = []
         groups_linked = None
         if contact_dict.get("organization"):
@@ -472,11 +470,14 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return groups_linked
 
-    def __insert_link_contact_persons(self, contact_dict: dict, contact_id: int) -> dict:
+    def __insert_link_contact_persons(self, contact_dict: dict) -> 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)
+            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:
@@ -484,14 +485,12 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         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_normalized_phone_number=contact_normalized_phone_number,
-            contact_id=contact_id
+            contact_normalized_phone_number=contact_normalized_phone_number
         )
 
         return contact_person_results_dict
 
-    def __insert_link_contact_email_addresses(self, contact_dict: dict, contact_id: int, person_id: int = None,
-                                              profile_id: int = None) -> list[int]:
+    def __insert_link_contact_email_addresses(self, contact_dict: dict, 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
@@ -500,8 +499,6 @@ 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,
-                person_id=person_id,
                 profile_id=profile_id
             )
             contact_email_address_ids.append(contact_email_address_id)
@@ -510,7 +507,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     @staticmethod
     def __insert_link_contact_notes_and_text_blocks(
-            *, contact_dict: dict, contact_id: int, profile_id: int) -> int or None:
+            *, contact_dict: dict, profile_id: int) -> int or None:
         if not contact_dict.get("notes"):
             return
         # TODO: I think we should change ContactNotesLocal - send the args to the method and not the class
@@ -518,34 +515,27 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             # 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()
+            contact_dict=contact_dict, profile_id=profile_id)
+        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
+    def __insert_link_contact_phones(self, contact_dict: dict, profile_id: int) -> list[int]:
         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,
-                profile_id=profile_id,
-                person_id=person_id,
-                location_id=location_id,
-                country_id=country_id
+                profile_id=profile_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
 
-    def __insert_link_contact_user_external(self, contact_dict: dict, contact_id: int) -> int:
-
+    def __insert_link_contact_user_external(self, contact_dict: dict) -> int:
+        contact_id = contact_dict.get("contact_id")
         contact_user_external_id = self.contact_user_external.insert_contact_and_link_to_existing_or_new_user_external(
             contact_dict=contact_dict,
             contact_email_address=contact_dict["email1"],
@@ -555,18 +545,15 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return contact_user_external_id
 
-    def __insert_contact_profiles(self, contact_dict: dict, contact_id: int, person_id: int = None) -> dict:
-
+    def __insert_contact_profiles(self, contact_dict: dict) -> dict:
         insert_information = self.contact_profiles.insert_and_link_contact_profile(
-            contact_dict=contact_dict,
-            contact_id=contact_id,
-            person_id=person_id
+            contact_dict=contact_dict
         )
 
         return insert_information
 
-    def __insert_link_contact_domains(self, contact_dict: dict, contact_id: int) -> list[dict]:
-
+    def __insert_link_contact_domains(self, contact_dict: dict) -> list[dict]:
+        contact_id = contact_dict.get("contact_id")
         website_count = 1
         website_url = contact_dict.get("website" + str(website_count))
         domain_insert_information_list = []
@@ -579,8 +566,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return domain_insert_information_list
 
-    def __insert_link_contact_location(self, contact_dict: dict, contact_id: int) -> list[dict] or None:
-
+    def __insert_link_contact_location(self, contact_dict: dict) -> list[dict] or None:
+        contact_id = contact_dict.get("contact_id")
         location_dicts = self.__procces_location_of_contact(contact_dict)
         if not location_dicts:
             return
@@ -591,8 +578,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"
@@ -609,7 +595,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
@@ -756,7 +741,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.21.dist-info → contact_person_profile_csv_imp_local-0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: contact-person-profile-csv-imp-local
-Version: 0.0.21
+Version: 0.0.23
 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.21.dist-info → contact_person_profile_csv_imp_local-0.0.23.dist-info}/RECORD

@@ -1,7 +1,7 @@
-contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py,sha256=ClFAP6ntBayUJuH-k4dgJkrml8-Wy55E4mJc3a0YHeg,41424
+contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py,sha256=Wn_w0H-_aP-E3-bmK8PmewDcxV56DQZYeV-5nfiEUkI,40537
 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.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,,
+contact_person_profile_csv_imp_local-0.0.23.dist-info/METADATA,sha256=LWn0cu8t-BfNwevU9SmcRtMZ5T5sbtiqolz4lNQqNA0,1450
+contact_person_profile_csv_imp_local-0.0.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+contact_person_profile_csv_imp_local-0.0.23.dist-info/top_level.txt,sha256=at6BnVzULDB109KZx9Cl9ClCHU4c0ykfV38WX-QR71U,37
+contact_person_profile_csv_imp_local-0.0.23.dist-info/RECORD,,