Fix tests and comments

apps/netsuite/migrations/0027_auto_20240924_0614.py

@@ -0,0 +1,53 @@
+# Generated by Django 3.2.14 on 2024-09-24 06:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netsuite', '0026_auto_20240902_1650'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bill',
+            name='is_attachment_upload_failed',
+            field=models.BooleanField(default=False, help_text='Is Attachment Upload Failed'),
+        ),
+        migrations.AddField(
+            model_name='bill',
+            name='receipt_urls',
+            field=models.JSONField(help_text='Expense Receipt URL Map', null=True),
+        ),
+        migrations.AddField(
+            model_name='creditcardcharge',
+            name='is_attachment_upload_failed',
+            field=models.BooleanField(default=False, help_text='Is Attachment Upload Failed'),
+        ),
+        migrations.AddField(
+            model_name='creditcardcharge',
+            name='receipt_urls',
+            field=models.JSONField(help_text='Expense Receipt URL Map', null=True),
+        ),
+        migrations.AddField(
+            model_name='expensereport',
+            name='is_attachment_upload_failed',
+            field=models.BooleanField(default=False, help_text='Is Attachment Upload Failed'),
+        ),
+        migrations.AddField(
+            model_name='expensereport',
+            name='receipt_urls',
+            field=models.JSONField(help_text='Expense Receipt URL Map', null=True),
+        ),
+        migrations.AddField(
+            model_name='journalentry',
+            name='is_attachment_upload_failed',
+            field=models.BooleanField(default=False, help_text='Is Attachment Upload Failed'),
+        ),
+        migrations.AddField(
+            model_name='journalentry',
+            name='receipt_urls',
+            field=models.JSONField(help_text='Expense Receipt URL Map', null=True),
+        ),
+    ]

apps/netsuite/tasks.py

@@ -379,7 +379,7 @@ def upload_attachments_and_update_export(expenses: List[Expense], task_log: Task
         workspace = netsuite_credentials.workspace
 
         task_model = TASK_TYPE_MODEL_MAP[task_log.type]
-        task_model = task_model.objects.get(expense_group_id=task_log.expense_group_id)
+        task_model = task_model.objects.get(expense_group_id=task_log.expense_group_id, expense_group__workspace_id=workspace_id)
 
         platform = PlatformConnector(fyle_credentials=fyle_credentials)
 
@@ -421,7 +421,7 @@ def upload_attachments_and_update_export(expenses: List[Expense], task_log: Task
                     expense_id_receipt_url_map[expense.expense_id] = receipt_url
 
         construct_payload_and_update_export(expense_id_receipt_url_map, task_log, workspace, fyle_credentials.cluster_domain, netsuite_connection)
-        task_model.receipt_urls = json.dumps(expense_id_receipt_url_map)
+        task_model.receipt_urls = expense_id_receipt_url_map
         task_model.save()
 
     except (NetSuiteRateLimitError, NetSuiteRequestError, NetSuiteLoginError, InvalidTokenError) as exception:
@@ -563,7 +563,7 @@ def create_credit_card_charge(expense_group, task_log_id, last_export):
         if attachment_link:
             attachment_links[expense.expense_id] = attachment_link
 
-        credit_card_charge_object.receipt_urls = json.dumps(attachment_links)
+        credit_card_charge_object.receipt_urls = attachment_links
         credit_card_charge_object.save()
 
         created_credit_card_charge = netsuite_connection.post_credit_card_charge(

tests/sql_fixtures/reset_db_fixtures/reset_db.sql

@@ -225,7 +225,9 @@ CREATE TABLE public.bills (
     department_id character varying(255),
     override_tax_details boolean NOT NULL,
     class_id character varying(255),
-    is_retired boolean NOT NULL
+    is_retired boolean NOT NULL,
+    is_attachment_upload_failed boolean NOT NULL,
+    receipt_urls jsonb
 );
 
 
@@ -394,7 +396,9 @@ CREATE TABLE public.credit_card_charges (
     expense_group_id integer NOT NULL,
     reference_number character varying(255),
     department_id character varying(255),
-    class_id character varying(255)
+    class_id character varying(255),
+    is_attachment_upload_failed boolean NOT NULL,
+    receipt_urls jsonb
 );
 
 
@@ -1066,7 +1070,9 @@ CREATE TABLE public.expense_reports (
     payment_synced boolean NOT NULL,
     paid_on_netsuite boolean NOT NULL,
     credit_card_account_id character varying(255),
-    is_retired boolean NOT NULL
+    is_retired boolean NOT NULL,
+    is_attachment_upload_failed boolean NOT NULL,
+    receipt_urls jsonb
 );
 
 
@@ -1520,7 +1526,9 @@ CREATE TABLE public.journal_entries (
     location_id character varying(255),
     payment_synced boolean NOT NULL,
     paid_on_netsuite boolean NOT NULL,
-    department_id character varying(255)
+    department_id character varying(255),
+    is_attachment_upload_failed boolean NOT NULL,
+    receipt_urls jsonb
 );
 
 
@@ -2664,7 +2672,7 @@ COPY public.bill_lineitems (id, account_id, location_id, department_id, class_id
 -- Data for Name: bills; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 
-COPY public.bills (id, entity_id, accounts_payable_id, subsidiary_id, location_id, currency, memo, external_id, created_at, updated_at, expense_group_id, transaction_date, payment_synced, paid_on_netsuite, reference_number, department_id, override_tax_details, class_id, is_retired) FROM stdin;
+COPY public.bills (id, entity_id, accounts_payable_id, subsidiary_id, location_id, currency, memo, external_id, created_at, updated_at, expense_group_id, transaction_date, payment_synced, paid_on_netsuite, reference_number, department_id, override_tax_details, class_id, is_retired, is_attachment_upload_failed, receipt_urls) FROM stdin;
 \.
 
 
@@ -2704,7 +2712,7 @@ COPY public.credit_card_charge_lineitems (id, account_id, location_id, departmen
 -- Data for Name: credit_card_charges; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 
-COPY public.credit_card_charges (id, credit_card_account_id, entity_id, subsidiary_id, location_id, currency, memo, external_id, transaction_date, created_at, updated_at, expense_group_id, reference_number, department_id, class_id) FROM stdin;
+COPY public.credit_card_charges (id, credit_card_account_id, entity_id, subsidiary_id, location_id, currency, memo, external_id, transaction_date, created_at, updated_at, expense_group_id, reference_number, department_id, class_id, is_attachment_upload_failed, receipt_urls) FROM stdin;
 \.
 
 
@@ -7976,6 +7984,7 @@ COPY public.django_migrations (id, app, name, applied) FROM stdin;
 195	fyle	0032_alter_expensefilter_custom_field_type	2024-05-14 13:47:37.73285+00
 196	fyle	0033_expense_paid_on_fyle	2024-06-18 16:52:33.560638+00
 197	netsuite	0026_auto_20240902_1650	2024-09-02 16:50:55.770274+00
+198	netsuite	0027_auto_20240924_0614	2024-09-24 06:17:13.86751+00
 \.
 
 
@@ -11609,7 +11618,7 @@ COPY public.expense_report_lineitems (id, amount, category, class_id, customer_i
 -- Data for Name: expense_reports; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 
-COPY public.expense_reports (id, account_id, entity_id, currency, department_id, class_id, location_id, subsidiary_id, memo, external_id, created_at, updated_at, expense_group_id, transaction_date, payment_synced, paid_on_netsuite, credit_card_account_id, is_retired) FROM stdin;
+COPY public.expense_reports (id, account_id, entity_id, currency, department_id, class_id, location_id, subsidiary_id, memo, external_id, created_at, updated_at, expense_group_id, transaction_date, payment_synced, paid_on_netsuite, credit_card_account_id, is_retired, is_attachment_upload_failed, receipt_urls) FROM stdin;
 \.
 
 
@@ -11660,7 +11669,7 @@ COPY public.import_logs (id, attribute_type, status, error_log, total_batches_co
 -- Data for Name: journal_entries; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 
-COPY public.journal_entries (id, currency, subsidiary_id, memo, external_id, created_at, updated_at, expense_group_id, transaction_date, location_id, payment_synced, paid_on_netsuite, department_id) FROM stdin;
+COPY public.journal_entries (id, currency, subsidiary_id, memo, external_id, created_at, updated_at, expense_group_id, transaction_date, location_id, payment_synced, paid_on_netsuite, department_id, is_attachment_upload_failed, receipt_urls) FROM stdin;
 \.
 
 
@@ -11887,7 +11896,7 @@ SELECT pg_catalog.setval('public.django_content_type_id_seq', 47, true);
 -- Name: django_migrations_id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres
 --
 
-SELECT pg_catalog.setval('public.django_migrations_id_seq', 197, true);
+SELECT pg_catalog.setval('public.django_migrations_id_seq', 198, true);
 
 
 --

tests/test_netsuite/test_tasks.py

@@ -635,6 +635,7 @@ def __init__(self, text, status_code):
     assert credit_card_charge.currency == '1'
     assert credit_card_charge.credit_card_account_id == '10'
     assert credit_card_charge.external_id == 'cc-charge 2 - [email protected]'
+    assert credit_card_charge.receipt_urls == {'txy6folbrG2j': 'https://aaa.bbb.cc/x232sds'}
 
     task_log.status = 'READY'
     task_log.save()
@@ -823,7 +824,7 @@ def test_check_netsuite_object_status_exception(create_bill_task, create_expense
         check_netsuite_object_status(1)
 
 
-def test_load_attachments(db, add_netsuite_credentials, add_fyle_credentials, mocker):
+def test_load_attachments(db, add_netsuite_credentials, add_fyle_credentials, create_credit_card_charge, mocker):
     mocker.patch(
         'netsuitesdk.api.folders.Folders.post',
         return_value={'internalId': 'qwertyui', 'externalId': 'sdfghjk'}
@@ -859,10 +860,12 @@ def test_load_attachments(db, add_netsuite_credentials, add_fyle_credentials, mo
     expense.file_ids = ['sdfghjk']
     expense.save()
 
+    credit_card_charge_object = CreditCardCharge.objects.filter().first()
+
     netsuite_credentials = NetSuiteCredentials.objects.get(workspace_id=1)
     netsuite_connection = NetSuiteConnector(netsuite_credentials, expense_group.workspace_id)
 
-    attachment = load_attachments(netsuite_connection, expense_group.expenses.first(), expense_group)
+    attachment = load_attachments(netsuite_connection, expense_group.expenses.first(), expense_group, credit_card_charge_object)
     assert attachment == 'https://aaa.bbb.cc/x232sds'
 
     mocker.patch(
@@ -876,12 +879,13 @@ def test_load_attachments(db, add_netsuite_credentials, add_fyle_credentials, mo
         }]
     )
 
-    attachment = load_attachments(netsuite_connection, expense_group.expenses.first(), expense_group)
+    attachment = load_attachments(netsuite_connection, expense_group.expenses.first(), expense_group, credit_card_charge_object)
     assert attachment == None
 
     fyle_credentials = FyleCredential.objects.get(workspace_id=1)
     fyle_credentials.delete()
-    attachment = load_attachments(netsuite_connection, expense_group.expenses.first(), expense_group)
+    attachment = load_attachments(netsuite_connection, expense_group.expenses.first(), expense_group, credit_card_charge_object)
+    assert credit_card_charge_object.is_attachment_upload_failed == True
 
 
 def test_create_or_update_employee_mapping(mocker, db):
@@ -1621,6 +1625,8 @@ def test_upload_attachments_and_update_export(mocker, db):
     # asserting if the file is present
     lineitem = BillLineitem.objects.get(expense_id=1)
     assert lineitem.netsuite_receipt_url == 'https://aaa.bbb.cc/x232sds'
+    bill_object = Bill.objects.get(expense_group=expense_group)
+    assert bill_object.receipt_urls == {'txjvDntD9ZXR': 'https://aaa.bbb.cc/x232sds'}
 
 
     # mocking journal entry creation with the file being present
@@ -1657,6 +1663,8 @@ def test_upload_attachments_and_update_export(mocker, db):
     # asserting if the file is present
     lineitem = JournalEntryLineItem.objects.get(expense_id=1)
     assert lineitem.netsuite_receipt_url == 'https://aaa.bbb.cc/x232sds'
+    journal_entry_object = JournalEntry.objects.get(expense_group=expense_group)
+    assert journal_entry_object.receipt_urls == {'txjvDntD9ZXR': 'https://aaa.bbb.cc/x232sds'}
 
 
     #mocking expense report creation with the file being present
@@ -1693,6 +1701,8 @@ def test_upload_attachments_and_update_export(mocker, db):
     # asserting if the file is present
     lineitem = ExpenseReportLineItem.objects.get(expense_id=1)
     assert lineitem.netsuite_receipt_url == 'https://aaa.bbb.cc/x232sds'
+    expense_report_object = ExpenseReport.objects.get(expense_group=expense_group)
+    assert expense_report_object.receipt_urls == {'txjvDntD9ZXR': 'https://aaa.bbb.cc/x232sds'}
 
 
 def test_skipping_bill_creation(db, mocker):