fix disable attribute

apps/mappings/imports/modules/categories.py

@@ -90,7 +90,7 @@ def create_mappings(self):
         )
 
 
-def disable_categories(workspace_id: int, categories_to_disable: Dict, *args, **kwargs):
+def disable_categories(workspace_id: int, categories_to_disable: Dict, is_import_to_fyle_enabled: bool = False, *args, **kwargs):
     """
     categories_to_disable object format:
     {
@@ -102,13 +102,22 @@ def disable_categories(workspace_id: int, categories_to_disable: Dict, *args, **
         }
     }
     """
+    if not is_import_to_fyle_enabled or len(categories_to_disable) == 0:
+        logger.info("Skipping disabling categories in Fyle | WORKSPACE_ID: %s", workspace_id)
+        return
+
     fyle_credentials = FyleCredential.objects.get(workspace_id=workspace_id)
     platform = PlatformConnector(fyle_credentials=fyle_credentials)
 
     use_code_in_naming = ImportSetting.objects.filter(workspace_id=workspace_id, import_code_fields__contains=['ACCOUNT']).first()
 
     category_values = []
     for category_map in categories_to_disable.values():
+        if not use_code_in_naming and category_map['value'] == category_map['updated_value']:
+            continue
+        elif use_code_in_naming and (category_map['value'] == category_map['updated_value'] and category_map['code'] == category_map['update_code']):
+            continue
+
         category_name = prepend_code_to_name(prepend_code_in_name=use_code_in_naming, value=category_map['value'], code=category_map['code'])
         category_values.append(category_name)
 
@@ -121,9 +130,9 @@ def disable_categories(workspace_id: int, categories_to_disable: Dict, *args, **
 
     # Expense attribute value map is as follows: {old_category_name: destination_id}
     expense_attribute_value_map = {}
-    for k, v in categories_to_disable.items():
+    for destination_id, v in categories_to_disable.items():
         category_name = prepend_code_to_name(prepend_code_in_name=use_code_in_naming, value=v['value'], code=v['code'])
-        expense_attribute_value_map[category_name] = k
+        expense_attribute_value_map[category_name] = destination_id
 
     expense_attributes = ExpenseAttribute.objects.filter(**filters)
 

apps/mappings/imports/modules/cost_centers.py

@@ -65,7 +65,7 @@ def construct_fyle_payload(
         return payload
 
 
-def disable_cost_centers(workspace_id: int, cost_centers_to_disable: Dict, *args, **kwargs):
+def disable_cost_centers(workspace_id: int, cost_centers_to_disable: Dict, is_import_to_fyle_enabled: bool = False, *args, **kwargs):
     """
     cost_centers_to_disable object format:
     {
@@ -77,6 +77,10 @@ def disable_cost_centers(workspace_id: int, cost_centers_to_disable: Dict, *args
         }
     }
     """
+    if not is_import_to_fyle_enabled or len(cost_centers_to_disable) == 0:
+        logger.info("Skipping disabling cost centers in Fyle | WORKSPACE_ID: %s", workspace_id)
+        return
+
     destination_type = MappingSetting.objects.get(workspace_id=workspace_id, source_field='COST_CENTER').destination_field
     use_code_in_naming = ImportSetting.objects.filter(workspace_id=workspace_id, import_code_fields__contains=[destination_type]).first()
 
@@ -85,6 +89,11 @@ def disable_cost_centers(workspace_id: int, cost_centers_to_disable: Dict, *args
 
     cost_center_values = []
     for cost_center_map in cost_centers_to_disable.values():
+        if not use_code_in_naming and cost_center_map['value'] == cost_center_map['updated_value']:
+            continue
+        elif use_code_in_naming and (cost_center_map['value'] == cost_center_map['updated_value'] and cost_center_map['code'] == cost_center_map['update_code']):
+            continue
+
         cost_center_name = prepend_code_to_name(prepend_code_in_name=use_code_in_naming, value=cost_center_map['value'], code=cost_center_map['code'])
         cost_center_values.append(cost_center_name)
 
@@ -96,9 +105,9 @@ def disable_cost_centers(workspace_id: int, cost_centers_to_disable: Dict, *args
     }
 
     expense_attribute_value_map = {}
-    for k, v in cost_centers_to_disable.items():
+    for destination_id, v in cost_centers_to_disable.items():
         cost_center_name = prepend_code_to_name(prepend_code_in_name=use_code_in_naming, value=v['value'], code=v['code'])
-        expense_attribute_value_map[cost_center_name] = k
+        expense_attribute_value_map[cost_center_name] = destination_id
 
     expense_attributes = ExpenseAttribute.objects.filter(**filters)
 

apps/mappings/imports/modules/merchants.py

@@ -75,7 +75,7 @@ def import_destination_attribute_to_fyle(self, import_log: ImportLog):
         self.sync_expense_attributes(platform)
 
 
-def disable_merchants(workspace_id: int, merchants_to_disable: Dict, *args, **kwargs):
+def disable_merchants(workspace_id: int, merchants_to_disable: Dict, is_import_to_fyle_enabled: bool = False, *args, **kwargs):
     """
     merchants_to_disable object format:
     {
@@ -87,12 +87,21 @@ def disable_merchants(workspace_id: int, merchants_to_disable: Dict, *args, **kw
         }
     }
     """
+    if not is_import_to_fyle_enabled or len(merchants_to_disable) == 0:
+        logger.info("Skipping disabling merchants in Fyle | WORKSPACE_ID: %s", workspace_id)
+        return
+
     fyle_credentials = FyleCredential.objects.get(workspace_id=workspace_id)
     platform = PlatformConnector(fyle_credentials=fyle_credentials)
     use_code_in_naming = ImportSetting.objects.filter(workspace_id = workspace_id, import_code_fields__contains=['VENDOR']).first()
 
     merchant_values = []
     for merchant_map in merchants_to_disable.values():
+        if not use_code_in_naming and merchant_map['value'] == merchant_map['updated_value']:
+            continue
+        elif use_code_in_naming and (merchant_map['value'] == merchant_map['updated_value'] and merchant_map['code'] == merchant_map['update_code']):
+            continue
+
         merchant_name = prepend_code_to_name(prepend_code_in_name=use_code_in_naming, value=merchant_map['value'], code=merchant_map['code'])
         merchant_values.append(merchant_name)
 

apps/mappings/imports/modules/projects.py

@@ -77,7 +77,7 @@ def construct_fyle_payload(
         return payload
 
 
-def disable_projects(workspace_id: int, projects_to_disable: Dict, *args, **kwargs):
+def disable_projects(workspace_id: int, projects_to_disable: Dict, is_import_to_fyle_enabled: bool = False, *args, **kwargs):
     """
     Disable projects in Fyle when the projects are updated in Sage 300.
     This is a callback function that is triggered from accounting_mappings.
@@ -92,6 +92,10 @@ def disable_projects(workspace_id: int, projects_to_disable: Dict, *args, **kwar
     }
 
     """
+    if not is_import_to_fyle_enabled or len(projects_to_disable) == 0:
+        logger.info("Skipping disabling projects in Fyle | WORKSPACE_ID: %s", workspace_id)
+        return
+
     fyle_credentials = FyleCredential.objects.get(workspace_id=workspace_id)
     platform = PlatformConnector(fyle_credentials=fyle_credentials)
     platform.projects.sync()
@@ -103,6 +107,11 @@ def disable_projects(workspace_id: int, projects_to_disable: Dict, *args, **kwar
 
     project_values = []
     for projects_map in projects_to_disable.values():
+        if not use_code_in_naming and projects_map['value'] == projects_map['updated_value']:
+            continue
+        elif use_code_in_naming and (projects_map['value'] == projects_map['updated_value'] and projects_map['code'] == projects_map['update_code']):
+            continue
+
         project_name = prepend_code_to_name(prepend_code_in_name=use_code_in_naming, value=projects_map['value'], code=projects_map['code'])
         project_values.append(project_name)
 
@@ -115,9 +124,9 @@ def disable_projects(workspace_id: int, projects_to_disable: Dict, *args, **kwar
 
     # Expense attribute value map is as follows: {old_project_name: destination_id}
     expense_attribute_value_map = {}
-    for k, v in projects_to_disable.items():
+    for destination_id, v in projects_to_disable.items():
         project_name = prepend_code_to_name(prepend_code_in_name=use_code_in_naming, value=v['value'], code=v['code'])
-        expense_attribute_value_map[project_name] = k
+        expense_attribute_value_map[project_name] = destination_id
 
     expense_attributes = ExpenseAttribute.objects.filter(**filters)
 
@@ -142,8 +151,9 @@ def disable_projects(workspace_id: int, projects_to_disable: Dict, *args, **kwar
     if bulk_payload:
         logger.info(f"Disabling Projects in Fyle | WORKSPACE_ID: {workspace_id} | COUNT: {len(bulk_payload)}")
         platform.projects.post_bulk(bulk_payload)
+        update_and_disable_cost_code(workspace_id, projects_to_disable, platform, use_code_in_naming)
+        platform.projects.sync()
     else:
         logger.info(f"No Projects to Disable in Fyle | WORKSPACE_ID: {workspace_id}")
-    update_and_disable_cost_code(workspace_id, projects_to_disable, platform, use_code_in_naming)
-    platform.projects.sync()
+
     return bulk_payload

apps/sage300/utils.py

@@ -1,7 +1,7 @@
 import logging
 from django.utils.module_loading import import_string
 from fyle_accounting_mappings.models import DestinationAttribute, MappingSetting
-from apps.workspaces.models import Sage300Credential
+from apps.workspaces.models import Sage300Credential, ImportSetting
 from sage_desktop_sdk.sage_desktop_sdk import SageDesktopSDK
 from apps.sage300.models import CostCategory
 from apps.mappings.models import Version
@@ -131,7 +131,7 @@ def _remove_credit_card_vendors(self):
         logger.info(f'Deleting {vendor_count} credit card vendors from workspace_id {self.workspace_id}')
         credit_card_vendor.delete()
 
-    def _sync_data(self, data_gen, attribute_type, display_name, workspace_id, field_names, is_generator: bool = True, vendor_type_mapping = None):
+    def _sync_data(self, data_gen, attribute_type, display_name, workspace_id, field_names, is_generator: bool = True, vendor_type_mapping = None, is_import_to_fyle_enabled: bool = False):
         """
         Synchronize data from Sage Desktop SDK to your application
         :param data: Data to synchronize
@@ -159,7 +159,8 @@ def _sync_data(self, data_gen, attribute_type, display_name, workspace_id, field
                             attribute_type,
                             workspace_id,
                             True,
-                            attribute_disable_callback_path=ATTRIBUTE_CALLBACK_MAP[source_type]
+                            attribute_disable_callback_path=ATTRIBUTE_CALLBACK_MAP[source_type],
+                            is_import_to_fyle_enabled=is_import_to_fyle_enabled
                         )
                     else:
                         DestinationAttribute.bulk_create_or_update_destination_attributes(
@@ -185,7 +186,10 @@ def sync_accounts(self):
         """
         version = Version.objects.get(workspace_id=self.workspace_id).account
         accounts = self.connection.accounts.get_all(version=version)
-        self._sync_data(accounts, 'ACCOUNT', 'accounts', self.workspace_id, ['code', 'version'])
+
+        is_import_to_fyle_enabled = self.is_imported_enabled('ACCOUNT', self.workspace_id)
+
+        self._sync_data(accounts, 'ACCOUNT', 'accounts', self.workspace_id, ['code', 'version'], is_import_to_fyle_enabled=is_import_to_fyle_enabled)
         return []
 
     def sync_vendors(self):
@@ -201,14 +205,16 @@ def sync_vendors(self):
         vendor_types = None
         vendor_type_mapping = None
 
+        is_import_to_fyle_enabled = self.is_imported_enabled('VENDOR', self.workspace_id)
+
         if not DestinationAttribute.objects.filter(workspace_id=self.workspace_id, attribute_type='VENDOR_TYPE').exists():
             vendor_types = self.connection.vendors.get_vendor_types()
             self._sync_data(vendor_types, 'VENDOR_TYPE', 'vendor_type', self.workspace_id, ['version'])
 
         vendor_types = DestinationAttribute.objects.filter(workspace_id=self.workspace_id, attribute_type='VENDOR_TYPE').values('destination_id', 'value').distinct()
         vendor_type_mapping = {vendor_type['destination_id']: vendor_type['value'] for vendor_type in vendor_types}
 
-        self._sync_data(vendors, 'VENDOR', 'vendor', self.workspace_id, field_names, vendor_type_mapping=vendor_type_mapping)
+        self._sync_data(vendors, 'VENDOR', 'vendor', self.workspace_id, field_names, vendor_type_mapping=vendor_type_mapping, is_import_to_fyle_enabled=is_import_to_fyle_enabled)
         return []
 
     def sync_jobs(self):
@@ -220,7 +226,10 @@ def sync_jobs(self):
         field_names = [
             'code', 'status', 'version', 'account_prefix_id', 'created_on_utc'
         ]
-        self._sync_data(jobs, 'JOB', 'job', self.workspace_id, field_names)
+
+        is_import_to_fyle_enabled = self.is_imported_enabled('JOB', self.workspace_id)
+
+        self._sync_data(jobs, 'JOB', 'job', self.workspace_id, field_names, is_import_to_fyle_enabled=is_import_to_fyle_enabled)
         return []
 
     def sync_standard_cost_codes(self):
@@ -317,3 +326,28 @@ def get_source_type(self, attribute_type, workspace_id):
             source_type = 'CATEGORY'
 
         return source_type
+
+    def is_imported_enabled(self, attribute_type, workspace_id):
+        """
+        Check if import is enabled for the attribute type
+        :param attribute_type: Type of the attribute
+        :return: Whether import is enabled
+        """
+        is_import_to_fyle_enabled = False
+
+        import_settings = ImportSetting.objects.filter(workspace_id=self.workspace_id).first()
+        if not import_settings:
+            return is_import_to_fyle_enabled
+
+        if attribute_type == 'ACCOUNT' and import_settings.import_categories:
+            is_import_to_fyle_enabled = True
+
+        elif attribute_type == 'VENDOR' and import_settings.import_vendors_as_merchants:
+            is_import_to_fyle_enabled = True
+
+        elif attribute_type == 'JOB':
+            mapping_setting = MappingSetting.objects.filter(workspace_id=workspace_id, destination_field='JOB').first()
+            if mapping_setting and mapping_setting.import_to_fyle:
+                is_import_to_fyle_enabled = True
+
+        return is_import_to_fyle_enabled

requirements.txt

@@ -28,7 +28,7 @@ fyle==0.37.0
 
 # Reusable Fyle Packages
 fyle-rest-auth==1.7.2
-fyle-accounting-mappings==1.34.2
+fyle-accounting-mappings==1.34.3
 fyle-integrations-platform-connector==1.39.0
 
 

tests/test_mappings/test_imports/test_modules/test_categories.py

@@ -177,7 +177,7 @@ def test_disable_categories(
     mock_platform = mocker.patch('apps.mappings.imports.modules.categories.PlatformConnector')
     bulk_post_call = mocker.patch.object(mock_platform.return_value.categories, 'post_bulk')
 
-    disable_categories(workspace_id, categories_to_disable)
+    disable_categories(workspace_id, categories_to_disable, is_import_to_fyle_enabled=True)
 
     assert bulk_post_call.call_count == 1
 
@@ -190,7 +190,7 @@ def test_disable_categories(
         }
     }
 
-    disable_categories(workspace_id, categories_to_disable)
+    disable_categories(workspace_id, categories_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_post_call.call_count == 1
 
     # Test disable projects with code in naming
@@ -223,5 +223,5 @@ def test_disable_categories(
         'id': 'source_id_123'
     }]
 
-    bulk_payload = disable_categories(workspace_id, categories_to_disable)
+    bulk_payload = disable_categories(workspace_id, categories_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_payload == payload

tests/test_mappings/test_imports/test_modules/test_cost_centers.py

@@ -118,7 +118,7 @@ def test_disable_cost_centers(
     mock_platform = mocker.patch('apps.mappings.imports.modules.cost_centers.PlatformConnector')
     bulk_post_call = mocker.patch.object(mock_platform.return_value.cost_centers, 'post_bulk')
 
-    disable_cost_centers(workspace_id, cost_centers_to_disable)
+    disable_cost_centers(workspace_id, cost_centers_to_disable, is_import_to_fyle_enabled=True)
 
     assert bulk_post_call.call_count == 1
 
@@ -131,7 +131,7 @@ def test_disable_cost_centers(
         }
     }
 
-    disable_cost_centers(workspace_id, cost_centers_to_disable)
+    disable_cost_centers(workspace_id, cost_centers_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_post_call.call_count == 1
 
     # Test disable projects with code in naming
@@ -167,5 +167,5 @@ def test_disable_cost_centers(
         }
     ]
 
-    bulk_payload = disable_cost_centers(workspace_id, cost_centers_to_disable)
+    bulk_payload = disable_cost_centers(workspace_id, cost_centers_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_payload == payload

tests/test_mappings/test_imports/test_modules/test_merchants.py

@@ -155,7 +155,7 @@ def test_disable_merchants(
     mock_platform = mocker.patch('apps.mappings.imports.modules.merchants.PlatformConnector')
     bulk_post_call = mocker.patch.object(mock_platform.return_value.merchants, 'post')
 
-    disable_merchants(workspace_id, merchants_to_disable)
+    disable_merchants(workspace_id, merchants_to_disable, is_import_to_fyle_enabled=True)
 
     assert bulk_post_call.call_count == 1
 
@@ -168,7 +168,7 @@ def test_disable_merchants(
         }
     }
 
-    disable_merchants(workspace_id, merchants_to_disable)
+    disable_merchants(workspace_id, merchants_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_post_call.call_count == 1
 
     # Test disable projects with code in naming
@@ -196,5 +196,5 @@ def test_disable_merchants(
 
     payload = ['old_merchant_code: old_merchant']
 
-    bulk_payload = disable_merchants(workspace_id, merchants_to_disable)
+    bulk_payload = disable_merchants(workspace_id, merchants_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_payload[0] == payload[0]

tests/test_sage300/test_helpers.py

@@ -124,7 +124,7 @@ def test_disable_projects(
 
     disable_cost_code_call = mocker.patch('apps.sage300.dependent_fields.update_and_disable_cost_code')
 
-    disable_projects(workspace_id, projects_to_disable)
+    disable_projects(workspace_id, projects_to_disable, is_import_to_fyle_enabled=True)
 
     assert bulk_post_call.call_count == 1
     assert sync_call.call_count == 2
@@ -139,10 +139,10 @@ def test_disable_projects(
         }
     }
 
-    disable_projects(workspace_id, projects_to_disable)
+    disable_projects(workspace_id, projects_to_disable, is_import_to_fyle_enabled=True)
     assert bulk_post_call.call_count == 1
-    assert sync_call.call_count == 4
-    disable_cost_code_call.call_count == 2
+    assert sync_call.call_count == 3
+    disable_cost_code_call.call_count == 1
 
     # Test disable projects with code in naming
     import_settings = ImportSetting.objects.get(workspace_id=workspace_id)
@@ -178,7 +178,7 @@ def test_disable_projects(
         'id': 'source_id_123'
     }]
 
-    assert disable_projects(workspace_id, projects_to_disable) == payload
+    assert disable_projects(workspace_id, projects_to_disable, is_import_to_fyle_enabled=True) == payload
 
 
 def test_update_and_disable_cost_code(