Add support for editing expenses

apps/exceptions.py

@@ -2,6 +2,7 @@
 
 from rest_framework.response import Response
 from rest_framework.views import status
+from rest_framework.exceptions import ValidationError
 from xerosdk.exceptions import (
     InternalServerError,
     InvalidClientError,
@@ -101,6 +102,13 @@ def new_fn(*args, **kwargs):
                     status=status.HTTP_500_INTERNAL_SERVER_ERROR,
                 )
 
+            except ValidationError as e:
+                logger.exception(e)
+                return Response(
+                    {"message": e.detail},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                )
+
             except Exception as exception:
                 logger.exception(exception)
                 return Response(

apps/fyle/helpers.py

@@ -5,10 +5,12 @@
 
 import requests
 from django.conf import settings
+from rest_framework.exceptions import ValidationError
+
 
 from apps.fyle.models import Expense, ExpenseGroup, ExpenseGroupSettings
 from apps.tasks.models import TaskLog
-from apps.workspaces.models import WorkspaceGeneralSettings
+from apps.workspaces.models import Workspace, WorkspaceGeneralSettings
 
 import django_filters
 
@@ -187,6 +189,16 @@ def get_batched_expenses(batched_payload: List[dict], workspace_id: int) -> List
     return Expense.objects.filter(expense_id__in=expense_ids, workspace_id=workspace_id)
 
 
+def assert_valid_request(workspace_id:int, fyle_org_id:str):
+    """
+    Assert if the request is valid by checking
+    the url_workspace_id and fyle_org_id workspace
+    """
+    workspace = Workspace.objects.get(fyle_org_id=fyle_org_id)
+    if workspace.id != workspace_id:
+        raise ValidationError('Workspace mismatch')
+
+
 class AdvanceSearchFilter(django_filters.FilterSet):
     def filter_queryset(self, queryset):
         or_filtered_queryset = queryset.none()

apps/fyle/queue.py

@@ -1,4 +1,9 @@
+import logging
 from django_q.tasks import async_task
+from apps.fyle.helpers import assert_valid_request
+
+logger = logging.getLogger(__name__)
+logger.level = logging.INFO
 
 
 def async_post_accounting_export_summary(org_id: str, workspace_id: int) -> None:
@@ -12,7 +17,7 @@ def async_post_accounting_export_summary(org_id: str, workspace_id: int) -> None
     async_task('apps.fyle.tasks.post_accounting_export_summary', org_id, workspace_id)
 
 
-def async_import_and_export_expenses(body: dict) -> None:
+def async_import_and_export_expenses(body: dict, workspace_id: int) -> None:
     """
     Async'ly import and export expenses
     :param body: body
@@ -21,4 +26,11 @@ def async_import_and_export_expenses(body: dict) -> None:
     if body.get('action') == 'ACCOUNTING_EXPORT_INITIATED' and body.get('data'):
         report_id = body['data']['id']
         org_id = body['data']['org_id']
+        assert_valid_request(workspace_id=workspace_id, fyle_org_id=org_id)
         async_task('apps.fyle.tasks.import_and_export_expenses', report_id, org_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, fyle_org_id=org_id)
+        async_task('apps.fyle.tasks.update_non_exported_expenses', body['data'])

apps/fyle/tasks.py

@@ -9,6 +9,7 @@
 from fyle.platform.exceptions import RetryException
 from fyle_accounting_mappings.models import ExpenseAttribute
 from fyle_integrations_platform_connector import PlatformConnector
+from fyle_integrations_platform_connector.apis.expenses import Expenses as FyleExpenses
 
 from apps.fyle.actions import create_generator_and_post_in_batches
 from apps.fyle.enums import ExpenseStateEnum, FundSourceEnum, PlatformExpensesEnum
@@ -308,3 +309,28 @@ def post_accounting_export_summary(org_id: str, workspace_id: int, fund_source:
         accounting_export_summary_batches
     )
     create_generator_and_post_in_batches(accounting_export_summary_batches, platform, workspace_id)
+
+
+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(fyle_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

@@ -117,7 +117,8 @@ class ExportView(generics.CreateAPIView):
     authentication_classes = []
     permission_classes = []
 
+    @handle_view_exceptions()
     def post(self, request, *args, **kwargs):
-        async_import_and_export_expenses(request.data)
+        async_import_and_export_expenses(request.data, int(kwargs['workspace_id']))
 
         return Response(data={}, status=status.HTTP_200_OK)

requirements.txt

@@ -19,7 +19,7 @@ enum34==1.1.10
 future==0.18.2
 fyle==0.37.0
 fyle-accounting-mappings==1.32.1
-fyle-integrations-platform-connector==1.38.0
+fyle-integrations-platform-connector==1.38.1
 fyle-rest-auth==1.7.2
 gevent==23.9.1
 gunicorn==20.1.0