[2단계 - 자동차 경주 리팩터링] 야미(이다인) 미션 제출합니다. (#224)

* rename: rename folders * rename: rename folders removed all cache to enable case sensitivity in git * refactor: increase reusability of random number maker * refactor: remove useless code * test: create test code for random number maker * refactor: rename method * style: unify method style
woowacourse · Feb 13, 2023 · efbccfa · efbccfa
1 parent d363711
commit efbccfa
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 39 deletions.
diff --git a/__tests__/MovementIndicator.test.js b/__tests__/MovementIndicator.test.js
@@ -1,5 +1,5 @@
-const { movingDistance } = require("../src/Domain/MovementIndicator");
-const { MOVEMENT } = require("../src/Constants/Constants");
+const movingDistance = require("../src/domain/MovementIndicator");
+const { MOVEMENT } = require("../src/constant/Constants");
 const { FORWARD_DISTANCE } = MOVEMENT;
 
 test.each([

diff --git a/__tests__/RandomNumberMaker.test.js b/__tests__/RandomNumberMaker.test.js
@@ -0,0 +1,17 @@
+const randomNumberBetween = require("../src/util/RandomNumberMaker");
+
+test.each([
+  [0, 9],
+  [1, 5],
+  [2, 22],
+  [3, 100],
+  [4, 90],
+  [5, 40],
+  [6, 30],
+  [7, 9],
+  [8, 10],
+  [9, 29],
+])("%i ~ %i 사이의 난수 반환", (min, max) => {
+  expect(randomNumberBetween(min, max)).toBeGreaterThanOrEqual(min);
+  expect(randomNumberBetween(min, max)).toBeLessThanOrEqual(max);
+});
diff --git a/__tests__/SplitAndTrimString.test.js b/__tests__/SplitAndTrimString.test.js
@@ -1,4 +1,4 @@
-const splitAndTrimString = require("../src/Utils/SplitAndTrimString");
+const splitAndTrimString = require("../src/util/SplitAndTrimString");
 
 test("입력받은 자동차 이름 콤마(,)로 분리 후 앞뒤 공백 제거 테스트", () => {
   const names = "야미,클린 ,레고, 타미";

diff --git a/__tests__/Validator.test.js b/__tests__/Validator.test.js
@@ -1,4 +1,4 @@
-const Validator = require("../src/Validator/Validator");
+const Validator = require("../src/validator/Validator");
 const { inputCarNameValidator, tryCountValidator } = Validator;
 
 const checkException = (testList, checkFunction) => {

diff --git a/src/App.js b/src/App.js
@@ -1,18 +1,18 @@
-const Utils = require("./Utils/Utils");
-const splitAndTrimString = require("./Utils/SplitAndTrimString");
-const { readCarName, readTryCount } = require("./UI/InputView");
+const Utils = require("./util/Utils");
+const splitAndTrimString = require("./util/SplitAndTrimString");
+const { readCarName, readTryCount } = require("./view/InputView");
 const {
   printResultMessage,
   printCarMovement,
   printWinner,
-} = require("./UI/OutputView");
+} = require("./view/OutputView");
 const {
   inputCarNameValidator,
   tryCountValidator,
-} = require("./Validator/Validator");
-const { errorCatcher } = require("./Validator/ErrorCatcher");
+} = require("./validator/Validator");
+const errorCatcher = require("./validator/ErrorCatcher");
 
-const CarGame = require("./Domain/CarGame");
+const CarGame = require("./domain/CarGame");
 
 class App {
   #game = new CarGame();
@@ -47,7 +47,7 @@ class App {
 
   acceptValidTryCount(count) {
     this.#round = count;
-    this.showGameResult(count);
+    this.showGameResult();
   }
 
   playRounds = () => {

diff --git a/src/Utils/RandomNumberMaker.js b/src/Utils/RandomNumberMaker.js
diff --git a/src/Constants/Constants.js → src/constant/Constants.js b/src/Constants/Constants.js → src/constant/Constants.js
@@ -15,9 +15,13 @@ const CAR_NAME_LENGTH = Object.freeze({
   MAXIMUM_CAR_NAME_LENGTH: 5,
 });
 
+const RANDOM_NUMBER_RANGE = Object.freeze({
+  MIN: 0,
+  MAX: 9,
+});
+
 const MINIMUM_TRY_COUNT = 1;
 const MINIMUM_NUMBER_OF_CARS = 2;
-const LESS_THAN_TEN = 10;
 
 const ERROR_MESSAGE = Object.freeze({
   NAME_LENGTH_LIMIT: `자동차 이름은 ${CAR_NAME_LENGTH.MINIMUM_CAR_NAME_LENGTH}글자 이상, ${CAR_NAME_LENGTH.MAXIMUM_CAR_NAME_LENGTH}글자 이하로 입력해 주세요.`,
@@ -44,9 +48,9 @@ module.exports = {
   LINE_BREAK,
   GAME_MESSAGE,
   CAR_NAME_LENGTH,
+  RANDOM_NUMBER_RANGE,
   MINIMUM_TRY_COUNT,
   MINIMUM_NUMBER_OF_CARS,
-  LESS_THAN_TEN,
   ERROR_MESSAGE,
   REGEX,
   MOVEMENT,

diff --git a/src/Domain/CarGame.js → src/domain/CarGame.js b/src/Domain/CarGame.js → src/domain/CarGame.js
@@ -1,17 +1,21 @@
-const { movingDistance } = require("./MovementIndicator");
-const makeRandomNumber = require("../Utils/RandomNumberMaker");
-const { COMMA } = require("../Constants/Constants");
+const movingDistance = require("./MovementIndicator");
+const randomNumberBetween = require("../util/RandomNumberMaker");
+const { COMMA, RANDOM_NUMBER_RANGE } = require("../constant/Constants");
+const { MIN, MAX } = RANDOM_NUMBER_RANGE;
 
 class CarGame {
   #carStatus = new Map([]);
 
-  initializeCarStatus = (carNames) => {
+  initializeCarStatus(carNames) {
     carNames.forEach((name) => this.#carStatus.set(name, 0));
-  };
+  }
 
   moveCar() {
     [...this.#carStatus.entries()].forEach(([name, count]) => {
-      this.#carStatus.set(name, count + movingDistance(makeRandomNumber()));
+      this.#carStatus.set(
+        name,
+        count + movingDistance(randomNumberBetween(MIN, MAX))
+      );
     });
 
     return this.#carStatus;

diff --git a/src/Domain/MovementIndicator.js → src/domain/MovementIndicator.js b/src/Domain/MovementIndicator.js → src/domain/MovementIndicator.js
@@ -1,8 +1,8 @@
-const { MOVEMENT } = require("../Constants/Constants");
+const { MOVEMENT } = require("../constant/Constants");
 const { FORWARD_CONDITION_NUMBER, FORWARD_DISTANCE } = MOVEMENT;
 
 const movingDistance = (randomNumber) => {
   return randomNumber >= FORWARD_CONDITION_NUMBER ? FORWARD_DISTANCE : 0;
 };
 
-module.exports = { movingDistance };
+module.exports = movingDistance;
diff --git a/src/util/RandomNumberMaker.js b/src/util/RandomNumberMaker.js
@@ -0,0 +1,5 @@
+const randomNumberBetween = (min, max) => {
+  return Math.floor(Math.random() * (max - min + 1) + min);
+};
+
+module.exports = randomNumberBetween;
diff --git a/src/Utils/SplitAndTrimString.js → src/util/SplitAndTrimString.js b/src/Utils/SplitAndTrimString.js → src/util/SplitAndTrimString.js
@@ -1,4 +1,4 @@
-const { COMMA } = require("../Constants/Constants");
+const { COMMA } = require("../constant/Constants");
 
 const splitAndTrimString = (string) => {
   return string.split(COMMA).map((str) => str.trim());

diff --git a/src/Utils/Utils.js → src/util/Utils.js b/src/Utils/Utils.js → src/util/Utils.js
diff --git a/src/Validator/ErrorCatcher.js → src/validator/ErrorCatcher.js b/src/Validator/ErrorCatcher.js → src/validator/ErrorCatcher.js
@@ -1,4 +1,4 @@
-const Utils = require("../Utils/Utils");
+const Utils = require("../util/Utils");
 
 const errorCatcher = (validator, readInput, acceptValidInput) => {
   try {
@@ -10,4 +10,4 @@ const errorCatcher = (validator, readInput, acceptValidInput) => {
   }
 };
 
-module.exports = { errorCatcher };
+module.exports = errorCatcher;
diff --git a/src/Validator/Validator.js → src/validator/Validator.js b/src/Validator/Validator.js → src/validator/Validator.js
@@ -4,7 +4,7 @@ const {
   CAR_NAME_LENGTH,
   REGEX,
   MINIMUM_TRY_COUNT,
-} = require("../Constants/Constants");
+} = require("../constant/Constants");
 const {
   MINIMUM_CAR_COUNT,
   NAME_DUPLICATE,
@@ -48,14 +48,14 @@ class Validator {
     }
   }
 
-  isNumber(number) {
+  isStringNumber(number) {
     if (ONLY_NUMBER.test(number)) {
       throw new Error(NOT_POSITIVE_NUMBER);
     }
   }
 
   isValidTryCount(count) {
-    this.isNumber(count);
+    this.isStringNumber(count);
 
     if (count < MINIMUM_TRY_COUNT) {
       throw new Error(NOT_POSITIVE_NUMBER);

diff --git a/src/UI/InputView.js → src/view/InputView.js b/src/UI/InputView.js → src/view/InputView.js
@@ -1,5 +1,5 @@
-const Utils = require("../Utils/Utils");
-const { GAME_MESSAGE } = require("../Constants/Constants");
+const Utils = require("../util/Utils");
+const { GAME_MESSAGE } = require("../constant/Constants");
 const { INPUT_CAR_NAME, INPUT_TRY_COUNT } = GAME_MESSAGE;
 
 const InputView = {

diff --git a/src/UI/OutputView.js → src/view/OutputView.js b/src/UI/OutputView.js → src/view/OutputView.js
@@ -1,5 +1,5 @@
-const { print } = require("../Utils/Utils");
-const { GAME_MESSAGE, LINE_BREAK } = require("../Constants/Constants");
+const { print } = require("../util/Utils");
+const { GAME_MESSAGE, LINE_BREAK } = require("../constant/Constants");
 const { RUN_RESULT_MESSAGE, GAME_RESULT, COLON, MOVEMENT_UNIT } = GAME_MESSAGE;
 
 const OutputView = {