contact-person-profile-csv-imp-local 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py

@@ -173,16 +173,16 @@ 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_name: str, file_name: str = None, user_external_username: str, system_name: str = None,
+            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: list[dict] = None, profile_id: int = None) -> dict:
         """
         Insert contacts from CSV file to the database
-        :param data_source_type_name: The data source name
+        :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_name: The system name
+        :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
@@ -192,16 +192,12 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
         :param end_index: The end index
         :return: 
         """
-        data_source_type_id = DataSources().get_data_source_type_id_by_name(data_source_type_name)
+        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 = 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)
+        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 []
@@ -451,9 +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_name=contact_dict.get("source")
-        )
+            data_source_type_id=data_source_type_id)
         return importer_id
 
     # TODO Move this method to LocationsLocal
@@ -584,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)
@@ -675,19 +670,18 @@ 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,
-                          data_source_type_name: str) -> 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_name == CSVToContactPersonProfileConstants.GOOGLE_CSV_DATA_SOURCE_TYPE_NAME:
+        if data_source_type_id == CSVToContactPersonProfileConstants.GOOGLE_CSV_DATA_SOURCE_TYPE_ID:
             url = "www.google.com"
-        elif data_source_type_name == CSVToContactPersonProfileConstants.OUTLOOK_CSV_DATA_SOURCE_TYPE_NAME:
+        elif data_source_type_id == CSVToContactPersonProfileConstants.OUTLOOK_CSV_DATA_SOURCE_TYPE_ID:
             url = "www.outlook.com"
-        elif data_source_type_name == CSVToContactPersonProfileConstants.LINKEDIN_CSV_DATA_SOURCE_TYPE_NAME:
+        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_name == CSVToContactPersonProfileConstants.BGU_COURSE_CSV_DATA_SOURCE_TYPE_NAME:
+        elif data_source_type_id == CSVToContactPersonProfileConstants.BGU_COURSE_CSV_DATA_SOURCE_TYPE_ID:
             url = None
-        elif data_source_type_name == CSVToContactPersonProfileConstants.RISHON_MUNI_EXHIBITOR_CSV_DATA_SOURCE_TYPE_NAME:
+        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")
@@ -892,7 +886,7 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     @staticmethod
     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('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'):

contact_person_profile_csv_imp_local/contact_person_profile_csv_imp_local_constants.py

@@ -20,8 +20,8 @@ class CSVToContactPersonProfileConstants:
         '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'
+    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.35.dist-info → contact_person_profile_csv_imp_local-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: contact-person-profile-csv-imp-local
-Version: 0.0.35
+Version: 0.0.37
 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.37.dist-info/RECORD

@@ -0,0 +1,7 @@
+contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py,sha256=NWUnlpuq82R6_sGWO81QT9TNEg_eBg0TTzTiXIPxV1I,49321
+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=SsMFKnI7y3P_kQxH21rxKnX7H4MZlemBy5vuv_Ns_a4,1180
+contact_person_profile_csv_imp_local-0.0.37.dist-info/METADATA,sha256=ZP7CrA6ljgw5oTtPnnzHXqHTvoFirGvFglzd1duQVfw,1481
+contact_person_profile_csv_imp_local-0.0.37.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+contact_person_profile_csv_imp_local-0.0.37.dist-info/top_level.txt,sha256=at6BnVzULDB109KZx9Cl9ClCHU4c0ykfV38WX-QR71U,37
+contact_person_profile_csv_imp_local-0.0.37.dist-info/RECORD,,

contact_person_profile_csv_imp_local-0.0.35.dist-info/RECORD

@@ -1,7 +0,0 @@
-contact_person_profile_csv_imp_local/CSVToContactPersonProfile.py,sha256=ZXPVnc_-iuqzidpicisiBAbaaMxUATZ1CSSscbLeFbg,49712
-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=hlZiM-gHlVNkBvpNcILlyZE1A25Zutnb3TGO1jcdzWc,1311
-contact_person_profile_csv_imp_local-0.0.35.dist-info/METADATA,sha256=uqp041W_GgsFW49pVB7-k5N6gQWFUJvOEaIzaqMb-24,1481
-contact_person_profile_csv_imp_local-0.0.35.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-contact_person_profile_csv_imp_local-0.0.35.dist-info/top_level.txt,sha256=at6BnVzULDB109KZx9Cl9ClCHU4c0ykfV38WX-QR71U,37
-contact_person_profile_csv_imp_local-0.0.35.dist-info/RECORD,,