contact-person-profile-csv-imp-local 0.0.31__tar.gz → 0.0.32__tar.gz

{contact_person_profile_csv_imp_local-0.0.31 → contact_person_profile_csv_imp_local-0.0.32}/PKG-INFO

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

@@ -46,6 +46,8 @@ CONTACT_PERSON_PROFILE_CSV_SYSTEM_ID = 1
 DEFAULT_LOCATION_ID = LocationLocalConstants.UNKNOWN_LOCATION_ID
 DEFAULT_PROFILE_ID = 0
 
+RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_ID = 60
+
 
 # Those methods should be called from the common method for this repo (contact-person-profile-csv-imp-local-python-package and google-contact-sync ...)
 
@@ -105,6 +107,7 @@ DEFAULT_PROFILE_ID = 0
 
 class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                                 object=CSVToContactPersonProfileConstants.CSV_LOCAL_PYTHON_PACKAGE_CODE_LOGGER_OBJECT):
+    # TODO Shall we have the groups_str parameter in the constructor or when running the each import so we can use different groups_str for every import
     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",
@@ -165,7 +168,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             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,
-            groups_str: str = None, profile_id: int = None) -> dict:
+            groups_dicts: dict = None, profile_id: int = None) -> dict:
         """
         Insert contacts from CSV file to the database
         :param data_source_type_id: The data source ID
@@ -177,14 +180,13 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         :param end_index: The end index
         :return: 
         """
-        '''
+
         profile_id_by_email_address = 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)
-        '''
-        profile_id = profile_id or self.user_context.get_effective_profile_id()
-        self.groups_list = [group.strip() for group in groups_str.split(",")] if groups_str else []
+        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(
             schema_name="profile", view_table_name="profile_view",
@@ -208,7 +210,7 @@ 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', 'added_timestamp',
+            'hashtag', 'url', 'groups', 'added_timestamp', 'comment',
             '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')
@@ -307,6 +309,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 contact_dict["source"] = "Import"
                 contact_dict["owner_profile_id"] = profile_id
                 contact_dict["system_id"] = system_id
+                contact_dict = CSVToContactPersonProfile.fix_contact_dict_by_data_source_type(
+                    contact_dict=contact_dict, data_source_type_id=data_source_type_id)
                 contact_id = self.contacts_local.upsert_contact_dict(contact_dict=contact_dict)
                 contact_dict["contact_id"] = contact_id
                 if contact_id:
@@ -323,7 +327,6 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     # TODO def insert_update_contact_groups_from_contact_notes( contact_notes: str) -> int:
     # TODO Add contact_group with seq, attribute, is_sure using group-local-python-package
-
     # TODO def process_people_url( people_url ) -> str:
     # TODO Use regex to extract the data from the URL
     # TODO add to user_external using user-external-python-package
@@ -494,19 +497,47 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         contact_id = contact_dict.get("contact_id")
         groups = []
         groups_linked = None
-        if contact_dict.get("organization"):
-            groups.append(contact_dict.get("organization"))
-        if contact_dict.get("job_title"):
-            groups.append(contact_dict.get("job_title"))
+        organization = contact_dict.get("organization")
+        if organization:
+            organization_group_dict = {
+                "name": organization,
+                "hashtag": '#' + organization.upper(),
+                "is_organization": 1,
+                "main_group_type_id": 2000,     # TODO: Shall we get it from db or from constant?
+                # ml table
+                "is_main_title": False,
+                "title": organization,
+            }
+            groups.append(organization_group_dict)
+        job_title = contact_dict.get("job_title")
+        if job_title:
+            job_title_group_dict = {
+                "name": job_title,
+                "hashtag": '#' + job_title.upper(),
+                "is_job_title": 1,
+                "main_group_type_id": 3001,     # TODO: Shall we get it from db or from constant?
+                # ml table
+                "is_main_title": False,
+                "title": job_title,
+            }
+            groups.append(job_title_group_dict)
         if contact_dict.get("groups"):
             _groups = contact_dict.get("groups").split(", ")
             for group in _groups:
-                groups.append(group)
+                group_dict = {
+                    "name": group,
+                    "hashtag": '#' + group.upper(),
+                    "main_group_type_id": 0,     # TODO: Shall we get it from db or from constant?
+                    # ml table
+                    "is_main_title": False,
+                    "title:": group,
+                }
+                groups.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_names=groups)
+                contact_id=contact_id, groups_dicts=groups)
 
         return groups_linked
 
@@ -631,6 +662,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         # TODO Please change all Magic Numbers to data generated by Sql2Code
         elif data_source_type_id == 57: # BGU Course csv
             url = None
+        elif data_source_type_id == RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_ID:
+            url = None
         else:
             raise ValueError("data_source_type_id is not valid")
         importer_id = self.importers_local.insert(
@@ -706,7 +739,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 self.logger.error("Error while getting country name by phone number",
                                   object=exception)
                 continue
-            currect_location_dict = {
+            current_location_dict = {
                 "address_local_language": None,
                 "city": None,
                 "postal_code": None,
@@ -717,10 +750,16 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 "state": LocationLocalConstants.DEFAULT_STATE_NAME,
                 "region": LocationLocalConstants.DEFAULT_REGION_NAME,
             }
-            proccessed_location_dicts.append(currect_location_dict)
+            # Before adding the location to the list, check if it's country is not already in the list
+            for location_dict in proccessed_location_dicts:
+                if location_dict.get("country") == current_location_dict.get("country"):
+                    current_location_dict = None
+                    break
+            if current_location_dict:
+                proccessed_location_dicts.append(current_location_dict)
         for email_address in email_addresses_list:
             country = Country.get_country_name_by_email_address(email_address)
-            currect_location_dict = {
+            current_location_dict = {
                 "address_local_language": None,
                 "city": None,
                 "postal_code": None,
@@ -731,7 +770,13 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 "state": LocationLocalConstants.DEFAULT_STATE_NAME,
                 "region": LocationLocalConstants.DEFAULT_REGION_NAME,
             }
-            proccessed_location_dicts.append(currect_location_dict)
+            # Before adding the location to the list, check if it's country is not already in the list
+            for location_dict in proccessed_location_dicts:
+                if location_dict.get("country") == current_location_dict.get("country"):
+                    current_location_dict = None
+                    break
+            if current_location_dict:
+                proccessed_location_dicts.append(current_location_dict)
 
         return proccessed_location_dicts
 
@@ -813,9 +858,19 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
     @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:
+        if data_source_type_id in [16, 17, 18]:
             return "utf-8"
         else:
             with open(file_path, 'rb') as f:
                 result = chardet.detect(f.read())
             return result['encoding']
+
+    @staticmethod
+    def fix_contact_dict_by_data_source_type(contact_dict: dict, data_source_type_id: int) -> dict:
+        if data_source_type_id == RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_ID:
+            if contact_dict.get('phone1'):
+                cellphone_number = contact_dict.get('phone1')
+                if cellphone_number.startswith('0'):
+                    cellphone_number = '+972 ' + cellphone_number
+                contact_dict['phone1'] = cellphone_number
+        return contact_dict

{contact_person_profile_csv_imp_local-0.0.31 → contact_person_profile_csv_imp_local-0.0.32}/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.31
+Version: 0.0.32
 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.31 → contact_person_profile_csv_imp_local-0.0.32}/setup.py

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