Add support for editing expenses

apps/fyle/exceptions.py

@@ -5,6 +5,7 @@
 from fyle.platform.exceptions import NoPrivilegeError, RetryException, InvalidTokenError as FyleInvalidTokenError
 from rest_framework.response import Response
 from rest_framework.views import status
+from rest_framework.exceptions import ValidationError
 
 from sage_desktop_sdk.exceptions.hh2_exceptions import WrongParamsError
 from sage_desktop_api.exceptions import BulkError
@@ -90,6 +91,10 @@ def new_fn(*args, **kwargs):
                 logger.info('Bulk Error %s', exception.response)
                 return Response(data={'message': 'Bulk Error'}, status=status.HTTP_400_BAD_REQUEST)
 
+            except ValidationError as e:
+                logger.exception(e)
+                return Response({"message": e.detail}, status=status.HTTP_400_BAD_REQUEST)
+
             except Exception as exception:
                 logger.exception(exception)
                 return Response(data={'message': 'An unhandled error has occurred, please re-try later'}, status=status.HTTP_400_BAD_REQUEST)

apps/fyle/helpers.py

@@ -5,8 +5,9 @@
 from django.db.models import Q
 
 from fyle_integrations_platform_connector import PlatformConnector
+from rest_framework.exceptions import ValidationError
 
-from apps.workspaces.models import FyleCredential, ExportSetting
+from apps.workspaces.models import Workspace, FyleCredential, ExportSetting
 from apps.accounting_exports.models import AccountingExport
 from apps.fyle.models import ExpenseFilter
 from apps.fyle.constants import DEFAULT_FYLE_CONDITIONS
@@ -255,3 +256,13 @@ def get_exportable_accounting_exports_ids(workspace_id: int):
     ).values_list('id', flat=True)
 
     return accounting_export_ids
+
+
+def assert_valid_request(workspace_id:int, org_id:str):
+    """
+    Assert if the request is valid by checking
+    the url_workspace_id and fyle_org_id workspace
+    """
+    workspace = Workspace.objects.get(org_id=org_id)
+    if workspace.id != workspace_id:
+        raise ValidationError('Workspace mismatch')

apps/fyle/queue.py

@@ -3,6 +3,7 @@
     * User Triggered Async Tasks
     * Schedule Triggered Async Tasks
 """
+import logging
 from django_q.tasks import async_task
 
 from apps.fyle.tasks import (
@@ -11,6 +12,10 @@
 )
 from apps.accounting_exports.models import AccountingExport
 from apps.workspaces.models import Workspace
+from apps.fyle.helpers import assert_valid_request
+
+logger = logging.getLogger(__name__)
+logger.level = logging.INFO
 
 
 def queue_import_reimbursable_expenses(workspace_id: int, synchronous: bool = False):
@@ -61,7 +66,7 @@ def queue_import_credit_card_expenses(workspace_id: int, synchronous: bool = Fal
     import_credit_card_expenses(workspace_id, accounting_export)
 
 
-def async_handle_webhook_callback(body: dict) -> None:
+def async_handle_webhook_callback(body: dict, workspace_id: int) -> None:
     """
     Async'ly import and export expenses
     :param body: body
@@ -70,7 +75,14 @@ def async_handle_webhook_callback(body: dict) -> None:
     if body.get('action') == 'ACCOUNTING_EXPORT_INITIATED' and body.get('data'):
         org_id = body['data']['org_id']
 
+        assert_valid_request(workspace_id=workspace_id, org_id=org_id)
         workspace = Workspace.objects.get(org_id=org_id)
         queue_import_reimbursable_expenses(workspace_id=workspace.id)
         queue_import_credit_card_expenses(workspace_id=workspace.id)
         async_task('apps.workspaces.tasks.export_to_sage300', workspace.id)
+
+    elif body.get('action') == 'UPDATED_AFTER_APPROVAL' and body.get('data') and body.get('resource') == 'EXPENSE':
+        org_id = body['data']['org_id']
+        logger.info("| Updating non-exported expenses through webhook | Content: {{WORKSPACE_ID: {} Payload: {}}}".format(workspace_id, body.get('data')))
+        assert_valid_request(workspace_id=workspace_id, org_id=org_id)
+        async_task('apps.fyle.tasks.update_non_exported_expenses', body['data'])

apps/fyle/tasks.py

@@ -6,9 +6,11 @@
 """
 import logging
 from datetime import datetime
+from typing import Dict
 from django.db import transaction
 
 from fyle_integrations_platform_connector import PlatformConnector
+from fyle_integrations_platform_connector.apis.expenses import Expenses as FyleExpenses
 
 from apps.accounting_exports.models import AccountingExport
 from apps.workspaces.models import ExportSetting, Workspace, FyleCredential
@@ -120,3 +122,28 @@ def import_credit_card_expenses(workspace_id, accounting_export: AccountingExpor
     :param workspace_id: workspace id
     """
     import_expenses(workspace_id, accounting_export, 'PERSONAL_CORPORATE_CREDIT_CARD_ACCOUNT', 'CCC')
+
+
+def update_non_exported_expenses(data: Dict) -> None:
+    """
+    To update expenses not in COMPLETE, IN_PROGRESS state
+    """
+    expense_state = None
+    org_id = data['org_id']
+    expense_id = data['id']
+    workspace = Workspace.objects.get(org_id=org_id)
+    expense = Expense.objects.filter(workspace_id=workspace.id, expense_id=expense_id).first()
+
+    if expense:
+        if 'state' in expense.accounting_export_summary:
+            expense_state = expense.accounting_export_summary['state']
+        else:
+            expense_state = 'NOT_EXPORTED'
+
+        if expense_state and expense_state not in ['COMPLETE', 'IN_PROGRESS']:
+            expense_obj = []
+            expense_obj.append(data)
+            expense_objects = FyleExpenses().construct_expense_object(expense_obj, expense.workspace_id)
+            Expense.create_expense_objects(
+                expense_objects, expense.workspace_id
+            )

apps/fyle/views.py

@@ -140,6 +140,6 @@ class WebhookCallbackView(generics.CreateAPIView):
 
     @handle_view_exceptions()
     def post(self, request, *args, **kwargs):
-        async_handle_webhook_callback(request.data)
+        async_handle_webhook_callback(request.data, int(kwargs['workspace_id']))
 
         return Response(data={}, status=status.HTTP_200_OK)

requirements.txt

@@ -24,12 +24,12 @@ gevent==23.9.1
 gunicorn==20.1.0
 
 # Platform SDK
-fyle==0.36.1
+fyle==0.37.0
 
 # Reusable Fyle Packages
 fyle-rest-auth==1.7.2
 fyle-accounting-mappings==1.33.1
-fyle-integrations-platform-connector==1.37.4
+fyle-integrations-platform-connector==1.38.1
 
 
 # Postgres Dependincies