contact-person-profile-csv-imp-local 0.0.28__py3-none-any.whl → 0.0.30__py3-none-any.whl

contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py

@@ -1,3 +1,4 @@
+# TODO Please rename the file based on our naming convention i.e. contact_person
 import csv
 import os
 from datetime import datetime
@@ -18,6 +19,7 @@ from importer_local.ImportersLocal import ImportersLocal
 from database_mysql_local.point import Point
 from database_mysql_local.generic_crud import GenericCRUD
 from contact_user_external_local.contact_user_external_local import ContactUserExternalLocal
+from profile_local.profiles_local import ProfilesLocal
 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
@@ -103,13 +105,14 @@ DEFAULT_PROFILE_ID = 0
 
 class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                                 object=CSVToContactPersonProfileConstants.CSV_LOCAL_PYTHON_PACKAGE_CODE_LOGGER_OBJECT):
-    def __init__(self, is_test_data: bool = False) -> None:
+    def __init__(self, groups_str: str = None, is_test_data: bool = False) -> None:
         GenericCRUD.__init__(self, default_schema_name="field", default_column_name="field_id",
                              default_table_name="field_table", default_view_table_name="field_view",
                              is_test_data=is_test_data)
         self.contact_entity_type_id = self.select_one_value_by_column_and_value(
             schema_name="entity_type", view_table_name="entity_type_ml_en_view",
             select_clause_value="entity_type_id", column_name="title", column_value="Contact")
+        self.groups_list: list[str] = [group.strip() for group in groups_str.split(",")] if groups_str else []
         self.user_context = UserContext()
         self.organization_profiles = OrganizationProfilesLocal(is_test_data=is_test_data)
         self.contact_persons = ContactPersonsLocal(is_test_data=is_test_data)
@@ -155,8 +158,10 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
     # ans: it cannot be after directory_name and csv_path because it is a required parameter
 
     # TODO: break this function into smaller functions
+    # TODO Align the parameters between import-contact-csv with sync-google-contact
+    # TODO Can we please add groups_str parameter to both sync-google-contact and import-contact-csv where we add all contacts to those groups?
     def insert_update_contact_from_csv(
-            self, *, data_source_type_id: int, file_name: str = None, user_external_username: str,
+            self, *, data_source_type_id: int, file_name: str = None, user_external_username: str, system_id: int = None,
             # TODO Add support to criteria_set_id
             directory_name: str = None, csv_path: str = None, start_index: int = 0, end_index: int = None) -> dict:
         """
@@ -170,7 +175,10 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         :param end_index: The end index
         :return: 
         """
-
+        profile_id = ProfilesLocal().select_one_value_by_column_and_value(
+            schema_name="profile", view_table_name="profile_view",
+            select_clause_value="profile_id", column_name="profile_main_email",
+            column_value=user_external_username)
         # TODO Please explain
         # if csv_path is provided then we will use the full path
         # if csv_path is not provided then we will use the directory_name and file_name to create the full path
@@ -183,15 +191,16 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         if not os.path.exists(csv_file_path):
             raise FileNotFoundError(f"File {csv_file_path} not found")
 
+        # TODO Why do we need it? - Those fields will be added to the contact_dict
         contact_fields_to_keep = (
             'name_prefix', 'additional_name', 'name_suffix', 'nickname', 'full_name', 'title', 'department', 'notes',
             'first_name', 'last_name', 'phone1', 'phone2', 'phone3', 'birthday', 'email1', 'email2', 'email3',
-            'hashtag', 'url', 'groups',
+            'hashtag', 'url', 'groups', 'added_timestamp',
             'website1', 'handle', 'address1_street', 'address1_city', 'address1_state', 'address1_postal_code',
             'address1_country', 'address2_street', 'address2_city', 'address2_state', 'address2_postal_code',
             'address2_country', 'job_title', 'organization', 'display_as')
 
-        user_external_id = self.__get_user_external_id(user_external_username)
+        user_external_id = self.__get_user_external_id(user_external_username=user_external_username, profile_id=profile_id)
         # We create a new data_source_instance_id everytime we import a new csv file
         data_source_instance_id = self.__get_data_source_instance_id(
             data_source_type_id=data_source_type_id, csv_file_path=csv_file_path,
@@ -200,6 +209,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             start_index=start_index, end_index=end_index
         )
         fields_dictonary = self.data_sources.get_fields_name_from_csv(data_source_type_id)
+        self.logger.info(f"fields_dictonary: {fields_dictonary}")
         keys = list(fields_dictonary.keys())
         contact_data_by_contact_id_dict = {}
         encoding = CSVToContactPersonProfile.detect_encoding(file_path=csv_file_path, data_source_type_id=data_source_type_id)
@@ -240,6 +250,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
                 contact_dict = {key: contact_dict.get(
                     key) or None for key in contact_fields_to_keep}
+                self.logger.info(f"contact_dict: {contact_dict}")
                 if (not contact_dict.get('first_name')
                         and not contact_dict.get('last_name')
                         and not contact_dict.get('organization')):
@@ -279,8 +290,10 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
                 # TODO We should take care of situation which the contact already exists and we need to update it
                 contact_dict["data_source_instance_id"] = data_source_instance_id
+                contact_dict["data_source_type_id"] = data_source_type_id
                 contact_dict["source"] = "Import"
-                contact_dict["owner_profile_id"] = self.user_context.get_effective_profile_id()
+                contact_dict["owner_profile_id"] = profile_id
+                contact_dict["system_id"] = system_id
                 contact_id = self.contacts_local.upsert_contact_dict(contact_dict=contact_dict)
                 contact_dict["contact_id"] = contact_id
                 if contact_id:
@@ -302,6 +315,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
     # TODO Use regex to extract the data from the URL
     # TODO add to user_external using user-external-python-package
 
+    # TODO This looks like a generic method, please move it to url-remote-python-package
     @staticmethod
     def process_url(original_url: str) -> str:
         prefixes = ['http://', 'https://']  # noqa
@@ -316,6 +330,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     # TODO: add a method to add notes to text_block process them to retrieve the groups and create and link the groups to the user
 
+    # TODO Please change ALL methods which are not public to become private
     def process_notes(self, contact_note: str) -> None:
         # TODO number_of_system_recommednded_groups_identified_in_contact_notes = get_system_recommended_groups_from_contact_notes( contact_notes: str)
 
@@ -333,6 +348,10 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         pass
 
+
+    # TODO Please move this method if not exists to LocationsLocal
+    # TODO get_location_type_id_by_location_name(
+    # This method is being used by import-csv-contact
     def get_location_type_id_by_name(self, location_type_name: str) -> int or None:
         """
         Get the location type ID by its name
@@ -344,6 +363,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             select_clause_value="location_type_id", column_name="title", column_value=location_type_name)
         return location_type_id
 
+    # TODO Move this method to ContactsLocal class in contact-local
+    # This method is being used by import-csv-contact
     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:
 
@@ -352,7 +373,10 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         # insert link contact_location
         # The location is in contact_dict
+        # TODO Can we have a better name for locations_results? Maybe contact_locations?
         location_results = self.__insert_link_contact_location(contact_dict=contact_dict) or [{}]
+        # TODO Why do we process only [0]? What if there are multiple locations?
+        # TODO If we don't suppose multiple locations, maybe we should change it to contact_dict["main_location_id"] as we do in other places 
         contact_dict["location_id"] = location_results[0].get("location_id")
         contact_dict["country_id"] = location_results[0].get("country_id")
 
@@ -396,6 +420,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         )
         return importer_id
 
+    # TODO Move this method to LocationsLocal
+    # This method is being used by import-csv-contact
     def __insert_organization(self, contact_dict: dict) -> int or None:
 
         if not contact_dict.get("organization"):
@@ -440,6 +466,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return organization_dict
 
+    # TODO When do we use it? Multiple profiles to one organization?
     def __insert_organization_profile(self, organization_id: int, profiles_ids_list: list[int]) -> list[int] or None:
 
         if not organization_id or not profiles_ids_list:
@@ -462,6 +489,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             _groups = contact_dict.get("groups").split(", ")
             for group in _groups:
                 groups.append(group)
+        for group in self.groups_list:
+            groups.append(group)
         if len(groups) > 0:
             groups_linked = self.contact_groups.insert_link_contact_group_with_group_local(
                 contact_id=contact_id, groups_names=groups)
@@ -568,12 +597,15 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         location_dicts = self.__procces_location_of_contact(contact_dict)
         if not location_dicts:
             return
-        location_results = [self.contact_location.insert_contact_and_link_to_location(
-            location_dict=location_dict, contact_id=contact_id)
-            for location_dict in location_dicts]
-
-        return location_results
-
+        locations_results = []
+        for location_dict in location_dicts:
+            location_results = self.contact_location.insert_contact_and_link_to_location(
+                location_dict=location_dict, contact_id=contact_id)
+            if location_results:
+                locations_results.append(location_results)
+        return locations_results
+
+    # TODO merge this method with the method in google-contact-sync
     def __insert_importer(self, contact_id: int, location_id: int, user_external_id: 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
@@ -583,7 +615,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             url = "www.outlook.com"
         elif data_source_type_id == 18:
             url = "www.linkedin.com"
-        elif data_source_type_id == 57:
+        # TODO Please change all Magic Numbers to data generated by Sql2Code
+        elif data_source_type_id == 57: # BGU Course csv
             url = None
         else:
             raise ValueError("data_source_type_id is not valid")
@@ -598,6 +631,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return importer_id
 
+    # TODO Move this method to ContactsLocal if not exists already
     def __procces_location_of_contact(self, contact_dict: dict) -> dict or None:
         """
         Process location of Google contact
@@ -689,6 +723,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         return proccessed_location_dicts
 
     @staticmethod
+    # TODO Move this method to LocationsLocal if not exists already
     def __create_location_dict(*, address_street: str, address_city: str, address_postal_code: str,
                                address_country: str, address_state: str) -> dict:
         location_dict = {
@@ -706,19 +741,21 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         return location_dict
 
     @staticmethod
+    # Move this method to ContactsLocal if not exists already
     def __get_phone_numbers_list(contact_dict: dict) -> list:
         phones_list = [contact_dict.get(f"phone{i}")
                        for i in range(1, 4) if contact_dict.get(f"phone{i}")]
         return phones_list
 
     @staticmethod
+    # Move this method to ContactsLocal if not exists already
     def __get_email_addresses_list(contact_dict: dict) -> list:
         emails_list = [contact_dict.get(f"email{i}")
                        for i in range(1, 4) if contact_dict.get(f"email{i}")]
         # TODO use enum const for "email1" ....
         return emails_list
 
-    def __get_user_external_id(self, user_external_username: str) -> int or None:
+    def __get_user_external_id(self, user_external_username: str, profile_id: int) -> int or None:
 
         user_external_id = self.user_externals_local.select_one_value_by_column_and_value(
             select_clause_value="user_external_id", column_name="username",
@@ -726,7 +763,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         if user_external_id is None:
             self.user_externals_local.insert_or_update_user_external_access_token(
                 username=user_external_username,
-                profile_id=self.user_context.get_effective_profile_id(),
+                profile_id=profile_id,
                 system_id=CONTACT_PERSON_PROFILE_CSV_SYSTEM_ID,
                 access_token=""
             )
@@ -736,6 +773,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return user_external_id
 
+    # Move this method to DataSourceInstancesLocal in data-source-instance-local-python-package 
     def __get_data_source_instance_id(self, data_source_type_id: int, csv_file_path: str, user_external_id: int,
                                       file_name: str,
                                       user_external_username: str, start_index: int, end_index: int) -> int:
@@ -760,6 +798,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         return data_source_instance_id
 
     @staticmethod
+    # TODO Move this function to python-sdk
     def detect_encoding(file_path: str, data_source_type_id: int = None):
         if data_source_type_id == 16 or data_source_type_id == 17 or data_source_type_id == 18:
             return "utf-8"

{contact_person_profile_csv_imp_local-0.0.28.dist-info → contact_person_profile_csv_imp_local-0.0.30.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
-contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py,sha256=KlaCY4YDlMu77bZLF7sIXHiYLfiDu7scds_CyS4ugMc,41462
+contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py,sha256=PyxEVut4mNat6KEkWs7N8p8cnvSZR4plprBUi-hws_c,44312
 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.28.dist-info/METADATA,sha256=ZpO8eNNPmyDib3wNYdxIMAcK5faKxhghbPHKYQC3cK8,1481
-contact_person_profile_csv_imp_local-0.0.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-contact_person_profile_csv_imp_local-0.0.28.dist-info/top_level.txt,sha256=at6BnVzULDB109KZx9Cl9ClCHU4c0ykfV38WX-QR71U,37
-contact_person_profile_csv_imp_local-0.0.28.dist-info/RECORD,,
+contact_person_profile_csv_imp_local-0.0.30.dist-info/METADATA,sha256=EEJl_VnhaKYKRdo4v7_Y_tkZYzEVrdcZhIzxaDW47-o,1481
+contact_person_profile_csv_imp_local-0.0.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+contact_person_profile_csv_imp_local-0.0.30.dist-info/top_level.txt,sha256=at6BnVzULDB109KZx9Cl9ClCHU4c0ykfV38WX-QR71U,37
+contact_person_profile_csv_imp_local-0.0.30.dist-info/RECORD,,