From 3a5d353c4b60770b0ed5ddaaa1a9caa85e66895d Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Fri, 28 Apr 2023 17:24:11 +0200
Subject: [PATCH] form: force option type to 'select' if there's 'choices'

---
 src/tests/test_questions.py |  4 ++--
 src/utils/form.py           | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/tests/test_questions.py b/src/tests/test_questions.py
index 8f8e701e9..fbbf757c9 100644
--- a/src/tests/test_questions.py
+++ b/src/tests/test_questions.py
@@ -1989,10 +1989,10 @@ def test_option_default_type_with_choices_is_select():
     }
     answers = {"some_choices": "a", "some_legacy": "a"}
 
-    options = ask_questions_and_parse_answers(questions, answers)
+    options, form = ask_questions_and_parse_answers(questions, answers)
     for option in options:
         assert option.type == "select"
-        assert option.value == "a"
+        assert form[option.id] == "a"
 
 
 @pytest.mark.skip  # we should do something with this example
diff --git a/src/utils/form.py b/src/utils/form.py
index 396419f3e..c586467fc 100644
--- a/src/utils/form.py
+++ b/src/utils/form.py
@@ -1305,15 +1305,25 @@ class OptionsModel(BaseModel):
     def options_dict_to_list(
         options: dict[str, Any], optional: bool = False
     ) -> list[dict[str, Any]]:
-        return [
-            option
-            | {
-                "id": option.get("id", id_),
-                "type": option.get("type", "select" if "choices" in option else "string"),
-                "optional": option.get("optional", optional),
+        options_list = []
+
+        for id_, data in options.items():
+            option = data | {
+                "id": data.get("id", id_),
+                "type": data.get("type", OptionType.select if "choices" in data else OptionType.string),
+                "optional": data.get("optional", optional),
             }
-            for id_, option in options.items()
-        ]
+
+            # LEGACY (`choices` in option `string` used to be valid)
+            if "choices" in option and option["type"] == OptionType.string:
+                logger.warning(
+                    f"Packagers: option {id_} has 'choices' but has type 'string', use 'select' instead to remove this warning."
+                )
+                option["type"] = OptionType.select
+
+            options_list.append(option)
+
+        return options_list
 
     def __init__(self, **kwargs) -> None:
         super().__init__(options=self.options_dict_to_list(kwargs))