refactoring on verification#3

Author: user-3a9afc676c66a4ad

src/games/calc.js

@@ -4,22 +4,28 @@ import getRandomInRange from '../utils.js';
 
 const questionGame = 'What is the result of the expression?';
 
+const calculation = (num1, num2, operator) => {
+  switch (operator) {
+    case '+':
+      return num1 + num2;
+    case '-':
+      return num1 - num2;
+    case '*':
+      return num1 * num2;
+    default:
+      throw new Error(`Invalid operator - ${operator}`);
+  }
+};
+
 const generateRound = () => {
   const number1 = getRandomInRange();
   const number2 = getRandomInRange();
   const operators = ['+', '-', '*'];
   const mathOperation = getRandomInRange(0, operators.length - 1);
-  const oper = operators[mathOperation];
-  const question = `Question: ${number1} ${oper} ${number2}`;
-
-  let answer = 0;
-  if (oper === '+') {
-    answer = `${number1 + number2}`;
-  } else if (oper === '-') {
-    answer = `${number1 - number2}`;
-  } else if (oper === '*') {
-    answer = `${number1 * number2}`;
-  }
+  const operator = operators[mathOperation];
+  const question = `Question: ${number1} ${operator} ${number2}`;
+
+  const answer = calculation(number1, number2, operator).toString();
 
   return [question, answer];
 };

src/games/gcd.js

@@ -4,18 +4,23 @@ import getRandomInRange from '../utils.js';
 
 const questionGame = 'Find the greatest common divisor of given numbers.';
 
+const gsd = (number1, number2) => {
+  let a = number1;
+  let b = number2;
+  while (b !== 0) {
+    const temp = b;
+    b = a % b;
+    a = temp;
+  }
+
+  return a;
+};
+
 const generateRound = () => {
-  let number1 = getRandomInRange();
-  let number2 = getRandomInRange();
+  const number1 = getRandomInRange();
+  const number2 = getRandomInRange();
   const question = `Question: ${number1} ${number2}`;
-
-  let answer = 0;
-  while (number2 !== 0) {
-    const temp = number2;
-    number2 = number1 % number2;
-    number1 = temp;
-  }
-  answer = number1.toString();
+  const answer = gsd(number1, number2).toString();
 
   return [question, answer];
 };