refactor: move get_answer_and_right_answer from each game to utils

Author: ZLOI27

brain_games/games/calc.py

@@ -1,13 +1,5 @@
 import random
 
-from brain_games.scripts.utils import ask_answer
-
-
-def get_answer_and_right_answer(expression: str) -> tuple:
-    answer = ask_answer()
-    right_answer = get_right_answer(expression)
-    return (answer, right_answer)
-
 
 def get_question_msg() -> str:
     left_num = random.randint(0, 100)

brain_games/games/even.py

@@ -1,16 +1,8 @@
 import random
 
-from brain_games.scripts.utils import ask_answer
 
-
-def get_answer_and_right_answer(number: int) -> tuple:
-    answer = ask_answer()
-    right_answer = 'yes' if is_even(number) else 'no'
-    return (answer, right_answer)
-
-
-def get_question_msg() -> int:
-    return random.randint(0, 100)
+def get_question_msg() -> str:
+    return str(random.randint(0, 100))
 
 
 def is_even(number: int) -> bool:
@@ -20,5 +12,9 @@ def is_even(number: int) -> bool:
         return False
 
 
+def get_right_answer(expression: str) -> str:
+    return 'yes' if is_even(int(expression)) else 'no'
+
+
 def get_msg_game_rules() -> str:
     return "Answer \"yes\" if the number is even, otherwise answer \"no\"."

brain_games/games/gcd.py

@@ -1,13 +1,5 @@
 import random
 
-from brain_games.scripts.utils import ask_answer
-
-
-def get_answer_and_right_answer(expression: str) -> tuple:
-    answer = ask_answer()
-    right_answer = get_right_answer(expression)
-    return (answer, right_answer)
-
 
 def get_question_msg() -> str:
     left_num = random.randint(0, 100)

brain_games/games/prime.py

@@ -1,13 +1,5 @@
 import random
 
-from brain_games.scripts.utils import ask_answer
-
-
-def get_answer_and_right_answer(expression: str) -> tuple:
-    answer = ask_answer()
-    right_answer = get_right_answer(expression)
-    return (answer, right_answer)
-
 
 def get_question_msg() -> str:
     number = random.randint(0, 100)

brain_games/games/progression.py

@@ -1,16 +1,8 @@
 import random
 
-from brain_games.scripts.utils import ask_answer
-
 hidden_number: str
 
 
-def get_answer_and_right_answer(expression: str) -> tuple:
-    answer = ask_answer()
-    right_answer = get_right_answer(expression)
-    return (answer, right_answer)
-
-
 def get_question_msg() -> str:
     length = random.randint(5, 10)
     position = random.randint(0, length - 1)

brain_games/scripts/engine.py

@@ -1,4 +1,7 @@
-from brain_games.scripts.utils import greet_and_ask_name
+from brain_games.scripts.utils import (
+    get_answer_and_right_answer,
+    greet_and_ask_name,
+)
 
 
 def engine_run(game) -> None:
@@ -7,7 +10,10 @@ def engine_run(game) -> None:
     for i in range(3):
         question_msg = game.get_question_msg()
         print(f"Question: {question_msg}")
-        answer, right_answer = game.get_answer_and_right_answer(question_msg)
+        answer, right_answer = get_answer_and_right_answer(
+            game.get_right_answer, 
+            question_msg
+        )
         if answer == right_answer:
             print('Correct!')
         else:

brain_games/scripts/utils.py

@@ -10,3 +10,12 @@ def greet_and_ask_name() -> str:
 
 def ask_answer() -> str:
     return prompt.string("Your answer: ")
+
+
+def get_answer_and_right_answer(
+    get_right_answer: callable, 
+    expression: str
+) -> tuple:
+    answer = ask_answer()
+    right_answer = get_right_answer(expression)
+    return (answer, right_answer)