Skip to content

Commit cc5a111

Browse files
committed
fix(eap): Update export url on eap
1 parent d5616b4 commit cc5a111

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

api/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2623,7 +2623,7 @@ def create(self, validated_data):
26232623
Export.ExportType.SIMPLIFIED_EAP,
26242624
Export.ExportType.FULL_EAP,
26252625
]:
2626-
validated_data["url"] = f"{settings.GO_WEB_INTERNAL_URL}/eap/{export_id}/{export_type}/export/"
2626+
validated_data["url"] = f"{settings.GO_WEB_INTERNAL_URL}/eap/{export_id}/export/"
26272627
# NOTE: EAP exports with diff view only for EAPs exports
26282628
if version:
26292629
validated_data["url"] += f"?version={version}"

eap/test_views.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,7 +1656,7 @@ def test_simplified_eap_export(self, mock_generate_url):
16561656
self.assert_201(response)
16571657
self.assertIsNotNone(response.data["id"], response.data)
16581658

1659-
expected_url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/{Export.ExportType.SIMPLIFIED_EAP}/export/"
1659+
expected_url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/export/"
16601660
self.assertEqual(response.data["url"], expected_url)
16611661
self.assertEqual(response.data["status"], Export.ExportStatus.PENDING)
16621662

@@ -1687,9 +1687,7 @@ def test_simplified_eap_export(self, mock_generate_url):
16871687
self.assert_201(response)
16881688
self.assertIsNotNone(response.data["id"], response.data)
16891689

1690-
expected_url = (
1691-
f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/{Export.ExportType.SIMPLIFIED_EAP}/export/?version=2"
1692-
)
1690+
expected_url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/export/?version=2"
16931691
self.assertEqual(response.data["url"], expected_url)
16941692

16951693
@mock.patch("api.serializers.generate_url.delay")
@@ -1728,7 +1726,7 @@ def test_full_eap_export(self, mock_generate_url):
17281726
response = self.client.post(self.url, data, format="json")
17291727
self.assert_201(response)
17301728
self.assertIsNotNone(response.data["id"], response.data)
1731-
expected_url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/{Export.ExportType.FULL_EAP}/export/"
1729+
expected_url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/export/"
17321730
self.assertEqual(response.data["url"], expected_url)
17331731
self.assertEqual(response.data["status"], Export.ExportStatus.PENDING)
17341732

@@ -1780,9 +1778,7 @@ def test_diff_export_eap(self, mock_generate_url):
17801778
self.assert_201(response)
17811779
self.assertIsNotNone(response.data["id"], response.data)
17821780

1783-
expected_url = (
1784-
f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/{Export.ExportType.SIMPLIFIED_EAP}/export/?diff=true"
1785-
)
1781+
expected_url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/export/?diff=true"
17861782
self.assertEqual(response.data["url"], expected_url)
17871783

17881784
self.assertEqual(mock_generate_url.called, True)

0 commit comments

Comments
 (0)