From d497e69d140ffd9ace96d85bebdfa3e6449f6927 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Wed, 7 Aug 2024 16:37:43 +0100 Subject: [PATCH 1/3] Change LTR to 76 --- mail/enums.py | 2 +- mail/tests/test_enums.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/enums.py b/mail/enums.py index 2364d4af..2ef1ba36 100644 --- a/mail/enums.py +++ b/mail/enums.py @@ -191,7 +191,7 @@ class UnitMapping(enum.Enum): KGM = 23 # kilogram MTK = 45 # meters_squared MTR = 57 # meters - LTR = 94 # litre + LTR = 76 # litre MTQ = 2 # meters_cubed MLT = 74 # millilitre ITG = 30 # intangible diff --git a/mail/tests/test_enums.py b/mail/tests/test_enums.py index 06f86603..33011b18 100644 --- a/mail/tests/test_enums.py +++ b/mail/tests/test_enums.py @@ -11,7 +11,7 @@ def test_convert_code(self): ("KGM", 23), ("MTK", 45), ("MTR", 57), - ("LTR", 94), + ("LTR", 76), ("MTQ", 2), ("MLT", 74), ("ITG", 30), From 953e5d51e00849e86f121abb5673f63a69adff70 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Wed, 7 Aug 2024 16:38:19 +0100 Subject: [PATCH 2/3] Change MTQ to 87 --- mail/enums.py | 2 +- mail/tests/test_enums.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/enums.py b/mail/enums.py index 2ef1ba36..4fe75d11 100644 --- a/mail/enums.py +++ b/mail/enums.py @@ -192,7 +192,7 @@ class UnitMapping(enum.Enum): MTK = 45 # meters_squared MTR = 57 # meters LTR = 76 # litre - MTQ = 2 # meters_cubed + MTQ = 87 # meters_cubed MLT = 74 # millilitre ITG = 30 # intangible MGM = 111 # milligram diff --git a/mail/tests/test_enums.py b/mail/tests/test_enums.py index 33011b18..be4ce86d 100644 --- a/mail/tests/test_enums.py +++ b/mail/tests/test_enums.py @@ -12,7 +12,7 @@ def test_convert_code(self): ("MTK", 45), ("MTR", 57), ("LTR", 76), - ("MTQ", 2), + ("MTQ", 87), ("MLT", 74), ("ITG", 30), ("MGM", 111), From c71750e8063b8bc4a99955035c55a6d0bc37b7f8 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Thu, 8 Aug 2024 16:01:52 +0100 Subject: [PATCH 3/3] Add edi tests --- mail/tests/files/licence_payload_file | 7 +++++++ mail/tests/test_end_to_end.py | 5 +++-- mail/tests/test_licence_to_edifact.py | 10 ++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mail/tests/files/licence_payload_file b/mail/tests/files/licence_payload_file index 62a442ad..02c81bf2 100644 --- a/mail/tests/files/licence_payload_file +++ b/mail/tests/files/licence_payload_file @@ -76,6 +76,13 @@ "description": "", "unit": "MIM", "quantity": 20.0 + }, + { + "id": "b642b709-36c7-4010-8e43-e7b8813fbde9", + "name": "A bottle of water", + "description": "", + "unit": "LTR", + "quantity": 1.0 } ] } diff --git a/mail/tests/test_end_to_end.py b/mail/tests/test_end_to_end.py index cf021438..81039364 100644 --- a/mail/tests/test_end_to_end.py +++ b/mail/tests/test_end_to_end.py @@ -51,8 +51,9 @@ def test_send_email_to_hmrc_e2e(self, mock_cache): 11\line\5\\\\\Chemical\Q\\110\\20.0\\\\\\ 12\line\6\\\\\Chemical\Q\\074\\20.0\\\\\\ 13\line\7\\\\\Old Chemical\Q\\111\\20.0\\\\\\ -14\end\licence\13 -15\fileTrailer\1""" +14\line\8\\\\\A bottle of water\Q\\076\\1.0\\\\\\ +15\end\licence\14 +16\fileTrailer\1""" assert body == expected_mail_body # nosec encoded_reference_code = quote("GBSIEL/2020/0000001/P", safe="") response = self.client.get(f"{reverse('mail:licence')}?id={encoded_reference_code}") diff --git a/mail/tests/test_licence_to_edifact.py b/mail/tests/test_licence_to_edifact.py index 74372e06..cc0cf4ab 100644 --- a/mail/tests/test_licence_to_edifact.py +++ b/mail/tests/test_licence_to_edifact.py @@ -53,8 +53,9 @@ def test_single_siel(self): + "\n11\\line\\5\\\\\\\\\\Chemical\\Q\\\\110\\\\20.0\\\\\\\\\\\\" + "\n12\\line\\6\\\\\\\\\\Chemical\\Q\\\\074\\\\20.0\\\\\\\\\\\\" + "\n13\\line\\7\\\\\\\\\\Old Chemical\\Q\\\\111\\\\20.0\\\\\\\\\\\\" - + "\n14\\end\\licence\\13" - + "\n15\\fileTrailer\\1\n" + + "\n14\\line\\8\\\\\\\\\\A bottle of water\\Q\\\\076\\\\1.0\\\\\\\\\\\\" + + "\n15\\end\\licence\\14" + + "\n16\\fileTrailer\\1\n" ) self.assertEqual(result, expected) @@ -122,8 +123,9 @@ def test_update_edifact_file(self): + "\n13\\line\\5\\\\\\\\\\Chemical\\Q\\\\110\\\\20.0\\\\\\\\\\\\" + "\n14\\line\\6\\\\\\\\\\Chemical\\Q\\\\074\\\\20.0\\\\\\\\\\\\" + "\n15\\line\\7\\\\\\\\\\Old Chemical\\Q\\\\111\\\\20.0\\\\\\\\\\\\" - + "\n16\\end\\licence\\13" - + "\n17\\fileTrailer\\2\n" + + "\n16\\line\\8\\\\\\\\\\A bottle of water\\Q\\\\076\\\\1.0\\\\\\\\\\\\" + + "\n17\\end\\licence\\14" + + "\n18\\fileTrailer\\2\n" ) self.assertEqual(result, expected)