From 3f76c594b2e41f466a3e705362f707ba1459430c Mon Sep 17 00:00:00 2001 From: nriss Date: Tue, 13 Jul 2021 11:28:08 +0200 Subject: [PATCH 1/4] fix(map_priority) : priority starts from 1 and not from 0 --- django/common/scripts/cleaning/map_priority.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/django/common/scripts/cleaning/map_priority.py b/django/common/scripts/cleaning/map_priority.py index 7cb24f8dd..ee871ee91 100644 --- a/django/common/scripts/cleaning/map_priority.py +++ b/django/common/scripts/cleaning/map_priority.py @@ -11,12 +11,12 @@ class Priority(Enum): def map_priority(raw_input): """Map int to ServiceRequest.priority (0: stat, 1: asap, 2: urgent, 3+ routine)""" mapping = { - "0": Priority.STAT.value, - "1": Priority.ASAP.value, - "2": Priority.URGENT.value, - "3": Priority.ROUTINE.value, + "1": Priority.STAT.value, + "2": Priority.ASAP.value, + "3": Priority.URGENT.value, + "4": Priority.ROUTINE.value, } if str(raw_input) in mapping.keys(): return mapping[str(raw_input)] else: - return mapping["3"] + return mapping["4"] From 5f712f2bc8594fb4945db185712cc4a6d09ffacd Mon Sep 17 00:00:00 2001 From: nriss Date: Tue, 13 Jul 2021 11:38:14 +0200 Subject: [PATCH 2/4] take Simon suggestion --- django/common/scripts/cleaning/map_priority.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/django/common/scripts/cleaning/map_priority.py b/django/common/scripts/cleaning/map_priority.py index ee871ee91..287339c2a 100644 --- a/django/common/scripts/cleaning/map_priority.py +++ b/django/common/scripts/cleaning/map_priority.py @@ -16,7 +16,8 @@ def map_priority(raw_input): "3": Priority.URGENT.value, "4": Priority.ROUTINE.value, } - if str(raw_input) in mapping.keys(): + try: return mapping[str(raw_input)] - else: - return mapping["4"] + except KeyError: + # if the code is unknown, use "ROUTINE" as default value + return Priority.ROUTINE.value From 51d2db1fb9a3db2b762a6e1c298775280df25d0f Mon Sep 17 00:00:00 2001 From: nriss Date: Tue, 13 Jul 2021 12:09:33 +0200 Subject: [PATCH 3/4] fix(tests): update unit test for map_priority --- .../scripts/cleaning/test_map_priority.py | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tests/common/scripts/cleaning/test_map_priority.py b/tests/common/scripts/cleaning/test_map_priority.py index dc436682d..251095ae0 100644 --- a/tests/common/scripts/cleaning/test_map_priority.py +++ b/tests/common/scripts/cleaning/test_map_priority.py @@ -5,27 +5,27 @@ def test_map_priority(): raw_input_1 = "0" output_1 = map_priority(raw_input_1) - assert output_1 == "stat" + assert output_1 == "routine" raw_input_2 = 0 output_2 = map_priority(raw_input_2) - assert output_2 == "stat" + assert output_2 == "routine" raw_input_3 = "1" output_3 = map_priority(raw_input_3) - assert output_3 == "asap" + assert output_3 == "stat" raw_input_4 = 1 output_4 = map_priority(raw_input_4) - assert output_4 == "asap" + assert output_4 == "stat" raw_input_5 = "2" output_5 = map_priority(raw_input_5) - assert output_5 == "urgent" + assert output_5 == "asap" raw_input_6 = 2 output_6 = map_priority(raw_input_6) - assert output_6 == "urgent" + assert output_6 == "asap" raw_input_7 = "50" output_7 = map_priority(raw_input_7) @@ -42,3 +42,11 @@ def test_map_priority(): raw_input_10 = -1 output_10 = map_priority(raw_input_10) assert output_10 == "routine" + + raw_input_11 = "3" + output_11 = map_priority(raw_input_11) + assert output_11 == "urgent" + + raw_input_12 = 3 + output_12 = map_priority(raw_input_12) + assert output_12 == "urgent" From 535ba2bf5eff264e2e88e76023071f59e4c7472e Mon Sep 17 00:00:00 2001 From: nriss Date: Tue, 13 Jul 2021 14:56:07 +0200 Subject: [PATCH 4/4] fix(script_summary): update map_priority definition --- django/common/scripts/cleaning/map_priority.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/common/scripts/cleaning/map_priority.py b/django/common/scripts/cleaning/map_priority.py index 287339c2a..f0e5f9d2d 100644 --- a/django/common/scripts/cleaning/map_priority.py +++ b/django/common/scripts/cleaning/map_priority.py @@ -9,7 +9,7 @@ class Priority(Enum): def map_priority(raw_input): - """Map int to ServiceRequest.priority (0: stat, 1: asap, 2: urgent, 3+ routine)""" + """Map int to ServiceRequest.priority (1: stat, 2: asap, 3: urgent, else: routine)""" mapping = { "1": Priority.STAT.value, "2": Priority.ASAP.value,