Handle onboarding phase token expiry and add report_id to expense_gro…

…ups/ response (#528) * Handle onboarding phase token expiry * add report_id to expense group response
fylein · Dec 19, 2023 · fb9d62e · fb9d62e
1 parent a19590f
commit fb9d62e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/fyle/serializers.py b/apps/fyle/serializers.py
@@ -21,7 +21,7 @@ class ExpenseSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Expense
-        fields = ['updated_at', 'claim_number', 'employee_email', 'employee_name', 'fund_source', 'expense_number', 'payment_number', 'vendor', 'category', 'amount']
+        fields = ['updated_at', 'claim_number', 'employee_email', 'employee_name', 'fund_source', 'expense_number', 'payment_number', 'vendor', 'category', 'amount', 'report_id']
 
 
 class ExpenseGroupSerializer(serializers.ModelSerializer):

diff --git a/apps/workspaces/views.py b/apps/workspaces/views.py
@@ -125,9 +125,9 @@ def get(self, request, **kwargs):
         """
         Get QBO Credentials in Workspace
         """
-        qbo_credentials = QBOCredential.objects.get(workspace=kwargs['workspace_id'], is_expired=False)
+        qbo_credentials = QBOCredential.objects.get(workspace=kwargs['workspace_id'])
 
-        return Response(data=QBOCredentialSerializer(qbo_credentials).data, status=status.HTTP_200_OK if qbo_credentials.refresh_token else status.HTTP_400_BAD_REQUEST)
+        return Response(data=QBOCredentialSerializer(qbo_credentials).data, status=status.HTTP_200_OK if qbo_credentials.refresh_token and not qbo_credentials.is_expired else status.HTTP_400_BAD_REQUEST)
 
 
 class GeneralSettingsView(generics.RetrieveAPIView):