contact-person-profile-csv-imp-local 0.0.34__tar.gz → 0.0.36__tar.gz

{contact_person_profile_csv_imp_local-0.0.34 → contact_person_profile_csv_imp_local-0.0.36}/PKG-INFO

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

@@ -46,12 +46,6 @@ CONTACT_PERSON_PROFILE_CSV_SYSTEM_ID = 1
 DEFAULT_LOCATION_ID = LocationLocalConstants.UNKNOWN_LOCATION_ID
 DEFAULT_PROFILE_ID = 0
 
-GOOGLE_CSV_DATA_SOURCE_TYPE_ID = 16
-OUTLOOK_CSV_DATA_SOURCE_TYPE_ID = 17
-LINKEDIN_CSV_DATA_SOURCE_TYPE_ID = 18
-BGU_COURSE_CSV_DATA_SOURCE_TYPE_ID = 57
-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 ...)
 
@@ -136,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:
@@ -172,23 +176,29 @@ 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_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_id: The data source id
         :param file_name: The CSV file name
         :param user_external_username: The user external username
+        :param system_id: The system id
+        :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_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(
             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 = 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 []
         '''
@@ -219,7 +229,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,
@@ -310,12 +321,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
-                source_str = self.get_data_source_type_name_by_data_source_type_id(data_source_type_id) or "CSV Import"
-                contact_dict["source"] = source_str
+                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:
@@ -437,8 +447,7 @@ 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)
         return importer_id
 
     # TODO Move this method to LocationsLocal
@@ -505,11 +514,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,
             }
@@ -517,11 +527,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,
             }
@@ -530,10 +541,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,
                 }
@@ -566,7 +578,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
         return contact_person_results_dict
 
-    # TODO This method is confusing me as based on the name I was expected to to have two parameters contact_dict and email_addresses but we are sending profile_id, please explain or fix
+    # TODO This method is confusing me as based on the name I was expected to to have two parameters
+    # contact_dict and email_addresses but we are sending profile_id, please explain or fix
     def __insert_link_contact_email_addresses(self, contact_dict: dict) -> list[int]:
         email_addresses = self.contacts_local.get_contact_email_addresses_from_contact_dict(
             contact_dict=contact_dict)
@@ -610,6 +623,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"]}
         )
 
@@ -658,16 +672,16 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
     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
-        if data_source_type_id == GOOGLE_CSV_DATA_SOURCE_TYPE_ID:
+        if data_source_type_id == CSVToContactPersonProfileConstants.GOOGLE_CSV_DATA_SOURCE_TYPE_ID:
             url = "www.google.com"
-        elif data_source_type_id == OUTLOOK_CSV_DATA_SOURCE_TYPE_ID:
+        elif data_source_type_id == CSVToContactPersonProfileConstants.OUTLOOK_CSV_DATA_SOURCE_TYPE_ID:
             url = "www.outlook.com"
-        elif data_source_type_id == LINKEDIN_CSV_DATA_SOURCE_TYPE_ID:
+        elif data_source_type_id == CSVToContactPersonProfileConstants.LINKEDIN_CSV_DATA_SOURCE_TYPE_ID:
             url = "www.linkedin.com"
         # TODO Please change all Magic Numbers to data generated by Sql2Code
-        elif data_source_type_id == BGU_COURSE_CSV_DATA_SOURCE_TYPE_ID:
+        elif data_source_type_id == CSVToContactPersonProfileConstants.BGU_COURSE_CSV_DATA_SOURCE_TYPE_ID:
             url = None
-        elif data_source_type_id == RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_ID:
+        elif data_source_type_id == CSVToContactPersonProfileConstants.RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_ID:
             url = None
         else:
             raise ValueError("data_source_type_id is not valid")
@@ -818,7 +832,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",
@@ -827,7 +841,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(
@@ -871,23 +885,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('data_source_type_id') == CSVToContactPersonProfileConstants.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
-
-    def get_data_source_type_name_by_data_source_type_id(self, data_source_type_id: int) -> str:
-        if data_source_type_id == GOOGLE_CSV_DATA_SOURCE_TYPE_ID:
-            return "Google Contact CSV File"
-        elif data_source_type_id == OUTLOOK_CSV_DATA_SOURCE_TYPE_ID:
-            return "Outlook Contact CSV File"
-        elif data_source_type_id == LINKEDIN_CSV_DATA_SOURCE_TYPE_ID:
-            return "Linkedin Contact CSV File"
-        elif data_source_type_id == BGU_COURSE_CSV_DATA_SOURCE_TYPE_ID:
-            return "BGU Course CSV File"
-        elif data_source_type_id == RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_ID:
-            return "Rishon Muni Exhibitor CSV File"

{contact_person_profile_csv_imp_local-0.0.34 → contact_person_profile_csv_imp_local-0.0.36}/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_ID = 16
+    LINKEDIN_CSV_DATA_SOURCE_TYPE_ID = 18
+    OUTLOOK_CSV_DATA_SOURCE_TYPE_ID = 17
+    BGU_COURSE_CSV_DATA_SOURCE_TYPE_ID = 57
+    RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_ID = 60

{contact_person_profile_csv_imp_local-0.0.34 → contact_person_profile_csv_imp_local-0.0.36}/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.34
+Version: 0.0.36
 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.34 → contact_person_profile_csv_imp_local-0.0.36}/setup.py

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