fyle-integrations-platform-connector 2.2.0__tar.gz → 2.2.2__tar.gz

{fyle_integrations_platform_connector-2.2.0 → fyle_integrations_platform_connector-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fyle-integrations-platform-connector
-Version: 2.2.0
+Version: 2.2.2
 Summary: A common platform connector for all the Fyle Integrations to interact with Fyle Platform APIs
 Home-page: https://github.com/fylein/fyle-integrations-platform-connector
 Author: Shwetabh Kumar

{fyle_integrations_platform_connector-2.2.0 → fyle_integrations_platform_connector-2.2.2}/fyle_integrations_platform_connector/apis/expenses.py

@@ -157,13 +157,25 @@ class Expenses(Base):
             for custom_field in expense['custom_fields']:
                 custom_properties[custom_field['name']] = custom_field['value']
             
+
+            corporate_card_id = None
+            masked_corporate_card_number = None
+            
             matched_transaction = expense['matched_corporate_card_transactions'][0] if expense['matched_corporate_card_transactions'] else None
             if not matched_transaction and expense['matched_corporate_card_transaction_ids']:
                 matched_transaction = self.get_transaction_by_id(expense['matched_corporate_card_transaction_ids'][0])
                 if matched_transaction:
                     logger.info(f"Matched transaction for expense {expense['id']}: {matched_transaction}")
                     matched_transaction = matched_transaction[0]
+                    corporate_card_id = matched_transaction.get('corporate_card_id')
+                    masked_corporate_card_number = matched_transaction['corporate_card']['masked_number']
+            elif expense['matched_corporate_card_transactions']:
+                corporate_card_id = matched_transaction.get('corporate_card_id')
+                masked_corporate_card_number = matched_transaction.get('masked_corporate_card_number')
+
             posted_at = matched_transaction['posted_at'] if matched_transaction and 'posted_at' in matched_transaction else None
+            
+
             if self.attribute_is_valid(expense):
                 objects.append({
                     'id': expense['id'],
@@ -188,10 +200,8 @@ class Expenses(Base):
                     'state': expense['state'],
                     'vendor': expense['merchant'],
                     'cost_center': expense['cost_center']['name'] if expense['cost_center'] else None,
-                    'corporate_card_id': expense['matched_corporate_card_transactions'][0]['corporate_card_id'] \
-                        if expense['matched_corporate_card_transactions'] else None,
-                    'masked_corporate_card_number': expense['matched_corporate_card_transactions'][0].get('masked_corporate_card_number') \
-                        if expense['matched_corporate_card_transactions'] else None,
+                    'corporate_card_id': corporate_card_id,
+                    'masked_corporate_card_number': masked_corporate_card_number,
                     'bank_transaction_id': matched_transaction['id'] if matched_transaction else None,
                     'purpose': expense['purpose'],
                     'report_id': expense['report_id'],

{fyle_integrations_platform_connector-2.2.0 → fyle_integrations_platform_connector-2.2.2}/fyle_integrations_platform_connector.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fyle-integrations-platform-connector
-Version: 2.2.0
+Version: 2.2.2
 Summary: A common platform connector for all the Fyle Integrations to interact with Fyle Platform APIs
 Home-page: https://github.com/fylein/fyle-integrations-platform-connector
 Author: Shwetabh Kumar

{fyle_integrations_platform_connector-2.2.0 → fyle_integrations_platform_connector-2.2.2}/setup.py

@@ -5,7 +5,7 @@ with open('../README.md', 'r', encoding='utf-8') as f:
 
 setuptools.setup(
     name='fyle-integrations-platform-connector',
-    version='2.2.0',
+    version='2.2.2',
     author='Shwetabh Kumar',
     author_email='shwetabh.kumar@fyle.in',
     description='A common platform connector for all the Fyle Integrations to interact with Fyle Platform APIs',