remove magic numbers

Author: daria-z

src/games/games-logic/calculator.js

@@ -5,8 +5,11 @@ import generateOperator from '../utils/generateOperator.js';
 export const rule = 'What is the result of the expression?';
 
 export const logic = () => {
-  const number1 = generateRandomNumber(1, 10);
-  const number2 = generateRandomNumber(1, 10);
+  const minNumber = 1;
+  const maxNumber = 10;
+
+  const number1 = generateRandomNumber(minNumber, maxNumber);
+  const number2 = generateRandomNumber(minNumber, maxNumber);
   const symbol = generateOperator();
   const question = `${number1} ${symbol} ${number2}`;
   const answer = eval(question);

src/games/games-logic/even.js

@@ -1,7 +1,9 @@
 export const rule = 'Answer "yes" if the number is even, otherwise answer "no".';
 
 export const logic = () => {
-  const questionNumber = Math.floor(Math.random() * 50);
+  const maxNumber = 50;
+
+  const questionNumber = Math.floor(Math.random() * maxNumber);
   const correctAnswer = questionNumber % 2 === 0 ? 'yes' : 'no';
 
   return [questionNumber, correctAnswer];

src/games/games-logic/gcd.js

@@ -4,8 +4,10 @@ import generateRandomNumber from '../utils/generateRandomNumber.js';
 export const rule = 'Find the greatest common divisor of given numbers.';
 
 export const logic = () => {
-  const number1 = generateRandomNumber(1, 20);
-  const number2 = generateRandomNumber(1, 20);
+  const minNumber = 1;
+  const maxNumber = 20;
+  const number1 = generateRandomNumber(minNumber, maxNumber);
+  const number2 = generateRandomNumber(minNumber, maxNumber);
 
   const nod = (a, b) => {
     while (a !== b) {

src/games/games-logic/prime.js

@@ -3,7 +3,8 @@ import generateRandomNumber from '../utils/generateRandomNumber.js';
 export const rule = 'Answer \'yes\' if given number is prime. Otherwise answer \'no\'.';
 
 export const logic = () => {
-  const number = generateRandomNumber(1, 10);
+  const maxPrimeNumber = 10;
+  const number = generateRandomNumber(1, maxPrimeNumber);
   const isPrime = () => {
     if (number <= 1) {
       return 'no';

src/games/games-logic/progression.js

@@ -3,12 +3,14 @@ import generateRandomNumber from '../utils/generateRandomNumber.js';
 export const rule = 'What number is missing in the progression?';
 
 export const logic = () => {
-  const missedPosition = generateRandomNumber(1, 10);
-  const progressionFirstNumber = generateRandomNumber(1, 30);
-  const progressionDiff = generateRandomNumber(1, 5);
+  const progressionLength = 10;
+  const maxProgressionDiff = 5;
+  const missedPosition = generateRandomNumber(1, progressionLength);
+  const progressionFirstNumber = generateRandomNumber();
+  const progressionDiff = generateRandomNumber(1, maxProgressionDiff);
   const progression = [progressionFirstNumber];
 
-  for (let i = 0; i < 10; i += 1) {
+  for (let i = 0; i < progressionLength; i += 1) {
     const nextNumber = progression[progression.length - 1] + progressionDiff;
     progression.push(nextNumber);
   }

src/games/utils/gamesWrapper.js

@@ -1,6 +1,8 @@
 /* eslint-disable consistent-return */
 import readlineSync from 'readline-sync';
 
+const questionsCount = 3;
+
 export default (rules, logic) => {
   console.log('Welcome to the Brain Games!');
 
@@ -10,7 +12,7 @@ export default (rules, logic) => {
 
   console.log(rules);
 
-  for (let i = 1; i <= 3; i += 1) {
+  for (let i = 1; i <= questionsCount; i += 1) {
     const [question, correctAnswer] = logic();
     console.log(`Question: ${question}`);
     const userAnswer = readlineSync.question('Your answer: ');

src/games/utils/generateRandomNumber.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-export default (min, max) => {
+export default (min = 1, max = 50) => {
   min = Math.ceil(min);
   max = Math.floor(max);
   return Math.floor(Math.random() * (max - min + 1) + min);