Skip to content

Commit

Permalink
Merge pull request #2148 from uktrade/dev
Browse files Browse the repository at this point in the history 
UAT Release
  • Loading branch information
@currycoder
currycoder authored Aug 21, 2024
2 parents 96cf543 + 36a4bfa commit eecd2ce
Show file tree
Hide file tree
Showing 2 changed files with 189 additions and 40 deletions.
9 changes: 9 additions & 0 deletions api/applications/serializers/standard_application.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,15 @@ def get_is_amended(self, instance):

class StandardApplicationDataWorkspaceSerializer(StandardApplicationViewSerializer):
goods = GoodOnApplicationDataWorkspaceSerializer(many=True, read_only=True)
amendment_of = serializers.UUIDField(source="amendment_of.id", default=None)
superseded_by = serializers.UUIDField(source="superseded_by.id", default=None)

class Meta:
model = StandardApplication
fields = StandardApplicationViewSerializer.Meta.fields + (
"amendment_of",
"superseded_by",
)


class StandardApplicationCreateSerializer(GenericApplicationCreateSerializer):
Expand Down
220 changes: 180 additions & 40 deletions api/data_workspace/v1/tests/test_applications_views.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
from django.urls import reverse
from rest_framework import status
from rest_framework.fields import DateTimeField

from urllib import parse

from api.applications.enums import ApplicationExportType, ApplicationExportLicenceOfficialType
from test_helpers.clients import DataTestClient
from api.applications.models import GoodOnApplication, GoodOnApplicationControlListEntry
from api.cases.enums import CaseTypeReferenceEnum
from api.applications.tests.factories import StandardApplicationFactory
from api.organisations.tests.factories import OrganisationFactory
from api.flags.enums import FlagLevels
from api.flags.tests.factories import FlagFactory
from api.goods.tests.factories import GoodFactory
Expand All @@ -31,49 +34,186 @@ def setUp(self):
test_host, reverse("data_workspace:v1:dw-denial-match-on-applications-list")
)

def test_dw_standard_application_views(self):
data = {
"name": "Test",
"application_type": CaseTypeReferenceEnum.SIEL,
"export_type": ApplicationExportType.TEMPORARY,
"have_you_been_informed": ApplicationExportLicenceOfficialType.YES,
"reference_number_on_information_form": "123",
}
def test_dw_standard_application_GET(self):
organisation = OrganisationFactory(type="commercial")
standard_application = StandardApplicationFactory(
name="Test",
export_type=ApplicationExportType.TEMPORARY,
have_you_been_informed=ApplicationExportLicenceOfficialType.YES,
reference_number_on_information_form="123",
organisation=organisation,
)

response = self.client.post(reverse("applications:applications"), data, **self.exporter_headers)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
drf_str_datetime = DateTimeField().to_representation
response = self.client.get(self.standard_applications)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(
response.json(),
{
"count": 1,
"next": None,
"previous": None,
"results": [
{
"activity": "Trade",
"additional_documents": [],
"agreed_to_foi": None,
"amendment_of": None,
"appeal": None,
"appeal_deadline": None,
"case": str(standard_application.id),
"case_officer": None,
"case_type": {
"id": "00000000-0000-0000-0000-000000000004",
"reference": {"key": "siel", "value": "Standard Individual Export " "Licence"},
"sub_type": {"key": "standard", "value": "Standard Licence"},
"type": {"key": "application", "value": "Application"},
},
"compliant_limitations_eu_ref": None,
"consignee": None,
"created_at": drf_str_datetime(standard_application.created_at),
"denial_matches": [],
"destinations": {"data": "", "type": "end_user"},
"end_user": None,
"export_type": {"key": "temporary", "value": "Temporary"},
"f1686_approval_date": None,
"f1686_contracting_authority": None,
"f1686_reference_number": None,
"f680_reference_number": None,
"foi_reason": "",
"goods": [],
"goods_locations": {},
"goods_recipients": "direct_to_end_user",
"goods_starting_point": "GB",
"have_you_been_informed": "yes",
"id": str(standard_application.id),
"inactive_parties": [],
"informed_wmd_ref": None,
"intended_end_use": "this is our intended end use",
"is_amended": False,
"is_compliant_limitations_eu": None,
"is_eu_military": False,
"is_informed_wmd": False,
"is_major_editable": False,
"is_military_end_use_controls": False,
"is_mod_security_approved": False,
"is_shipped_waybill_or_lading": True,
"is_suspected_wmd": False,
"is_temp_direct_control": None,
"last_closed_at": None,
"licence": None,
"military_end_use_controls_ref": None,
"name": "Test",
"non_waybill_or_lading_route_details": None,
"organisation": {
"created_at": drf_str_datetime(organisation.created_at),
"documents": [],
"eori_number": organisation.eori_number,
"flags": None,
"id": str(organisation.id),
"name": organisation.name,
"phone_number": "",
"primary_site": {
"address": {
"address_line_1": organisation.primary_site.address.address_line_1,
"address_line_2": organisation.primary_site.address.address_line_2,
"city": organisation.primary_site.address.city,
"country": {
"id": organisation.primary_site.address.country.id,
"is_eu": organisation.primary_site.address.country.is_eu,
"name": organisation.primary_site.address.country.name,
"report_name": organisation.primary_site.address.country.report_name,
"type": organisation.primary_site.address.country.type,
},
"id": str(organisation.primary_site.address.id),
"postcode": organisation.primary_site.address.postcode,
"region": organisation.primary_site.address.region,
},
"id": str(organisation.primary_site.id),
"name": organisation.primary_site.name,
"records_located_at": {
"address": {
"address_line_1": organisation.primary_site.site_records_located_at.address.address_line_1,
"address_line_2": organisation.primary_site.site_records_located_at.address.address_line_2,
"city": organisation.primary_site.site_records_located_at.address.city,
"country": {
"name": organisation.primary_site.site_records_located_at.address.country.name,
},
"postcode": organisation.primary_site.site_records_located_at.address.postcode,
"region": organisation.primary_site.site_records_located_at.address.region,
},
"id": str(organisation.primary_site.site_records_located_at.id),
"name": organisation.primary_site.site_records_located_at.name,
},
},
"registration_number": organisation.registration_number,
"sic_number": organisation.sic_number,
"status": {"key": "active", "value": "Active"},
"type": {"key": "commercial", "value": "Commercial Organisation"},
"updated_at": drf_str_datetime(organisation.updated_at),
"vat_number": organisation.vat_number,
"website": "",
},
"other_security_approval_details": None,
"proposed_return_date": None,
"reference_code": standard_application.reference_code,
"reference_number_on_information_form": "123",
"sanction_matches": [],
"security_approvals": None,
"sla_days": 0,
"sla_remaining_days": None,
"sla_updated_at": None,
"status": {
"id": "00000000-0000-0000-0000-000000000001",
"key": "submitted",
"value": "Submitted",
},
"sub_status": None,
"subject_to_itar_controls": None,
"submitted_at": None,
"submitted_by": standard_application.submitted_by.baseuser_ptr.get_full_name(),
"superseded_by": None,
"suspected_wmd_ref": None,
"temp_direct_control_details": None,
"temp_export_details": None,
"third_parties": [],
"trade_control_activity": {"key": None, "value": None},
"trade_control_product_categories": [],
"ultimate_end_users": [],
"updated_at": drf_str_datetime(standard_application.updated_at),
"usage": "Trade",
}
],
},
)

response = self.client.options(self.standard_applications)
def test_dw_standard_application_GET_amendment_application(self):
superseded_application = StandardApplicationFactory()
amendment_application = StandardApplicationFactory(
amendment_of=superseded_application,
)

drf_str_datetime = DateTimeField().to_representation
response = self.client.get(self.standard_applications)
self.assertEqual(response.status_code, status.HTTP_200_OK)
actual_keys = response.json()["actions"]["GET"].keys()
expected_keys = (
"id",
"name",
"organisation",
"case_type",
"export_type",
"created_at",
"updated_at",
"submitted_at",
"submitted_by",
"status",
"case",
"reference_code",
"case_officer",
"agreed_to_foi",
"foi_reason",
"end_user",
"consignee",
"goods",
"have_you_been_informed",
"activity",
"destinations",
"denial_matches",
"licence",
"is_amended",

results = response.json()["results"]

superseded_application_response = results[0]
self.assertEqual(superseded_application_response["id"], str(superseded_application.id))
self.assertEqual(
superseded_application_response["superseded_by"],
str(amendment_application.id),
)
for key in expected_keys:
self.assertTrue(key in actual_keys)
self.assertEqual(superseded_application_response["amendment_of"], None)

amended_application_response = results[1]
self.assertEqual(amended_application_response["id"], str(amendment_application.id))
self.assertEqual(
amended_application_response["amendment_of"],
str(superseded_application.id),
)
self.assertEqual(amended_application_response["superseded_by"], None)

def test_dw_good_on_application_views_OPTIONS(self):
self.good = GoodFactory(
Expand Down

0 comments on commit eecd2ce

Please sign in to comment.