add condition isNumber for validation, refactor generateNumber function

mate-academy · Oct 10, 2023 · b4206b2 · b4206b2
1 parent 49b8e53
commit b4206b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/generateNumber.js b/src/generateNumber.js
@@ -7,13 +7,15 @@ function generateNumber() {
   const distinctDigits = [];
 
   while (distinctDigits.length < EXPECTED_NUMBER_LENGTH) {
-    const randomIndex = Math.floor(Math.random() * digitsToInsert.length);
+    let randomIndex = 0;
 
-    if (!distinctDigits.length && digitsToInsert[randomIndex] === 0) {
-      continue;
+    if (!distinctDigits.length) {
+      randomIndex = Math.floor(Math.random() * (digitsToInsert.length - 1) + 1);
+    } else {
+      randomIndex = Math.floor(Math.random() * digitsToInsert.length);
     }
 
-    const digitToInsert = digitsToInsert.splice(randomIndex, 1);
+    const digitToInsert = digitsToInsert.splice(randomIndex, 1)[0];
 
     distinctDigits.push(digitToInsert);
   }

diff --git a/src/validateInput.js b/src/validateInput.js
@@ -5,10 +5,11 @@ const { EXPECTED_NUMBER_LENGTH } = require('./constants');
 function validateInput(input) {
   const inputSplited = input.split('');
   const inputSet = new Set(inputSplited);
+  const isNumber = inputSplited.every(num => num >= 0 && num <= 9);
   const hasValidLength = inputSplited.length === EXPECTED_NUMBER_LENGTH;
   const hasDistinctDigits = inputSplited.length === inputSet.size;
 
-  return hasValidLength && hasDistinctDigits;
+  return hasValidLength && hasDistinctDigits && isNumber;
 };
 
 module.exports = {