refactoring on verification#2

Author: user-3a9afc676c66a4ad

src/games/calc.js

@@ -4,26 +4,26 @@ import getRandomInRange from '../utils.js';
 
 const questionGame = 'What is the result of the expression?';
 
-const questionRound = () => {
+const generateRound = () => {
   const number1 = getRandomInRange();
   const number2 = getRandomInRange();
-  const arr = ['+', '-', '*'];
-  const mathOperation = Math.floor(Math.random() * arr.length);
-  const oper = arr[mathOperation];
+  const operators = ['+', '-', '*'];
+  const mathOperation = getRandomInRange(0, operators.length - 1);
+  const oper = operators[mathOperation];
   const question = `Question: ${number1} ${oper} ${number2}`;
 
-  let result = 0;
+  let answer = 0;
   if (oper === '+') {
-    result = `${number1 + number2}`;
+    answer = `${number1 + number2}`;
   } else if (oper === '-') {
-    result = `${number1 - number2}`;
+    answer = `${number1 - number2}`;
   } else if (oper === '*') {
-    result = `${number1 * number2}`;
+    answer = `${number1 * number2}`;
   }
 
-  return [question, result];
+  return [question, answer];
 };
 
-const calcGame = () => playGame(questionGame, questionRound);
+const calcGame = () => playGame(questionGame, generateRound);
 
 export default calcGame;

src/games/even.js

@@ -3,21 +3,17 @@ import playGame from '../index.js';
 import getRandomInRange from '../utils.js';
 
 const questionGame = 'Answer "yes" if the number is even, otherwise answer "no".';
+const isEven = (num) => num % 2 === 0;
 
-const questionRound = () => {
+const generateRound = () => {
   const number = getRandomInRange();
   const question = `Question: ${number}`;
 
-  let result = 0;
-  if (number % 2 === 0) {
-    result = 'yes';
-  } else if (number % 2 !== 0) {
-    result = 'no';
-  }
+  const answer = isEven(number) ? 'yes' : 'no';
 
-  return [question, result];
+  return [question, answer];
 };
 
-const evenGame = () => playGame(questionGame, questionRound);
+const evenGame = () => playGame(questionGame, generateRound);
 
 export default evenGame;

src/games/gcd.js

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

src/games/prime.js

@@ -4,23 +4,24 @@ import getRandomInRange from '../utils.js';
 
 const questionGame = 'Answer "yes" if given number is prime. Otherwise answer "no".';
 
-const questionRound = () => {
+const isPrime = (num) => {
+  if (num <= 1) return false;
+  for (let divider = 2; divider <= num / 2; divider += 1) {
+    if (num % divider === 0) return false;
+  }
+  return true;
+};
+
+const generateRound = () => {
   const number = getRandomInRange();
   const question = `Question: ${number}`;
 
-  let result = '';
-  const isPrime = () => {
-    if (number <= 1) return 'no';
-    for (let divider = 2; divider <= number / 2; divider += 1) {
-      if (number % divider === 0) return 'no';
-    }
-    return 'yes';
-  };
-  result = isPrime();
-
-  return [question, result];
+  // let answer = '';
+  const answer = isPrime(number) ? 'yes' : 'no';
+
+  return [question, answer];
 };
 
-const primeGame = () => playGame(questionGame, questionRound);
+const primeGame = () => playGame(questionGame, generateRound);
 
 export default primeGame;

src/games/progression.js

@@ -4,30 +4,31 @@ import getRandomInRange from '../utils.js';
 
 const questionGame = 'What number is missing in the progression?';
 
-const questionRound = () => {
+const progression = (startNumb, pogrlength, progrStep) => {
+  const arr = [];
+  for (let i = 0; i <= pogrlength; i += 1) {
+    arr.push(startNumb + i * progrStep);
+  }
+  return arr;
+};
+
+const generateRound = () => {
   const number = getRandomInRange();
   const length = getRandomInRange(5, 10);
   const step = getRandomInRange(1, 10);
   const itemSkip = getRandomInRange(2, length);
-  const progression = () => {
-    const arr = [];
-    for (let i = 0; i <= length; i += 1) {
-      arr.push(number + i * step);
-    }
-    return arr;
-  };
 
-  const result = progression()[itemSkip].toString();
+  const answer = progression(number, length, step)[itemSkip].toString();
 
-  const arrProgression = progression();
+  const arrProgression = progression(number, length, step);
   /* eslint-disable no-unused-vars */
   const skipItem = arrProgression.splice([itemSkip], 1, '..');
   /* eslint-enable no-unused-vars */
   const question = `Question: ${arrProgression.join(' ')}`;
 
-  return [question, result];
+  return [question, answer];
 };
 
-const progressionGame = () => playGame(questionGame, questionRound);
+const progressionGame = () => playGame(questionGame, generateRound);
 
 export default progressionGame;

src/index.js

@@ -1,25 +1,23 @@
 import readlineSync from 'readline-sync';
-
 import makeWelcome from './cli.js';
+// set game cycles
+const roundsCount = 3;
 
-const playGame = (questiongame, questionRound) => {
+const playGame = (questiongame, generateRound) => {
   // greeting
   const userName = makeWelcome();
   // outputting of the game question
   console.log(questiongame);
   // game cycle = 3
-  const roundsCount = 3;
   for (let i = 0; i < roundsCount; i += 1) {
-    const round = questionRound();
-    console.log(round[0]);
-    const answer = readlineSync.question('Your answer: ');
-    // right answer
-    const correctAnsw = round[1];
+    const [question, answer] = generateRound();
+    console.log(question);
+    const userAnsw = readlineSync.question('Your answer: ');
     //  checking and output of the answers
-    if (answer === correctAnsw) {
+    if (answer === userAnsw) {
       console.log('Correct!');
     } else {
-      console.log(`'${answer}' is wrong answer ;(. Correct answer was '${correctAnsw}'.\nLet's try again, ${userName}!`);
+      console.log(`'${userAnsw}' is wrong answer ;(. Correct answer was '${answer}'.\nLet's try again, ${userName}!`);
       return;
     }
   }