contact-person-profile-csv-imp-local 0.0.39__tar.gz → 0.0.43__tar.gz

{contact_person_profile_csv_imp_local-0.0.39 → contact_person_profile_csv_imp_local-0.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: contact-person-profile-csv-imp-local
-Version: 0.0.39
+Version: 0.0.43
 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
@@ -14,7 +14,7 @@ Requires-Dist: logger-local>=0.0.135
 Requires-Dist: database-mysql-local>=0.0.290
 Requires-Dist: user-context-remote>=0.0.77
 Requires-Dist: contact-email-address-local>=0.0.8
-Requires-Dist: contact-group-local>=0.0.30
+Requires-Dist: contact-group-local>=0.0.68
 Requires-Dist: contact-location-local>=0.0.14
 Requires-Dist: contact-notes-local>=0.0.33
 Requires-Dist: contact-persons-local>=0.0.8

{contact_person_profile_csv_imp_local-0.0.39 → contact_person_profile_csv_imp_local-0.0.43}/contact_person_profile_csv_imp_local/src/CSVToContactPersonProfile.py

@@ -30,10 +30,10 @@ from contact_local.contact_local import ContactsLocal
 from contact_group_local.contact_group import ContactGroups
 from contact_email_address_local.contact_email_addresses_local import ContactEmailAdressesLocal
 
-# import pycountry
 from phonenumbers import NumberParseException
 from user_context_remote.user_context import UserContext
 from user_external_local.user_externals_local import UserExternalsLocal
+from group_local.group_type import group_type
 
 # from contact_local.contact_local import ContactsLocal
 # from database_mysql_local.generic_crud import GenericCRUD
@@ -107,39 +107,58 @@ 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:
+        self._instances = {}
+        self.classes = [ContactsLocal, OrganizationProfilesLocal, ContactPersonsLocal, ContactUserExternalLocal,
+                        ContactProfilesLocal, ContactGroups, ContactEmailAdressesLocal, ContactPhoneLocal,
+                        ContactLocationLocal, UserExternalsLocal, OrganizationsLocal, DomainLocal, ImportersLocal]
+        self.instances_names = ['contacts_local', 'organization_profiles', 'contact_persons', 'contact_user_external',
+                                'contact_profiles', 'contact_groups', 'contact_email_addresses', 'contact_phone',
+                                'contact_location', 'user_externals_local', 'organizations_local', 'domain_local',
+                                'importers_local']
         GenericCRUD.__init__(self, default_schema_name="field", default_column_name="field_id",
                              default_table_name="field_table", default_view_table_name="field_view",
                              is_test_data=is_test_data)
         self.contact_entity_type_id = self.select_one_value_by_column_and_value(
             schema_name="entity_type", view_table_name="entity_type_ml_en_view",
             select_clause_value="entity_type_id", column_name="title", column_value="Contact")
-        self.groups_list: list[str] = [group.strip() for group in groups_str.split(",")] if groups_str else []
+        self.list_of_group_dicts: list[str] = [group.strip() for group in groups_str.split(",")] if groups_str else []
         self.user_context = UserContext()
-        self.organization_profiles = OrganizationProfilesLocal(is_test_data=is_test_data)
-        self.contact_persons = ContactPersonsLocal(is_test_data=is_test_data)
-        self.contact_user_external = ContactUserExternalLocal(is_test_data=is_test_data)
-        self.contact_profiles = ContactProfilesLocal(is_test_data=is_test_data)
-        self.contact_groups = ContactGroups(is_test_data=is_test_data)
-        self.contact_email_addresses = ContactEmailAdressesLocal(is_test_data=is_test_data)
-        self.contact_phone = ContactPhoneLocal(is_test_data=is_test_data)
-        self.contact_location = ContactLocationLocal(is_test_data=is_test_data)
-        self.contacts_local = ContactsLocal(is_test_data=is_test_data)
-        self.user_externals_local = UserExternalsLocal(is_test_data=is_test_data)
-        self.organizations_local = OrganizationsLocal(is_test_data=is_test_data)
-        self.domain_local = DomainLocal(is_test_data=is_test_data)
-        self.importers_local = ImportersLocal()
+        self.organization_profiles: OrganizationProfilesLocal = None
+        self.contact_persons: ContactPersonsLocal = None
+        self.contact_user_external: ContactUserExternalLocal = None
+        self.contact_profiles: ContactProfilesLocal = None
+        self.contact_groups: ContactGroups = None
+        self.contact_email_addresses: ContactEmailAdressesLocal = None
+        self.contact_phone: ContactPhoneLocal = None
+        self.contact_location: ContactLocationLocal = None
+        self.contacts_local: ContactsLocal = None
+        self.user_externals_local: UserExternalsLocal = None
+        self.organizations_local: OrganizationsLocal = None
+        self.domain_local: DomainLocal = None
+        self.importers_local: ImportersLocal = None
+
         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')
-        
+        self.list_of_group_dicts = None
+        self.unknown_main_group_type_id = group_type.get('Unknown')
+        self.organization_main_group_type_id = group_type.get('Organization')
+        self.job_title_main_group_type_id = group_type.get('Job Title')
+
+    def __getattribute__(self, name):
+        # Call the original __getattribute__
+        value = super().__getattribute__(name)
+
+        # If value is None and name is in instances_names, initialize it
+        if value is None and name in self.instances_names:
+            for index, cls in enumerate(self.classes):
+                if self.instances_names[index] == name:
+                    instance = cls()
+                    self._instances[name] = instance
+                    setattr(self, name, instance)
+                    return instance
+
+        # Otherwise, return the value
+        return value
+
 
     # # 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:
@@ -173,10 +192,10 @@ 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, *, username: str, email_address: str, data_source_type_id: int, file_name: str = None, system_id: int = None,
+            self, *, user_external_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:
+            list_of_group_dicts: list[dict] = None) -> dict:
         """
         Insert contacts from CSV file to the database
         :param data_source_type_id: The data source id
@@ -193,14 +212,23 @@ 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(
-            schema_name="profile", view_table_name="profile_view",
-            select_clause_value="profile_id", column_name="profile.main_email_address",
-            column_value=email_address)
+        # TODO There can be multiple profiles with the same email, why not to query `user_external_table`.`main_profile_id`?
+        # Answer: first, We can't query tables with GenericCRUD, second, we may not find profile_id in user_external table
+        # and may have to insert a new record to user_external_table, in this case we need profile_id from profile_view
+        profile_id = self.select_one_value_by_column_and_value(
+            schema_name="user_external", view_table_name="user_external_view",
+            select_clause_value="main_profile_id", column_name="username", column_value=user_external_username)
+        if profile_id is None:
+            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=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 user_external or profile_view.")
         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 []
+        self.list_of_group_dicts = list_of_group_dicts if list_of_group_dicts else []
         '''
         profile_id = ProfilesLocal().select_one_value_by_column_and_value(
             schema_name="profile", view_table_name="profile_view",
@@ -219,7 +247,6 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
             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")
-
         # TODO Why do we need it? - Those fields will be added to the contact_dict
         contact_fields_to_keep = (
             'name_prefix', 'additional_name', 'name_suffix', 'nickname', 'full_name', 'title', 'department', 'notes',
@@ -229,13 +256,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=username,
+        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,
             user_external_id=user_external_id, file_name=file_name,
-            user_external_username=username,
+            user_external_username=user_external_username,
             start_index=start_index, end_index=end_index
         )
         fields_dictonary = self.data_sources.get_fields_name_from_csv(data_source_type_id)
@@ -509,9 +536,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
 
     def __insert_link_contact_groups(self, contact_dict: dict) -> list:
         contact_id = contact_dict.get("contact_id")
-        # TODO groups_dicts_list
-        groups = []
-        linked_groups_results_list = None
+        groups_dicts_list = []
+        linked_groups_results_list = []
         organization = contact_dict.get("organization")
         if organization:
             organization_group_dict = {
@@ -524,7 +550,8 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 "is_main_title": False,
                 "title": organization,
             }
-            groups.append(organization_group_dict)
+            # TODO Lvalue group Rvalue organization?
+            groups_dicts_list.append(organization_group_dict)
         job_title = contact_dict.get("job_title")
         if job_title:
             job_title_group_dict = {
@@ -537,7 +564,7 @@ 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(", ")
@@ -552,12 +579,12 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                     "is_main_title": False,
                     "title": group,
                 }
-                groups.append(group_dict)
-        for group in self.groups_list:
-            groups.append(group)
-        if len(groups) > 0:
+                groups_dicts_list.append(group_dict)
+        for group in self.list_of_group_dicts:
+            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)
+                contact_id=contact_id, groups_list_of_dicts=groups_dicts_list)
         contact_dict["linked_group_results_list"] = linked_groups_results_list
 
         return linked_groups_results_list
@@ -797,6 +824,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,
@@ -863,9 +892,20 @@ class CSVToContactPersonProfile(GenericCRUD, metaclass=MetaLogger,
                 system_id=system_id,
                 access_token=""
             )
+            # TODO There can be the same username in multiple user_external_id, we should add more fields system_id, end_timestamp ...
             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.39 → contact_person_profile_csv_imp_local-0.0.43}/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.39
+Version: 0.0.43
 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
@@ -14,7 +14,7 @@ Requires-Dist: logger-local>=0.0.135
 Requires-Dist: database-mysql-local>=0.0.290
 Requires-Dist: user-context-remote>=0.0.77
 Requires-Dist: contact-email-address-local>=0.0.8
-Requires-Dist: contact-group-local>=0.0.30
+Requires-Dist: contact-group-local>=0.0.68
 Requires-Dist: contact-location-local>=0.0.14
 Requires-Dist: contact-notes-local>=0.0.33
 Requires-Dist: contact-persons-local>=0.0.8

{contact_person_profile_csv_imp_local-0.0.39 → contact_person_profile_csv_imp_local-0.0.43}/contact_person_profile_csv_imp_local.egg-info/requires.txt

@@ -3,7 +3,7 @@ logger-local>=0.0.135
 database-mysql-local>=0.0.290
 user-context-remote>=0.0.77
 contact-email-address-local>=0.0.8
-contact-group-local>=0.0.30
+contact-group-local>=0.0.68
 contact-location-local>=0.0.14
 contact-notes-local>=0.0.33
 contact-persons-local>=0.0.8

{contact_person_profile_csv_imp_local-0.0.39 → contact_person_profile_csv_imp_local-0.0.43}/pyproject.toml

@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
 name = "<project-name>"
 # I believe we are still using the version from setup.py and not from here until potery will work
 version = "0.0.2" # https://pypi.org/project/<project-name> i.e. https://pypi.org/project/storage-local/
-description = "<project-name> Python Package"
+description = "Contact Person Profile CSV Imp Python Package"
 readme = "README.md"
 authors = [
     "Circlez.ai <info@circlez.ai>",

{contact_person_profile_csv_imp_local-0.0.39 → contact_person_profile_csv_imp_local-0.0.43}/setup.py

@@ -5,7 +5,7 @@ package_dir = PACKAGE_NAME.replace("-", "_")
 
 setuptools.setup(
     name=PACKAGE_NAME,
-    version='0.0.39',  # https://pypi.org/project/contact-person-profile-csv-imp-local/
+    version='0.0.43',  # 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",
@@ -26,7 +26,7 @@ setuptools.setup(
         'database-mysql-local>=0.0.290',
         'user-context-remote>=0.0.77',
         'contact-email-address-local>=0.0.8',
-        'contact-group-local>=0.0.30',
+        'contact-group-local>=0.0.68',
         'contact-location-local>=0.0.14',
         'contact-notes-local>=0.0.33',
         'contact-persons-local>=0.0.8',