feat: add split_expense_grouping to the expense group settings serializer

apps/fyle/models.py

@@ -14,7 +14,7 @@
 from fyle_accounting_mappings.models import ExpenseAttribute
 
 from apps.fyle.enums import ExpenseStateEnum, FundSourceEnum, PlatformExpensesEnum
-from apps.workspaces.models import Workspace
+from apps.workspaces.models import Workspace, WorkspaceGeneralSettings
 
 logger = logging.getLogger(__name__)
 logger.level = logging.INFO
@@ -35,6 +35,7 @@
     "spent_at",
     "expense_id",
     "posted_at",
+    "bank_transaction_id",
 ]
 
 
@@ -515,13 +516,52 @@ def create_expense_groups_by_report_id_fund_source(
         corporate_credit_card_expenses = list(
             filter(lambda expense: expense.fund_source == "CCC", expense_objects)
         )
-        corporate_credit_card_expense_groups = _group_expenses(
-            corporate_credit_card_expenses,
-            corporate_credit_card_expense_group_field,
-            workspace_id,
-        )
 
-        expense_groups.extend(corporate_credit_card_expense_groups)
+        if corporate_credit_card_expenses:
+            workspace_general_settings = WorkspaceGeneralSettings.objects.get(
+                workspace_id=workspace_id
+            )
+            ccc_export_module = workspace_general_settings.corporate_credit_card_expenses_object
+
+            if ccc_export_module == "BANK TRANSACTION" and expense_group_settings.split_expense_grouping == 'MULTIPLE_LINE_ITEM':
+                ccc_expenses_without_bank_transaction_id = list(
+                    filter(lambda expense: not expense.bank_transaction_id, corporate_credit_card_expenses)
+                )
+
+                ccc_expenses_with_bank_transaction_id = list(
+                    filter(lambda expense: expense.bank_transaction_id, corporate_credit_card_expenses)
+                )
+
+                if ccc_expenses_without_bank_transaction_id:
+                    groups_without_bank_transaction_id = _group_expenses(
+                        ccc_expenses_without_bank_transaction_id,
+                        corporate_credit_card_expense_group_field,
+                        workspace_id,
+                    )
+                    expense_groups.extend(groups_without_bank_transaction_id)
+
+                if ccc_expenses_with_bank_transaction_id:
+                    split_expense_group_fields = [
+                        field for field in corporate_credit_card_expense_group_field
+                        if field not in ('expense_id', 'expense_number')
+                    ]
+                    split_expense_group_fields.append('bank_transaction_id')
+
+                    groups_with_bank_transaction_id = _group_expenses(
+                        ccc_expenses_with_bank_transaction_id,
+                        split_expense_group_fields,
+                        workspace_id,
+                    )
+                    expense_groups.extend(groups_with_bank_transaction_id)
+
+            else:
+                corporate_credit_card_expense_groups = _group_expenses(
+                    corporate_credit_card_expenses,
+                    corporate_credit_card_expense_group_field,
+                    workspace_id,
+                )
+
+                expense_groups.extend(corporate_credit_card_expense_groups)
 
         expense_group_objects = []
 

apps/workspaces/apis/export_settings/serializers.py

@@ -64,6 +64,9 @@ class ExpenseGroupSettingsSerializer(serializers.ModelSerializer):
     ccc_expense_state = serializers.CharField(
         allow_null=True, allow_blank=True, required=False
     )
+    split_expense_grouping = serializers.CharField(
+        allow_null=False, allow_blank=False, required=True
+    )
 
     class Meta:
         model = ExpenseGroupSettings
@@ -74,6 +77,7 @@ class Meta:
             "corporate_credit_card_expense_group_fields",
             "ccc_export_date_type",
             "ccc_expense_state",
+            "split_expense_grouping",
         ]
 
 

sql/scripts/027-default-split-expense-grouping-for-old-orgs.sql

@@ -0,0 +1,5 @@
+rollback;
+begin;
+
+UPDATE expense_group_settings
+SET split_expense_grouping = 'SINGLE_LINE_ITEM';