organizations-local 0.0.48__py3-none-any.whl → 0.0.50__py3-none-any.whl

organizations_local/organizations_local.py

@@ -1,5 +1,5 @@
 from database_mysql_local.generic_crud_ml import GenericCRUDML
-from database_mysql_local.constants import UpdateStatus
+from database_mysql_local.constants_src import UpdateStatus
 from database_mysql_local.sync_conflict_resolution import SyncConflictResolution
 from language_remote.lang_code import LangCode
 from logger_local.MetaLogger import MetaLogger
@@ -74,19 +74,11 @@ class OrganizationsLocal(
 
     @staticmethod
     def _clean_organization_dict(organization_dict: dict) -> dict:
-        columns = (
-            "name",
-            "is_approved",
-            "is_main",
-            "point",
-            "location_id",
-            "profile_id",
-            "parent_organization_id",
-            "non_members_visibility_scope_id",
-            "members_visibility_scope_id",
-            "Non_members_visibility_profile_id",
-            "main_group_id",
-        )
+        columns = ("name", "is_approved", "is_main", "point", "location_id",
+                   "profile_id", "parent_organization_id",
+                   "non_members_visibility_scope_id",
+                   "members_visibility_scope_id",
+                   "Non_members_visibility_profile_id", "main_group_id")
         organization_dict = {key: organization_dict.get(key) for key in columns}
         return organization_dict
 
@@ -106,55 +98,48 @@ class OrganizationsLocal(
     # TODO: rename to insert? same for all
     def insert_organization(self, organization_dict: dict) -> tuple[int, int]:
         # This should be before chaning the organization_dict
-        organization_ml_data_dict = self._clean_organization_ml_dict(organization_dict)
+        organization_ml_data_dict = \
+            self._clean_organization_ml_dict(organization_dict)
 
         organization_dict = self._clean_organization_dict(organization_dict)
-        organization_id = GenericCRUDML.insert(self, data_dict=organization_dict)
+        organization_id = GenericCRUDML.insert(self,
+                                               data_dict=organization_dict)
         organization_ml_data_dict["organization_id"] = organization_id
         organization_ml_id = GenericCRUDML.insert(
-            self,
-            table_name="organization_ml_table",
-            data_dict=organization_ml_data_dict,
-        )
+            self, table_name="organization_ml_table",
+            data_dict=organization_ml_data_dict)
 
         return organization_id, organization_ml_id
 
-    def upsert_organization(
-        self, organization_dict: dict, order_by: str = None
-    ) -> dict:
+    def upsert_organization(self, organization_dict: dict,
+                            order_by: str = None) -> dict:
         lang_code = LangCode.detect_lang_code_restricted(
-            text=organization_dict.get("title"),
-            # TODO the lang code can be in the organization_dict or in the UserContext, I'm not sure English as default is correct
-            default_lang_code=LangCode.ENGLISH,
-        )
-        organization_ml_dict = self._clean_organization_ml_dict(organization_dict)
+            text=organization_dict.get('title'),
+            # TODO the lang code can be in the organization_dict or in the
+            #  UserContext, I'm not sure English as default is correct
+            default_lang_code=LangCode.ENGLISH)
+        organization_ml_dict = self._clean_organization_ml_dict(
+            organization_dict)
         organization_dict = self._clean_organization_dict(organization_dict)
 
-        # TODO Why do we need to do this if outside of GenericCrud in every entity, can we move this "if" into the Generic Crud method? Can we avoid two methods? The parameters of the two methods are the same?  # noqa
-        if "(" and ")" in organization_dict.get("title", ""):
-            organization_id, organzation_ml_ids_list = (
+        # TODO Why do we need to do this if outside of GenericCrud in every
+        #  entity, can we move this "if" into the Generic Crud method? Can we
+        #  avoid two methods? The parameters of the two methods are the same?
+        if "(" and ")" in organization_dict.get('title', ''):
+            organization_id, organzation_ml_ids_list =\
                 GenericCRUDML.upsert_value_with_abbreviations(
-                    self,
-                    data_ml_dict=organization_ml_dict,
+                    self, data_ml_dict=organization_ml_dict,
                     lang_code=lang_code,
                     data_dict=organization_dict,
                     schema_name=DEFAULT_SCHEMA_NAME,
                     table_name=DEFAULT_TABLE_NAME,
-                    ml_table_name=DEFAULT_ML_TABLE_NAME,
-                    order_by=order_by,
-                )
-            )
+                    ml_table_name=DEFAULT_ML_TABLE_NAME, order_by=order_by)
         else:
             organization_id, organzation_ml_id = GenericCRUDML.upsert_value(
-                self,
-                data_ml_dict=organization_ml_dict,
-                lang_code=lang_code,
-                data_dict=organization_dict,
-                schema_name=DEFAULT_SCHEMA_NAME,
+                self, data_ml_dict=organization_ml_dict, lang_code=lang_code,
+                data_dict=organization_dict, schema_name=DEFAULT_SCHEMA_NAME,
                 table_name=DEFAULT_TABLE_NAME,
-                ml_table_name=DEFAULT_ML_TABLE_NAME,
-                order_by=order_by,
-            )
+                ml_table_name=DEFAULT_ML_TABLE_NAME, order_by=order_by)
             organzation_ml_ids_list = [organzation_ml_id]
 
         # TODO upsert_result_dict
@@ -169,35 +154,28 @@ class OrganizationsLocal(
         self, *, organization_id: int, organization_ml_id: int, organization_dict: dict
     ) -> None:
         # TODO: should we have such a method in CRUD ML? Same for delete
-        organization_ml_dict = self._clean_organization_ml_dict(organization_dict)
+        organization_ml_dict = self._clean_organization_ml_dict(
+            organization_dict)
         organization_ml_dict["organization_id"] = organization_id
         organization_dict = self._clean_organization_dict(organization_dict)
+        GenericCRUDML.update_by_column_and_value(self,
+                                                 column_value=organization_id,
+                                                 data_dict=organization_dict)
         GenericCRUDML.update_by_column_and_value(
-            self, column_value=organization_id, data_dict=organization_dict
-        )
-        GenericCRUDML.update_by_column_and_value(
-            self,
-            table_name="organization_ml_table",
-            column_value=organization_ml_id,
-            data_dict=organization_ml_dict,
-            column_name="organization_ml_id",
-        )
+            self, table_name="organization_ml_table",
+            column_value=organization_ml_id, data_dict=organization_ml_dict,
+            column_name="organization_ml_id")
 
     def get_organization_dict_by_organization_id(
-        self,
-        *,
-        organization_id: int,
-        organization_ml_id: int = None,
-        view_table_name: str = None,
-    ) -> dict:
+            self, *, organization_id: int, organization_ml_id: int = None,
+            view_table_name: str = None) -> dict:
         view_table_name = view_table_name or self.default_view_table_name
         organization_ml_dict = {}
         if organization_ml_id:
             organization_ml_dict = self.select_one_dict_by_column_and_value(
                 view_table_name="organization_ml_view",
                 column_value=organization_ml_id,
-                column_name="organization_ml_id",
-            )
+                column_name="organization_ml_id")
         organization_dict = self.select_one_dict_by_column_and_value(
             view_table_name=view_table_name,
             column_value=organization_id,
@@ -207,45 +185,36 @@ class OrganizationsLocal(
         return {**organization_dict, **organization_ml_dict}
 
     def get_organizations_names_list_by_organizations_ids(
-        self,
-        *,
-        organizations_ids_list: list[int],
-        lang_codes_list: list[LangCode] = None,
-        view_table_name: str = None,
-    ) -> list[str]:
+            self, *, organizations_ids_list: list[int],
+            lang_codes_list: list[LangCode] = None,
+            view_table_name: str = None) -> list[str]:
         lang_codes_list = lang_codes_list or [LangCode.ENGLISH]
         view_table_name = view_table_name or DEFAULT_ML_VIEW_NAME
         organizations_names_list = []
         for organization_id in organizations_ids_list:
-            organization_name_dicts = self.select_multi_dict_by_column_and_value(
-                view_table_name=view_table_name,
-                select_clause_value="title, lang_code",
-                column_name="organization_id",
-                column_value=organization_id,
-            )
+            organization_name_dicts =\
+                self.select_multi_dict_by_column_and_value(
+                    view_table_name=view_table_name,
+                    select_clause_value="title, lang_code",
+                    column_name="organization_id",
+                    column_value=organization_id)
 
             # filter by lang_codes_list
             # TODO: improve performance
             for lang_code in lang_codes_list:
                 for organization_name_dict in organization_name_dicts:
-                    if organization_name_dict.get("lang_code") == lang_code.value:
+                    if organization_name_dict.get('lang_code') ==\
+                      lang_code.value:
                         organizations_names_list.append(
-                            organization_name_dict.get("title")
-                        )
+                            organization_name_dict.get('title'))
 
         return organizations_names_list
 
     # Edited by Tal Goodman on 12.7.24
     def get_organizations_ids_and_names_list_by_organizations_ids(
-        self,
-        *,
-        organizations_ids_list: list[int],
-        lang_codes_list: list[LangCode] = None,
-        view_table_name: str = None,
-    ) -> list[tuple[int, str]]:
-        if not organizations_ids_list:
-            return []
-
+            self, *, organizations_ids_list: list[int],
+            lang_codes_list: list[LangCode] = None,
+            view_table_name: str = None) -> list[tuple[int, str]]:
         lang_codes_list = lang_codes_list or [LangCode.ENGLISH]
         view_table_name = view_table_name or DEFAULT_ML_VIEW_NAME
         organizations_ids_and_names_list = []
@@ -255,40 +224,34 @@ class OrganizationsLocal(
         organizations_ids_and_names_list = self.select_multi_tuple_by_where(
             view_table_name=view_table_name,
             select_clause_value=select_clause_value,
-            where=where_clause_value,
-            params=organizations_ids_list,
+            where=where_clause_value, params=organizations_ids_list
         )
         return organizations_ids_and_names_list
 
-    def delete_by_organization_id(
-        self, organization_id: int, organization_ml_id: int = None
-    ) -> None:
+    def delete_by_organization_id(self, organization_id: int,
+                                  organization_ml_id: int = None) -> None:
         # Delete from organization_table
-        self.delete_by_column_and_value(
-            table_name="organization_table",
-            column_name="organization_id",
-            column_value=organization_id,
-        )
+        self.delete_by_column_and_value(table_name="organization_table",
+                                        column_name="organization_id",
+                                        column_value=organization_id)
 
         # Delete from organization_ml_table
         if organization_ml_id:
-            self.delete_by_column_and_value(
-                table_name="organization_ml_table",
-                column_name="organization_ml_id",
-                column_value=organization_ml_id,
-            )
+            self.delete_by_column_and_value(table_name="organization_ml_table",
+                                            column_name="organization_ml_id",
+                                            column_value=organization_ml_id)
 
     def get_test_organization_id(self) -> int:
         test_organization_id = self.get_test_entity_id(
-            entity_name="organization", insert_function=self.insert_organization
-        )
+            entity_name="organization",
+            insert_function=self.insert_organization)
         return test_organization_id
 
     # TODO Add support of multiple organizations per contact
     # Was def get_update_status(self, *, last_modified_timestamp: str, main_profile_id: int) -> UpdateStatus:
-    def get_update_status_and_information_list(
-        self, *, last_modified_timestamp: str, main_profile_id: int | None
-    ) -> list[dict]:
+    def get_update_status_and_information_list(self, *,
+                                               last_modified_timestamp: str,
+                                               main_profile_id: int | None) -> list[dict]:
         if main_profile_id is None:
             update_status_and_information_list = [
                 {"update_status": UpdateStatus.UPDATE_CIRCLEZ}
@@ -296,16 +259,13 @@ class OrganizationsLocal(
             return update_status_and_information_list
         sync_conflict_resolution = SyncConflictResolution()
         # TODO: Shall we also check update_timestamp in organization_table to see if the name was changed?
-        update_status_and_information_list: list[dict] = (
+        update_status_and_information_list: list[dict] = \
             sync_conflict_resolution.get_update_status_and_information_list_by_where(
-                schema_name="organization_profile",
-                view_table_name="organization_profile_view",
-                where="profile_id = %s",
-                params=(main_profile_id,),
-                local_last_modified_column_name="updated_timestamp",
-                remote_last_modified_timestamp=last_modified_timestamp,
-            )
-        )
+            schema_name="organization_profile",
+            view_table_name="organization_profile_view",
+            where="profile_id = %s", params=(main_profile_id,),
+            local_last_modified_column_name="updated_timestamp",
+            remote_last_modified_timestamp=last_modified_timestamp)
         # Add organization_names to update_status_and_information_list
         # TODO: Can we use a list of only the updated organization since the last sync?
         organizations_ids_list = []
@@ -329,21 +289,17 @@ class OrganizationsLocal(
         for update_status_and_information in update_status_and_information_list:
             organization_id = update_status_and_information.get("organization_id")
             if organization_id is not None:
-                update_status_and_information["organization_name"] = (
-                    organizations_ids_and_names_dict.get(organization_id)
-                )
+                update_status_and_information["organization_name"] = organizations_ids_and_names_dict.get(organization_id)
 
         return update_status_and_information_list
 
-    def get_organization_name_by_organization_identifier(
-        self, organization_identifier: str
-    ) -> str | None:
+    def get_organization_name_by_organization_identifier(self, organization_identifier: str) -> str | None:
         organization_name = self.select_one_value_by_column_and_value(
-            select_clause_value="name",
-            schema_name="organization",
-            view_table_name="organization_view",
-            column_name="identifier",
-            column_value=organization_identifier,
-        )
+                                                                    select_clause_value="name",
+                                                                    schema_name="organization",
+                                                                    view_table_name="organization_view",
+                                                                    column_name="identifier",
+                                                                    column_value=organization_identifier,
+                                                                    )
 
         return organization_name

{organizations_local-0.0.48.dist-info → organizations_local-0.0.50.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: organizations-local
-Version: 0.0.48
+Version: 0.0.50
 Summary: PyPI Package for Circles organizations-local Python
 Home-page: https://github.com/circles-zone/organizations-local-python-package
 Author: Circles
 Author-email: info@circlez.ai
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 Requires-Dist: database-mysql-local>=0.0.290

organizations_local-0.0.50.dist-info/RECORD

@@ -0,0 +1,7 @@
+organizations_local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+organizations_local/organizations_constants.py,sha256=mh_XncG0Q8-k_VUCHWVQRdlMXNnf_GCiCcL-rn7R3lw,902
+organizations_local/organizations_local.py,sha256=Ynxtqf_8a4VK42iFbEUM7fIlLwD9AM1xldX7X7SUrXQ,14103
+organizations_local-0.0.50.dist-info/METADATA,sha256=B6aSAUbcy9fKwBaIQ_xw10Top8WFAiQ_0SFwfogGNq4,773
+organizations_local-0.0.50.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+organizations_local-0.0.50.dist-info/top_level.txt,sha256=Y8wRcm3jFTyMdysBub_P8iqX1VOMS0ohUxA1GQdngFU,20
+organizations_local-0.0.50.dist-info/RECORD,,

{organizations_local-0.0.48.dist-info → organizations_local-0.0.50.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

organizations_local-0.0.48.dist-info/RECORD

@@ -1,7 +0,0 @@
-organizations_local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-organizations_local/organizations_constants.py,sha256=mh_XncG0Q8-k_VUCHWVQRdlMXNnf_GCiCcL-rn7R3lw,902
-organizations_local/organizations_local.py,sha256=DYDrEElmPm9Pdn7-q4OkFYueYB5yjcyATXRLAO7d1yM,13904
-organizations_local-0.0.48.dist-info/METADATA,sha256=jB42bYpjsLRGlviQvbXdgZSEOJ_UeM9WxishIImtTXQ,822
-organizations_local-0.0.48.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-organizations_local-0.0.48.dist-info/top_level.txt,sha256=Y8wRcm3jFTyMdysBub_P8iqX1VOMS0ohUxA1GQdngFU,20
-organizations_local-0.0.48.dist-info/RECORD,,