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

contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py

@@ -19,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
@@ -160,7 +161,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
     # 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:
         """
@@ -174,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
@@ -191,12 +195,12 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         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,
@@ -205,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)
@@ -245,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')):
@@ -284,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:
@@ -747,7 +755,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         # 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",
@@ -755,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=""
             )

{contact_person_profile_csv_imp_local-0.0.29.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.29
+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.29.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=5Z7Ry0pXftYx5t2c5M-SamiFLdtfHvd7mA9Mf6s11Xg,43690
+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.29.dist-info/METADATA,sha256=QjTN4mavxPgwRaXO8td-zu5qudljl67ZukaNjmKZqZE,1481
-contact_person_profile_csv_imp_local-0.0.29.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-contact_person_profile_csv_imp_local-0.0.29.dist-info/top_level.txt,sha256=at6BnVzULDB109KZx9Cl9ClCHU4c0ykfV38WX-QR71U,37
-contact_person_profile_csv_imp_local-0.0.29.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,,