contact-person-profile-csv-imp-local 0.0.33__tar.gz → 0.0.35__tar.gz

{contact_person_profile_csv_imp_local-0.0.33 → contact_person_profile_csv_imp_local-0.0.35}/PKG-INFO

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

@@ -46,8 +46,6 @@ 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 ...)
 
@@ -132,6 +130,16 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         self.importers_local = ImportersLocal()
         self.data_sources = DataSources()
         self.groups_list = None
+        self.unknown_main_group_type_id = self.select_one_value_by_column_and_value(
+            schema_name='group', view_table_name='group_type_ml_view',
+            select_clause_value='group_type_id', column_name='title', column_value='Unknown')
+        self.organization_main_group_type_id = self.select_one_value_by_column_and_value(
+            schema_name='group', view_table_name='group_type_ml_view',
+            select_clause_value='group_type_id', column_name='title', column_value='Organization')
+        self.job_title_main_group_type_id = self.select_one_value_by_column_and_value(
+            schema_name='group', view_table_name='group_type_ml_view',
+            select_clause_value='group_type_id', column_name='title', column_value='Job Title')
+        
 
     # # TODO Does this function should be here on in https://github.com/circles-zone/variable-local-python-package/tree/dev/variable_local_python_package/variable_local/src "field/field.py"?
     # def __get_field_name(self, field_id: int, data_source_type_id: int) -> str:
@@ -165,26 +173,36 @@ 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,
+            self, *, data_source_type_name: str, file_name: str = None, user_external_username: str, system_name: str = 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: dict = None, profile_id: int = None) -> dict:
+            groups_dicts: list[dict] = None, profile_id: int = None) -> dict:
         """
         Insert contacts from CSV file to the database
-        :param data_source_type_id: The data source ID
+        :param data_source_type_name: The data source name
         :param file_name: The CSV file name
         :param user_external_username: The user external username
+        :param system_name: The system name
+        :param user_external_username: The user external username
+        :param groups_dicts: The groups list
+        :param profile_id: The profile ID
         :param directory_name: The CSV file directory name if it wasn't given it will search for the file in the same directory
         :param csv_path: The CSV file path if it wasn't given it will search for the file in the same directory
         :param start_index: The start index
         :param end_index: The end index
         :return: 
         """
-
+        data_source_type_id = DataSources().get_data_source_type_id_by_name(data_source_type_name)
         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)
+        system_id = CONTACT_PERSON_PROFILE_CSV_SYSTEM_ID
+        if system_name:
+            system_id = self.select_one_value_by_column_and_value(
+                schema_name="system", view_table_name="system_ml_view",
+                select_clause_value="system_id", column_name="title", column_value=system_name)
+        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 []
         '''
@@ -202,7 +220,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             csv_file_path = csv_path
         else:
             script_dir = os.path.dirname(os.path.abspath(__file__))
-            csv_file_path = os.path.join(script_dir, '..', 'tests', directory_name or '', file_name)
+            csv_file_path = os.path.join(script_dir, '..', directory_name or '', file_name)
         if not os.path.exists(csv_file_path):
             raise FileNotFoundError(f"File {csv_file_path} not found")
 
@@ -215,7 +233,8 @@ 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, profile_id=profile_id)
+        user_external_id = self.__get_user_external_id(user_external_username=user_external_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,
@@ -288,8 +307,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 # contact_dict['last_name'] = process_last_name(
                 #     original_last_name=contact_dict['last_name'])
 
-                # TODO This should be executed also by Google Contact Sync (please make sure it is in people-local-python-package
-                #   i.e. get_display_name(first_name, last_name, organization) -> str
+                # TODO This should be executed also by Google Contact Sync (please make sure it is in
+                #  people-local-python-package i.e. get_display_name(first_name, last_name, organization) -> str
                 if contact_dict.get('display_as') is None:
                     contact_dict['display_as'] = contact_dict.get(
                         'first_name') or ""  # prevent None
@@ -306,11 +325,11 @@ 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["source"] = data_source_type_name
                 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_dict=contact_dict)
                 contact_id = self.contacts_local.upsert_contact_dict(contact_dict=contact_dict)
                 contact_dict["contact_id"] = contact_id
                 if contact_id:
@@ -432,7 +451,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             contact_id=contact_dict.get("contact_id"), location_id=contact_dict.get("location_id") or DEFAULT_LOCATION_ID,
             user_external_id=user_external_id,
             data_source_instance_id=data_source_instance_id,
-            data_source_type_id=data_source_type_id
+            data_source_type_id=data_source_type_id,
+            data_source_type_name=contact_dict.get("source")
         )
         return importer_id
 
@@ -500,11 +520,12 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         organization = contact_dict.get("organization")
         if organization:
             organization_group_dict = {
+                # table:
                 "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
+                "main_group_type_id": self.organization_main_group_type_id,
+                # ml table:
                 "is_main_title": False,
                 "title": organization,
             }
@@ -512,11 +533,12 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         job_title = contact_dict.get("job_title")
         if job_title:
             job_title_group_dict = {
+                # table:
                 "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
+                "main_group_type_id": self.job_title_main_group_type_id,
+                # ml table:
                 "is_main_title": False,
                 "title": job_title,
             }
@@ -525,10 +547,11 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             _groups = contact_dict.get("groups").split(", ")
             for group in _groups:
                 group_dict = {
+                    # table:
                     "name": group,
                     "hashtag": '#' + group.upper(),
-                    "main_group_type_id": 0,     # TODO: Shall we get it from db or from constant?
-                    # ml table
+                    "main_group_type_id": self.unknown_main_group_type_id,
+                    # ml table:
                     "is_main_title": False,
                     "title:": group,
                 }
@@ -605,6 +628,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             contact_dict=contact_dict,
             contact_email_address=contact_dict["email1"],
             contact_id=contact_id,
+            system_id=contact_dict.get("system_id"),
             user_external_dict={"username": contact_dict["email1"]}
         )
 
@@ -651,18 +675,19 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     # 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:
+                          data_source_type_id: int, data_source_instance_id: int,
+                          data_source_type_name: str) -> int:
         # TODO: Shall we consider the url of csv's as the following? Use Sql2Code. Use const enum
-        if data_source_type_id == 16:
+        if data_source_type_name == CSVToContactPersonProfileConstants.GOOGLE_CSV_DATA_SOURCE_TYPE_NAME:
             url = "www.google.com"
-        elif data_source_type_id == 17:
+        elif data_source_type_name == CSVToContactPersonProfileConstants.OUTLOOK_CSV_DATA_SOURCE_TYPE_NAME:
             url = "www.outlook.com"
-        elif data_source_type_id == 18:
+        elif data_source_type_name == CSVToContactPersonProfileConstants.LINKEDIN_CSV_DATA_SOURCE_TYPE_NAME:
             url = "www.linkedin.com"
         # TODO Please change all Magic Numbers to data generated by Sql2Code
-        elif data_source_type_id == 57: # BGU Course csv
+        elif data_source_type_name == CSVToContactPersonProfileConstants.BGU_COURSE_CSV_DATA_SOURCE_TYPE_NAME:
             url = None
-        elif data_source_type_id == RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_ID:
+        elif data_source_type_name == CSVToContactPersonProfileConstants.RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_NAME:
             url = None
         else:
             raise ValueError("data_source_type_id is not valid")
@@ -813,7 +838,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, profile_id: int) -> int or None:
+    def __get_user_external_id(self, user_external_username: str, profile_id: int, system_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",
@@ -822,7 +847,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             self.user_externals_local.insert_or_update_user_external_access_token(
                 username=user_external_username,
                 profile_id=profile_id,
-                system_id=CONTACT_PERSON_PROFILE_CSV_SYSTEM_ID,
+                system_id=system_id,
                 access_token=""
             )
             user_external_id = self.user_externals_local.select_one_value_by_column_and_value(
@@ -866,11 +891,11 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             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:
+    def fix_contact_dict_by_data_source_type(contact_dict: dict) -> dict:
+        if contact_dict.get('source') == CSVToContactPersonProfileConstants.RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_NAME:
             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
+        return contact_dict

{contact_person_profile_csv_imp_local-0.0.33 → contact_person_profile_csv_imp_local-0.0.35}/contact_person_profile_csv_imp_local/src/contact_person_profile_csv_imp_local_constants.py

@@ -19,3 +19,9 @@ class CSVToContactPersonProfileConstants:
         'testing_framework': LoggerComponentEnum.testingFramework.pytest.value,
         'developer_email': DEVELOPER_EMAIL
     }
+
+    GOOGLE_CSV_DATA_SOURCE_TYPE_NAME = 'Google Contact CSV File'
+    LINKEDIN_CSV_DATA_SOURCE_TYPE_NAME = 'Linkedin Contact CSV File'
+    OUTLOOK_CSV_DATA_SOURCE_TYPE_NAME = 'Outlook Contact CSV File'
+    BGU_COURSE_CSV_DATA_SOURCE_TYPE_NAME = 'BGU Course CSV File'
+    RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_NAME = 'Rishon Muni Exhibitor CSV File'

{contact_person_profile_csv_imp_local-0.0.33 → contact_person_profile_csv_imp_local-0.0.35}/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.33
+Version: 0.0.35
 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.33 → contact_person_profile_csv_imp_local-0.0.35}/setup.py

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