contact-person-profile-csv-imp-local 0.0.38__tar.gz → 0.0.40__tar.gz

{contact_person_profile_csv_imp_local-0.0.38 → contact_person_profile_csv_imp_local-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: contact-person-profile-csv-imp-local
-Version: 0.0.38
+Version: 0.0.40
 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.38 → contact_person_profile_csv_imp_local-0.0.40}/contact_person_profile_csv_imp_local/src/CSVToContactPersonProfile.py

@@ -173,10 +173,11 @@ 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, system_id: int = None,
+            # TODO username -> user_external_username
+            self, *, username: str, email_address: str, data_source_type_id: int, file_name: str = None, 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,
-            groups_dicts: list[dict] = None, profile_id: int = None) -> dict:
+            groups_dicts: list[dict] = None) -> dict:
         """
         Insert contacts from CSV file to the database
         :param data_source_type_id: The data source id
@@ -193,13 +194,15 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         :return: 
         """
         data_source_type_name = DataSources().get_data_source_name_by_id(data_source_type_id)
-        profile_id_by_email_address = ProfilesLocal().select_one_value_by_column_and_value(
+        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_address",
-            column_value=user_external_username)
+            column_value=email_address)
+        if profile_id is None:
+            self.logger.error("Couldn't find profile_id in profile_view by email_address.")
+            raise Exception("Couldn't find profile_id in profile_view by email_address.")
         system_id = system_id or CONTACT_PERSON_PROFILE_CSV_SYSTEM_ID
         self.set_schema(schema_name="field")
-        profile_id = profile_id or profile_id_by_email_address
         self.groups_list = groups_dicts if groups_dicts else []
         '''
         profile_id = ProfilesLocal().select_one_value_by_column_and_value(
@@ -229,13 +232,13 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             '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_username,
+        user_external_id = self.__get_user_external_id(user_external_username=username,
                                                        profile_id=profile_id, system_id=system_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,
             user_external_id=user_external_id, file_name=file_name,
-            user_external_username=user_external_username,
+            user_external_username=username,
             start_index=start_index, end_index=end_index
         )
         fields_dictonary = self.data_sources.get_fields_name_from_csv(data_source_type_id)
@@ -509,8 +512,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     def __insert_link_contact_groups(self, contact_dict: dict) -> list:
         contact_id = contact_dict.get("contact_id")
-        groups = []
-        groups_linked = None
+        groups_dicts_list = []
+        linked_groups_results_list = []
         organization = contact_dict.get("organization")
         if organization:
             organization_group_dict = {
@@ -523,7 +526,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 "is_main_title": False,
                 "title": organization,
             }
-            groups.append(organization_group_dict)
+            groups_dicts_list.append(organization_group_dict)
         job_title = contact_dict.get("job_title")
         if job_title:
             job_title_group_dict = {
@@ -536,27 +539,30 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 "is_main_title": False,
                 "title": job_title,
             }
-            groups.append(job_title_group_dict)
+            groups_dicts_list.append(job_title_group_dict)
         if contact_dict.get("groups"):
+            # TODO _contacts_groups_names_list?
             _groups = contact_dict.get("groups").split(", ")
             for group in _groups:
                 group_dict = {
                     # table:
-                    "name": group,
+                    "name": group, # TODO We need to translate to English
                     "hashtag": '#' + group.upper(),
                     "main_group_type_id": self.unknown_main_group_type_id,
                     # ml table:
+                    # TODO What about the lang_code?
                     "is_main_title": False,
                     "title": group,
                 }
-                groups.append(group_dict)
+                groups_dicts_list.append(group_dict)
         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_list_of_dicts=groups)
+            groups_dicts_list.append(group)
+        if len(groups_dicts_list) > 0:
+            linked_groups_results_list = self.contact_groups.insert_link_contact_group_with_group_local(
+                contact_id=contact_id, groups_list_of_dicts=groups_dicts_list)
+        contact_dict["linked_group_results_list"] = linked_groups_results_list
 
-        return groups_linked
+        return linked_groups_results_list
 
     def __insert_link_contact_persons(self, contact_dict: dict) -> dict:
         if not contact_dict.get("first_name") and not contact_dict.get("last_name"):
@@ -793,6 +799,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 proccessed_location_dicts.append(current_location_dict)
         for email_address in email_addresses_list:
             country = Country.get_country_name_by_email_address(email_address)
+            if country is None:
+                continue
             current_location_dict = {
                 "address_local_language": None,
                 "city": None,
@@ -862,6 +870,16 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             user_external_id = self.user_externals_local.select_one_value_by_column_and_value(
                 select_clause_value="user_external_id", column_name="username",
                 column_value=user_external_username, order_by="user_external_id DESC")
+            if user_external_id is None:
+                self.logger.error("Couldn't find user_external_id in user_external by username.")
+                raise Exception("Couldn't find user_external_id in user_external by username.")
+            # TODO: Why do we have profile_user_external schema? user_external_table already has profile_id
+            profile_user_external_data_dict = {"profile_id": profile_id, "user_external_id": user_external_id}
+            profile_user_external_id = self.insert_if_not_exists(
+                schema_name="profile_user_external", table_name="profile_user_external_table",
+                view_table_name="profile_user_external_view", data_dict=profile_user_external_data_dict,
+                data_dict_compare=profile_user_external_data_dict
+            )
 
         return user_external_id
 

{contact_person_profile_csv_imp_local-0.0.38 → contact_person_profile_csv_imp_local-0.0.40}/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.38
+Version: 0.0.40
 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.38 → contact_person_profile_csv_imp_local-0.0.40}/setup.py

@@ -5,7 +5,7 @@ package_dir = PACKAGE_NAME.replace("-", "_")
 
 setuptools.setup(
     name=PACKAGE_NAME,
-    version='0.0.38',  # https://pypi.org/project/contact-person-profile-csv-imp-local/
+    version='0.0.40',  # 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",