From 9eda4406113db16b775c92153d2047e376db5099 Mon Sep 17 00:00:00 2001 From: Glyph8 <72332160+Glyph8@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:22:27 +0900 Subject: [PATCH 01/18] docs(README) write develop plan --- README.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/README.md b/README.md index 15bb106b5..c10eec0c2 100644 --- a/README.md +++ b/README.md @@ -1 +1,51 @@ # javascript-lotto-precourse + +## 필수 입출력 작성하기 +입력 : 로또 구입 금액, 당첨번호, 보너스 번호 + +출력 : 각 항목 입력 안내 + + +## 로또 번호 생성 기능 추가 +로또 구입 금액을 전부 사용하여 1000원짜리 로또를 구매한 횟수만큼 로또 번호를 생성한다. +이때의 로또 번호는 1~45의 숫자 6개를 중복없이 뽑는다. + + +## Test용 로또 번호 목록 생성 +로또 번호와 관련된 기능을 테스트 하기 위한 번호를 미리 설정해둔다. + + +## 로또 번호 오름차순 정렬 및 출력 기능 추가 +랜덤하게 생성된 로또 번호들을 오름차순으로 정렬하여 출력하는 기능 추가 +ex) [8, 21, 23, 41, 42, 43] + + +## 당첨 여부 확인 기능 추가 +입력한 당첨번호와 생성한 로또 번호를 매칭하여 5등 이상 당첨 여부 확인 기능추가 + + +## 당첨 내역 출력 기능 추가 +당첨번호, 보너스 번호와 일치하는 번호 개수에 따른 당첨 내역 출력 기능 추가 +> 1등: 6개 번호 일치 / 2,000,000,000원 +> +> 2등: 5개 번호 + 보너스 번호 일치 / 30,000,000원 +> +> 3등: 5개 번호 일치 / 1,500,000원 +> +> 4등: 4개 번호 일치 / 50,000원 +> +> 5등: 3개 번호 일치 / 5,000원 + + +## 총 수익률을 계산하여 출력하는 기능 추가 +로또 구입 금액, 당첨금액을 고려하여 계산하여 소수점 둘째 자리에서 반올림하여 나타낸다. + + +## 적절한 입력 외 에러처리 기능 +> 로또 구입 금액 ; 1000원 단위여야 하고, 1000원으로 나누어 떨어져야한다. +> +> 당첨 번호 : 1~45의 중복되지 않는 숫자 6개를 쉼표로 구분하여 입력해야 한다. +> +> 보너스 번호 : 1~45의 중복되지 않는 숫자 1개이며, 당첨 번호와도 중복되지 않아야 한다. + + From 268c5b829e2850c8e428bf7bd657ab0f7a0f39fe Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Wed, 30 Oct 2024 15:19:12 +0900 Subject: [PATCH 02/18] =?UTF-8?q?feat(Console)=20=ED=95=84=EC=88=98=20?= =?UTF-8?q?=EC=9E=85=EC=B6=9C=EB=A0=A5=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 필요한 API import, 필수 입출력 기능 추가. --- src/App.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 091aa0a5d..8c1258ec5 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,18 @@ +import {Random, Console} from '@woowacourse/mission-utils' + class App { - async run() {} + async run() { + const totalMoeny = await Console.readLineAsync("구매할 금액을 입력해주세요 : "); + + const winNumber = await Console.readLineAsync("당첨번호를 입력해주세요 : "); + + const bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); + + Console.print("당첨 결과"); + + Console.print("수익률"); + + } } export default App; From 1266f5b5900a8cfbd762586e27d1ee029a8d71b1 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Wed, 30 Oct 2024 15:51:29 +0900 Subject: [PATCH 03/18] =?UTF-8?q?feat(lottoNumber)=20=EB=A1=9C=EB=98=90=20?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=83=9D=EC=84=B1=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 배열 lottoNumber에 1-45 중복없는 6개 숫자를 가진 Lotto 객체를 저장하는 기능 추가. --- src/App.js | 21 ++++++++++++++++++--- src/Lotto.js | 6 ++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/App.js b/src/App.js index 8c1258ec5..853ee2f78 100644 --- a/src/App.js +++ b/src/App.js @@ -1,16 +1,31 @@ import {Random, Console} from '@woowacourse/mission-utils' +import Lotto from "./Lotto.js"; class App { async run() { const totalMoeny = await Console.readLineAsync("구매할 금액을 입력해주세요 : "); - const winNumber = await Console.readLineAsync("당첨번호를 입력해주세요 : "); + const lottoCount = totalMoeny / 1000; + + //const lottoNumber = [...Random.pickUniqueNumbersInRange(1,45,6)]; + const lottoNumber = []; + + for(let i = 0; i < lottoCount; i++){ + lottoNumber.push(new Lotto(Random.pickUniqueNumbersInRange(1,45,6))); + } + + lottoNumber.map((lotto)=>{ + Console.print(lotto.getNumber()); + }) + Console.print(""); + + const winNumber = await Console.readLineAsync("당첨 번호를 입력해주세요 : "); const bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); - Console.print("당첨 결과"); + Console.print("당첨 통계\n---"); - Console.print("수익률"); + Console.print("총 수익률은 입니다."); } } diff --git a/src/Lotto.js b/src/Lotto.js index cb0b1527e..88c40ac2f 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -1,3 +1,5 @@ +import {Random} from '@woowacourse/mission-utils' + class Lotto { #numbers; @@ -12,6 +14,10 @@ class Lotto { } } + getNumber(){ + return this.#numbers; + } + // TODO: 추가 기능 구현 } From 95394e718e590c03a004c93841429d9f5b608923 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Wed, 30 Oct 2024 15:56:51 +0900 Subject: [PATCH 04/18] =?UTF-8?q?feat(Lotto.js)=20=EB=A1=9C=EB=98=90=20?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=98=A4=EB=A6=84=EC=B0=A8=EC=88=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EB=B0=8F=20=EC=B6=9C=EB=A0=A5=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sort 메소드 추가, 생성자 변형으로 정렬 기능추가. --- src/Lotto.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Lotto.js b/src/Lotto.js index 88c40ac2f..bb7c17925 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -5,6 +5,7 @@ class Lotto { constructor(numbers) { this.#validate(numbers); + this.sortNumber(numbers); this.#numbers = numbers; } @@ -14,6 +15,10 @@ class Lotto { } } + sortNumber(numbers){ + numbers = numbers.sort((a,b)=> a - b); + } + getNumber(){ return this.#numbers; } From fa6436a600845590e8430a45753220f24b00e410 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Thu, 31 Oct 2024 21:24:09 +0900 Subject: [PATCH 05/18] =?UTF-8?q?test(lottoNumber)=20Test=EC=9A=A9=20?= =?UTF-8?q?=EB=A1=9C=EB=98=90=20=EB=B2=88=ED=98=B8=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 이 후 당첨기능 구현을 위해 미리 테스트용 번호롤 fix함. --- src/App.js | 13 +++++++++---- src/Lotto.js | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/App.js b/src/App.js index 853ee2f78..fb09fef3a 100644 --- a/src/App.js +++ b/src/App.js @@ -3,16 +3,21 @@ import Lotto from "./Lotto.js"; class App { async run() { - const totalMoeny = await Console.readLineAsync("구매할 금액을 입력해주세요 : "); + const totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요 : "); - const lottoCount = totalMoeny / 1000; + const lottoCount = totalMoney / 1000; - //const lottoNumber = [...Random.pickUniqueNumbersInRange(1,45,6)]; + /* const lottoNumber = []; - for(let i = 0; i < lottoCount; i++){ lottoNumber.push(new Lotto(Random.pickUniqueNumbersInRange(1,45,6))); } + */ + + const lottoNumber = [new Lotto([1,2,3,4,5,6]), + new Lotto([45, 43, 42, 41, 40, 39]), + new Lotto([5,6,4,2,7,8]), new Lotto([2,3,4,5,6,7]), + new Lotto([4,5,6,7,8,9])]; lottoNumber.map((lotto)=>{ Console.print(lotto.getNumber()); diff --git a/src/Lotto.js b/src/Lotto.js index bb7c17925..7f4f7c94e 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -19,6 +19,25 @@ class Lotto { numbers = numbers.sort((a,b)=> a - b); } + isNumberWin(number, winNumbers){ + winNumbers.map((winNum)=>{ + if(number === winNum){ + return true; + } + }) + return false; + } + + isWin(numbers, winNumbers){ + let winNumCount = 0; + numbers.map((num)=>{ + if(this.isNumberWin(num, winNumbers)){ + winNumCount++; + } + }); + return winNumCount; + } + getNumber(){ return this.#numbers; } From 1cca4f7a76d746962930b159b223e0aea879b9b7 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Thu, 31 Oct 2024 21:37:14 +0900 Subject: [PATCH 06/18] =?UTF-8?q?docs(README)=20=EB=A1=9C=EB=98=90=20?= =?UTF-8?q?=EB=8B=B9=EC=B2=A8=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EB=AA=A9=ED=91=9C=EB=A5=BC=20=EC=84=B8=EB=B6=84=ED=99=94?= =?UTF-8?q?=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c10eec0c2..68c03554d 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,21 @@ 로또 번호와 관련된 기능을 테스트 하기 위한 번호를 미리 설정해둔다. +## 당첨 여부 확인 기능 추가 +입력한 당첨번호와 생성한 로또 번호를 매칭하여 5등 이상 당첨 여부 확인 기능추가 + + ## 로또 번호 오름차순 정렬 및 출력 기능 추가 랜덤하게 생성된 로또 번호들을 오름차순으로 정렬하여 출력하는 기능 추가 ex) [8, 21, 23, 41, 42, 43] -## 당첨 여부 확인 기능 추가 -입력한 당첨번호와 생성한 로또 번호를 매칭하여 5등 이상 당첨 여부 확인 기능추가 +## 로또의 일치 숫자 개수 추출 기능 추가 +6자리 숫자들 중 당첨숫자와 일치하는 숫자들의 개수를 추출하여 반환하는 함수를 작성 + + +## 로또의 일치 숫자 5개 인 경우, 보너스 번호 당첨확인 기능 추가 +당첨숫자들 중 5개가 일치하면, 보너스 번호에 대해서 당첨을 확인하는 기능을 추가한다. ## 당첨 내역 출력 기능 추가 From cc6945a04b4218574da16b4f209547d36560af04 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Fri, 1 Nov 2024 15:32:27 +0900 Subject: [PATCH 07/18] =?UTF-8?q?feat(Lotto.js)=20=EB=A1=9C=EB=98=90=20?= =?UTF-8?q?=EC=9D=BC=EC=B9=98=20=EC=88=AB=EC=9E=90=20=EA=B0=9C=EC=88=98=20?= =?UTF-8?q?=EC=B6=94=EC=B6=9C=20=EA=B8=B0=EB=8A=A5=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Lotto class에 일치하는 숫자 반환하는 함수 추가 --- src/App.js | 14 +++++++++++++- src/Lotto.js | 20 ++++++++++++++++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/App.js b/src/App.js index fb09fef3a..ee5c3047e 100644 --- a/src/App.js +++ b/src/App.js @@ -24,7 +24,19 @@ class App { }) Console.print(""); - const winNumber = await Console.readLineAsync("당첨 번호를 입력해주세요 : "); + const winString = await Console.readLineAsync("당첨 번호를 입력해주세요 : "); + const winNumber = winString.split(','); + + winNumber.map((num)=>{ + num = Number.parseInt(num); + }) + + const winLotto = new Lotto(winNumber); + + lottoNumber.map((lotto)=>{ + Console.print(lotto.isLottoWin(lotto, winLotto)); + }) + Console.print(""); const bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); diff --git a/src/Lotto.js b/src/Lotto.js index 7f4f7c94e..26f35b9b6 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -20,17 +20,19 @@ class Lotto { } isNumberWin(number, winNumbers){ + let win = false; winNumbers.map((winNum)=>{ + winNum = Number.parseInt(winNum); if(number === winNum){ - return true; + win = true; } }) - return false; + return win; } - isWin(numbers, winNumbers){ + isWin(winNumbers){ let winNumCount = 0; - numbers.map((num)=>{ + this.#numbers.map((num)=>{ if(this.isNumberWin(num, winNumbers)){ winNumCount++; } @@ -38,6 +40,16 @@ class Lotto { return winNumCount; } + isLottoWin(targetLotto, winLotto){ + let winNumCount = 0; + targetLotto.getNumber().map((targetNum)=>{ + if(this.isNumberWin(targetNum, winLotto.getNumber())){ + winNumCount++; + } + }); + return winNumCount; + } + getNumber(){ return this.#numbers; } From 9c024a29b1bfd1f97f4de9a8279d9025bd1c9230 Mon Sep 17 00:00:00 2001 From: glyph8 Date: Sun, 3 Nov 2024 11:14:57 +0900 Subject: [PATCH 08/18] =?UTF-8?q?docs(README):=20=EA=B5=AC=ED=98=84?= =?UTF-8?q?=EB=8B=A8=EC=9C=84=20=EC=B6=95=EC=86=8C,=20=EC=88=9C=EC=84=9C?= =?UTF-8?q?=20=EC=9E=AC=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 68c03554d..dcaee3534 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ 이때의 로또 번호는 1~45의 숫자 6개를 중복없이 뽑는다. +## 로또 번호 오름차순 정렬 및 출력 기능 추가 +랜덤하게 생성된 로또 번호들을 오름차순으로 정렬하여 출력하는 기능 추가 +ex) [8, 21, 23, 41, 42, 43] + + ## Test용 로또 번호 목록 생성 로또 번호와 관련된 기능을 테스트 하기 위한 번호를 미리 설정해둔다. @@ -19,17 +24,12 @@ 입력한 당첨번호와 생성한 로또 번호를 매칭하여 5등 이상 당첨 여부 확인 기능추가 -## 로또 번호 오름차순 정렬 및 출력 기능 추가 -랜덤하게 생성된 로또 번호들을 오름차순으로 정렬하여 출력하는 기능 추가 -ex) [8, 21, 23, 41, 42, 43] - - ## 로또의 일치 숫자 개수 추출 기능 추가 6자리 숫자들 중 당첨숫자와 일치하는 숫자들의 개수를 추출하여 반환하는 함수를 작성 -## 로또의 일치 숫자 5개 인 경우, 보너스 번호 당첨확인 기능 추가 -당첨숫자들 중 5개가 일치하면, 보너스 번호에 대해서 당첨을 확인하는 기능을 추가한다. +## 보너스 번호 당첨확인 기능 추가 +보너스 번호에 대해서 당첨을 확인하는 기능을 추가한다. ## 당첨 내역 출력 기능 추가 From 2b98860e9459a5d976c41fe8c3803a88b18542b8 Mon Sep 17 00:00:00 2001 From: glyph8 Date: Sun, 3 Nov 2024 11:18:29 +0900 Subject: [PATCH 09/18] =?UTF-8?q?feat(Lotto.js):=20=EB=B3=B4=EB=84=88?= =?UTF-8?q?=EC=8A=A4=20=EB=B2=88=ED=98=B8=20=EB=8B=B9=EC=B2=A8=ED=99=95?= =?UTF-8?q?=EC=9D=B8=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 5 ----- src/Lotto.js | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/App.js b/src/App.js index ee5c3047e..c5cdcd8c0 100644 --- a/src/App.js +++ b/src/App.js @@ -33,11 +33,6 @@ class App { const winLotto = new Lotto(winNumber); - lottoNumber.map((lotto)=>{ - Console.print(lotto.isLottoWin(lotto, winLotto)); - }) - Console.print(""); - const bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); Console.print("당첨 통계\n---"); diff --git a/src/Lotto.js b/src/Lotto.js index 26f35b9b6..faa03a5b5 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -30,24 +30,25 @@ class Lotto { return win; } - isWin(winNumbers){ + isLottoWin(targetLotto, winLotto){ let winNumCount = 0; - this.#numbers.map((num)=>{ - if(this.isNumberWin(num, winNumbers)){ + targetLotto.getNumber().map((targetNum)=>{ + if(this.isNumberWin(targetNum, winLotto.getNumber())){ winNumCount++; } }); + return winNumCount; } - isLottoWin(targetLotto, winLotto){ - let winNumCount = 0; - targetLotto.getNumber().map((targetNum)=>{ - if(this.isNumberWin(targetNum, winLotto.getNumber())){ - winNumCount++; + isBonus(bonusNumber){ + let winBonus = false; + this.#numbers.map((num)=>{ + if(num === Number.parseInt(bonusNumber)){ + winBonus = true; } }); - return winNumCount; + return winBonus; } getNumber(){ From 804c8ce610898c77dcdc11b0199cc7afb938e3ec Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 18:44:54 +0900 Subject: [PATCH 10/18] =?UTF-8?q?feat(result)=20=EB=8B=B9=EC=B2=A8=20?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=B6=9C=EB=A0=A5=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 내역 출력 및 상수처리 추가, 당첨순위와 매칭된 숫자 개수를 서로 반환하는 메소드 추가. --- src/App.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/Lotto.js | 1 + 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index c5cdcd8c0..b095458d8 100644 --- a/src/App.js +++ b/src/App.js @@ -1,11 +1,17 @@ import {Random, Console} from '@woowacourse/mission-utils' import Lotto from "./Lotto.js"; +const winPrice = ["2,000,000,000", "30,000,000", "1,500,000", "50,000", "5,000"]; +const firRankMatch = 6; +const maxRank = 5, secRankMatch = 5; + +const moneyUnit = 1000; + class App { async run() { const totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요 : "); - const lottoCount = totalMoney / 1000; + const lottoCount = totalMoney / moneyUnit; /* const lottoNumber = []; @@ -37,9 +43,61 @@ class App { Console.print("당첨 통계\n---"); + const winList = new Array(maxRank).fill(0); + lottoNumber.map((lotto)=>{ + const rank = convertMatchCountToRank(lotto, winLotto, bonusNumber); + if(rank <= maxRank){ + winList[rank-1]++; + } + + }); + + let result = ""; + winList.map((winEntry,index)=>{ + let matchBonus = " "; + const rank = index + 1; + let matchCount = convertRankToMatchCount(rank); + if(matchCount === -secRankMatch){ + matchBonus = ", 보너스 볼 일치"; + matchCount = secRankMatch; + } + const resultEntry = `${matchCount}개 일치${matchBonus}(${winPrice[index]}원) - ${winEntry}개\n`; + + result = result + resultEntry; + }) + Console.print(result); + Console.print("총 수익률은 입니다."); } } +function convertRankToMatchCount(rank){ + const tool = 8; + const secWin = 2; + const firWin = 1; + + let matchCount = tool - rank; + if(rank === secWin) + return -5;//일단 5등처리 + if(rank === firWin) + return 6; + + return matchCount; +} + +function convertMatchCountToRank(lotto, winLotto, bonusNumber){ + const tool = 8; + let matchCount = lotto.isLottoWin(lotto, winLotto); + + if(matchCount === firRankMatch){ + matchCount++; + } + if(matchCount === secRankMatch && lotto.isBonus(bonusNumber)){ + matchCount++; + } + + return (tool - matchCount); +} + export default App; diff --git a/src/Lotto.js b/src/Lotto.js index faa03a5b5..e3fc2d31c 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -1,4 +1,5 @@ import {Random} from '@woowacourse/mission-utils' +import * as Console from "node:console"; class Lotto { #numbers; From 56d7e6869b13a3b2246b673dbc7ccc892cafa23b Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 19:00:08 +0900 Subject: [PATCH 11/18] =?UTF-8?q?feat(calRevenueRate)=20=EC=B4=9D=20?= =?UTF-8?q?=EC=88=98=EC=9D=B5=EB=A5=A0=EC=9D=84=20=EA=B3=84=EC=82=B0?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=B6=9C=EB=A0=A5=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/App.js b/src/App.js index b095458d8..1ae22013b 100644 --- a/src/App.js +++ b/src/App.js @@ -53,6 +53,8 @@ class App { }); let result = ""; + let earnMoney = 0; + winList.map((winEntry,index)=>{ let matchBonus = " "; const rank = index + 1; @@ -61,17 +63,25 @@ class App { matchBonus = ", 보너스 볼 일치"; matchCount = secRankMatch; } - const resultEntry = `${matchCount}개 일치${matchBonus}(${winPrice[index]}원) - ${winEntry}개\n`; + earnMoney += Number.parseInt(winPrice[index]); + + const resultEntry = `${matchCount}개 일치${matchBonus}(${winPrice[index]}원) - ${winEntry}개\n`; result = result + resultEntry; }) Console.print(result); - Console.print("총 수익률은 입니다."); - + Console.print(`총 수익률은 ${calRevenueRate(totalMoney, earnMoney)}%입니다`); } } +function calRevenueRate(costMoney, earnMoney){ + const profit = earnMoney - costMoney; + const RevenueRate = (profit / costMoney) * 100; + + return RevenueRate.toFixed(1); +} + function convertRankToMatchCount(rank){ const tool = 8; const secWin = 2; From b1c089adb67383d19f7bdee87f5e657dc018eb83 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 20:43:21 +0900 Subject: [PATCH 12/18] =?UTF-8?q?feat(input)=20=EC=A0=81=EC=A0=88=ED=95=9C?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=20=EC=99=B8=20=EC=97=90=EB=9F=AC=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EA=B8=B0=EB=8A=A5=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 로또 구입금액, 당첨 번호, 보너스 번호 입력 시 에러처리기능 추가 --- src/App.js | 14 +++++++++++--- src/Lotto.js | 24 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/App.js b/src/App.js index 1ae22013b..d63581fe3 100644 --- a/src/App.js +++ b/src/App.js @@ -12,7 +12,10 @@ class App { const totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요 : "); const lottoCount = totalMoney / moneyUnit; - + if(totalMoney % moneyUnit !== 0){ + Console.print(lottoCount % moneyUnit); + throw new Error("[ERROR] 구입 금액은 1000원 단위여야 합니다.") + } /* const lottoNumber = []; for(let i = 0; i < lottoCount; i++){ @@ -41,6 +44,12 @@ class App { const bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); + winNumber.map((winNum)=>{ + if(winNum === bonusNumber){ + throw new Error("[ERROR] : 보너스 번호는 당첨 번호와 중복될 수 없습니다."); + } + }) + Console.print("당첨 통계\n---"); const winList = new Array(maxRank).fill(0); @@ -63,8 +72,7 @@ class App { matchBonus = ", 보너스 볼 일치"; matchCount = secRankMatch; } - earnMoney += Number.parseInt(winPrice[index]); - + earnMoney += Number.parseInt(winPrice[index])*winEntry; const resultEntry = `${matchCount}개 일치${matchBonus}(${winPrice[index]}원) - ${winEntry}개\n`; result = result + resultEntry; diff --git a/src/Lotto.js b/src/Lotto.js index e3fc2d31c..b4c331cc2 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -7,6 +7,7 @@ class Lotto { constructor(numbers) { this.#validate(numbers); this.sortNumber(numbers); + this.isUnique(numbers); this.#numbers = numbers; } @@ -16,6 +17,29 @@ class Lotto { } } + isUnique(numbers){ + numbers.map((num, index)=>{ + this.checkDupNumber(num, index, numbers); + }) + } + checkDupNumber(target, targetIndex, numbers){ + numbers.map((num, index)=>{ + if(num === target && targetIndex !== index){ + throw new Error("[ERROR] : 로또 번호는 중복될 수 없습니다.") + } + }) + } + + checkNumberRange(numbers){ + const minNum = 1; + const maxNum = 45; + numbers.map((num)=>{ + if(num > maxNum || num < minNum){ + throw new Error("[ERROR] : 로또 번호는 1부터 45 사이의 숫자여야 합니다.") + } + }) + } + sortNumber(numbers){ numbers = numbers.sort((a,b)=> a - b); } From b9f8af042ec5ba57829c9cbb8f3e3742b11ff4be Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 20:51:30 +0900 Subject: [PATCH 13/18] =?UTF-8?q?fix(input)=20=EB=88=84=EB=9D=BD=EB=90=9C?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=20=EC=97=90=EB=9F=AC=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 숫자가 아닌 입력의 경우, 1~45 이내 숫자가 아닌 경우 처리가 누락되어 추가함. --- src/App.js | 9 +++++++++ src/Lotto.js | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index d63581fe3..97cda17da 100644 --- a/src/App.js +++ b/src/App.js @@ -44,10 +44,19 @@ class App { const bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); + if(isNaN(bonusNumber)){ + throw new Error("[ERROR] : 로또 번호는 숫자여야합니다.") + } + + const minNum = 1; + const maxNum = 45; winNumber.map((winNum)=>{ if(winNum === bonusNumber){ throw new Error("[ERROR] : 보너스 번호는 당첨 번호와 중복될 수 없습니다."); } + if(bonusNumber < minNum || bonusNumber > maxNum){ + throw new Error(`[ERROR] : 보너스 번호는 ${minNum}부터 ${maxNum}까지의 숫자여야 합니다.`); + } }) Console.print("당첨 통계\n---"); diff --git a/src/Lotto.js b/src/Lotto.js index b4c331cc2..47393b7c7 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -7,7 +7,8 @@ class Lotto { constructor(numbers) { this.#validate(numbers); this.sortNumber(numbers); - this.isUnique(numbers); + this.isUniqueNumber(numbers); + this.checkNumberRange(numbers); this.#numbers = numbers; } @@ -17,8 +18,11 @@ class Lotto { } } - isUnique(numbers){ + isUniqueNumber(numbers){ numbers.map((num, index)=>{ + if(isNaN(num)){ + throw new Error("[ERROR] : 로또 번호는 숫자여야합니다.") + } this.checkDupNumber(num, index, numbers); }) } From d832da14137ca7ad4bf58219e5160413719666b5 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 20:55:36 +0900 Subject: [PATCH 14/18] =?UTF-8?q?docs(README)=20=EB=88=84=EB=9D=BD?= =?UTF-8?q?=EB=90=9C=20=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=20=EB=AA=A9?= =?UTF-8?q?=ED=91=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dcaee3534..9f2e551e7 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ ex) [8, 21, 23, 41, 42, 43] 로또 구입 금액, 당첨금액을 고려하여 계산하여 소수점 둘째 자리에서 반올림하여 나타낸다. -## 적절한 입력 외 에러처리 기능 +## 적절한 입력 외 에러처리 기능추가 > 로또 구입 금액 ; 1000원 단위여야 하고, 1000원으로 나누어 떨어져야한다. > > 당첨 번호 : 1~45의 중복되지 않는 숫자 6개를 쉼표로 구분하여 입력해야 한다. @@ -57,3 +57,7 @@ ex) [8, 21, 23, 41, 42, 43] > 보너스 번호 : 1~45의 중복되지 않는 숫자 1개이며, 당첨 번호와도 중복되지 않아야 한다. +## 잘못된 입력시 다시 입력받는 기능추가 +Error 발생시키고, 다음 해당 지점부터 다시 입력받도록하는 기능을 추가한다. + +## Jest 테스트 코드 작성하기 From 40f102f228f6123a90ac49f09f692467c0f49fbb Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 21:33:09 +0900 Subject: [PATCH 15/18] =?UTF-8?q?fix(winPrice)=20=EB=8B=B9=EC=B2=A8?= =?UTF-8?q?=EA=B8=88=20=EC=B2=98=EB=A6=AC=20=EC=8B=A4=EC=88=98=EB=A1=9C=20?= =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EA=B0=92=20=EA=B3=84=EC=82=B0?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 58 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/src/App.js b/src/App.js index 97cda17da..c91551e59 100644 --- a/src/App.js +++ b/src/App.js @@ -1,7 +1,8 @@ import {Random, Console} from '@woowacourse/mission-utils' import Lotto from "./Lotto.js"; -const winPrice = ["2,000,000,000", "30,000,000", "1,500,000", "50,000", "5,000"]; +const winPriceString = ["2,000,000,000", "30,000,000", "1,500,000", "50,000", "5,000"]; +const winPriceNumber = [2000000000, 30000000, 1500000, 50000, 5000]; const firRankMatch = 6; const maxRank = 5, secRankMatch = 5; @@ -9,38 +10,48 @@ const moneyUnit = 1000; class App { async run() { - const totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요 : "); + // Console.print("구매할 금액을 입력해주세요."); + // const totalMoney = await Console.readLineAsync(""); + let correctInput = false; + + let totalMoney = 0; + while(!correctInput){ + totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요."); + if(totalMoney % moneyUnit !== 0){ + // throw new Error("[ERROR] 구입 금액은 1000원 단위여야 합니다.") + Console.print("[ERROR] 구입 금액은 1000원 단위여야 합니다."); + } + correctInput = true; + } const lottoCount = totalMoney / moneyUnit; - if(totalMoney % moneyUnit !== 0){ - Console.print(lottoCount % moneyUnit); - throw new Error("[ERROR] 구입 금액은 1000원 단위여야 합니다.") - } - /* + Console.print(`${lottoCount}개를 구매했습니다.`); + const lottoNumber = []; for(let i = 0; i < lottoCount; i++){ lottoNumber.push(new Lotto(Random.pickUniqueNumbersInRange(1,45,6))); } - */ - - const lottoNumber = [new Lotto([1,2,3,4,5,6]), - new Lotto([45, 43, 42, 41, 40, 39]), - new Lotto([5,6,4,2,7,8]), new Lotto([2,3,4,5,6,7]), - new Lotto([4,5,6,7,8,9])]; + // const lottoNumber = [new Lotto([1,2,3,4,5,6]), + // new Lotto([45, 43, 42, 41, 40, 39]), + // new Lotto([5,6,4,2,7,8]), new Lotto([2,3,4,5,6,7]), + // new Lotto([4,5,6,7,8,9])]; lottoNumber.map((lotto)=>{ Console.print(lotto.getNumber()); }) Console.print(""); - const winString = await Console.readLineAsync("당첨 번호를 입력해주세요 : "); - const winNumber = winString.split(','); - - winNumber.map((num)=>{ - num = Number.parseInt(num); - }) + correctInput = false; + let winString = ""; + //while(!correctInput){ + winString = await Console.readLineAsync("당첨 번호를 입력해주세요 : "); + const winNumber = winString.split(','); - const winLotto = new Lotto(winNumber); + winNumber.map((num)=>{ + num = Number.parseInt(num); + }) + const winLotto = new Lotto(winNumber); + //} const bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); @@ -81,10 +92,10 @@ class App { matchBonus = ", 보너스 볼 일치"; matchCount = secRankMatch; } - earnMoney += Number.parseInt(winPrice[index])*winEntry; + earnMoney += winPriceNumber[index]*winEntry; - const resultEntry = `${matchCount}개 일치${matchBonus}(${winPrice[index]}원) - ${winEntry}개\n`; - result = result + resultEntry; + const resultEntry = `${matchCount}개 일치${matchBonus}(${winPriceString[index]}원) - ${winEntry}개`; + result = resultEntry + "\n" + result; }) Console.print(result); @@ -95,7 +106,6 @@ class App { function calRevenueRate(costMoney, earnMoney){ const profit = earnMoney - costMoney; const RevenueRate = (profit / costMoney) * 100; - return RevenueRate.toFixed(1); } From 7d82a079a6e6177b4467f1b54d52f58763c40d44 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 22:22:03 +0900 Subject: [PATCH 16/18] =?UTF-8?q?fix(output)=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=B6=9C=EB=A0=A5=EA=B3=BC=20=EC=99=84=EC=A0=84=20=EC=9D=BC?= =?UTF-8?q?=EC=B9=98=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coverage/clover.xml | 46 +++ coverage/coverage-final.json | 2 + coverage/lcov-report/Lotto.js.html | 355 +++++++++++++++++++++ coverage/lcov-report/base.css | 224 +++++++++++++ coverage/lcov-report/block-navigation.js | 87 +++++ coverage/lcov-report/favicon.png | Bin 0 -> 445 bytes coverage/lcov-report/index.html | 116 +++++++ coverage/lcov-report/prettify.css | 1 + coverage/lcov-report/prettify.js | 2 + coverage/lcov-report/sort-arrow-sprite.png | Bin 0 -> 138 bytes coverage/lcov-report/sorter.js | 196 ++++++++++++ coverage/lcov.info | 96 ++++++ src/App.js | 21 +- 13 files changed, 1133 insertions(+), 13 deletions(-) create mode 100644 coverage/clover.xml create mode 100644 coverage/coverage-final.json create mode 100644 coverage/lcov-report/Lotto.js.html create mode 100644 coverage/lcov-report/base.css create mode 100644 coverage/lcov-report/block-navigation.js create mode 100644 coverage/lcov-report/favicon.png create mode 100644 coverage/lcov-report/index.html create mode 100644 coverage/lcov-report/prettify.css create mode 100644 coverage/lcov-report/prettify.js create mode 100644 coverage/lcov-report/sort-arrow-sprite.png create mode 100644 coverage/lcov-report/sorter.js create mode 100644 coverage/lcov.info diff --git a/coverage/clover.xml b/coverage/clover.xml new file mode 100644 index 000000000..c2ae0e8d9 --- /dev/null +++ b/coverage/clover.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json new file mode 100644 index 000000000..c48b2258a --- /dev/null +++ b/coverage/coverage-final.json @@ -0,0 +1,2 @@ +{"C:\\Users\\newdy\\OneDrive\\바탕 화면\\wooaFreeCourse\\javascript-lotto-7\\src\\Lotto.js": {"path":"C:\\Users\\newdy\\OneDrive\\바탕 화면\\wooaFreeCourse\\javascript-lotto-7\\src\\Lotto.js","statementMap":{"0":{"start":{"line":8,"column":4},"end":{"line":8,"column":28}},"1":{"start":{"line":9,"column":4},"end":{"line":9,"column":29}},"2":{"start":{"line":10,"column":4},"end":{"line":10,"column":33}},"3":{"start":{"line":11,"column":4},"end":{"line":11,"column":35}},"4":{"start":{"line":12,"column":4},"end":{"line":12,"column":28}},"5":{"start":{"line":16,"column":4},"end":{"line":18,"column":5}},"6":{"start":{"line":17,"column":6},"end":{"line":17,"column":50}},"7":{"start":{"line":22,"column":4},"end":{"line":27,"column":6}},"8":{"start":{"line":23,"column":6},"end":{"line":25,"column":7}},"9":{"start":{"line":24,"column":8},"end":{"line":24,"column":52}},"10":{"start":{"line":26,"column":6},"end":{"line":26,"column":47}},"11":{"start":{"line":30,"column":4},"end":{"line":34,"column":6}},"12":{"start":{"line":31,"column":6},"end":{"line":33,"column":7}},"13":{"start":{"line":32,"column":8},"end":{"line":32,"column":55}},"14":{"start":{"line":38,"column":19},"end":{"line":38,"column":20}},"15":{"start":{"line":39,"column":19},"end":{"line":39,"column":21}},"16":{"start":{"line":40,"column":4},"end":{"line":44,"column":6}},"17":{"start":{"line":41,"column":6},"end":{"line":43,"column":7}},"18":{"start":{"line":42,"column":8},"end":{"line":42,"column":64}},"19":{"start":{"line":48,"column":4},"end":{"line":48,"column":42}},"20":{"start":{"line":48,"column":35},"end":{"line":48,"column":40}},"21":{"start":{"line":52,"column":14},"end":{"line":52,"column":19}},"22":{"start":{"line":53,"column":4},"end":{"line":58,"column":6}},"23":{"start":{"line":54,"column":6},"end":{"line":54,"column":39}},"24":{"start":{"line":55,"column":6},"end":{"line":57,"column":7}},"25":{"start":{"line":56,"column":8},"end":{"line":56,"column":19}},"26":{"start":{"line":59,"column":4},"end":{"line":59,"column":15}},"27":{"start":{"line":63,"column":22},"end":{"line":63,"column":23}},"28":{"start":{"line":64,"column":4},"end":{"line":68,"column":7}},"29":{"start":{"line":65,"column":6},"end":{"line":67,"column":7}},"30":{"start":{"line":66,"column":8},"end":{"line":66,"column":22}},"31":{"start":{"line":70,"column":4},"end":{"line":70,"column":23}},"32":{"start":{"line":74,"column":19},"end":{"line":74,"column":24}},"33":{"start":{"line":75,"column":4},"end":{"line":79,"column":7}},"34":{"start":{"line":76,"column":6},"end":{"line":78,"column":7}},"35":{"start":{"line":77,"column":8},"end":{"line":77,"column":24}},"36":{"start":{"line":80,"column":4},"end":{"line":80,"column":20}},"37":{"start":{"line":84,"column":4},"end":{"line":84,"column":25}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":7,"column":2},"end":{"line":7,"column":3}},"loc":{"start":{"line":7,"column":23},"end":{"line":13,"column":3}},"line":7},"1":{"name":"(anonymous_1)","decl":{"start":{"line":21,"column":2},"end":{"line":21,"column":3}},"loc":{"start":{"line":21,"column":25},"end":{"line":28,"column":3}},"line":21},"2":{"name":"(anonymous_2)","decl":{"start":{"line":22,"column":16},"end":{"line":22,"column":17}},"loc":{"start":{"line":22,"column":30},"end":{"line":27,"column":5}},"line":22},"3":{"name":"(anonymous_3)","decl":{"start":{"line":29,"column":2},"end":{"line":29,"column":3}},"loc":{"start":{"line":29,"column":46},"end":{"line":35,"column":3}},"line":29},"4":{"name":"(anonymous_4)","decl":{"start":{"line":30,"column":16},"end":{"line":30,"column":17}},"loc":{"start":{"line":30,"column":30},"end":{"line":34,"column":5}},"line":30},"5":{"name":"(anonymous_5)","decl":{"start":{"line":37,"column":2},"end":{"line":37,"column":3}},"loc":{"start":{"line":37,"column":27},"end":{"line":45,"column":3}},"line":37},"6":{"name":"(anonymous_6)","decl":{"start":{"line":40,"column":16},"end":{"line":40,"column":17}},"loc":{"start":{"line":40,"column":23},"end":{"line":44,"column":5}},"line":40},"7":{"name":"(anonymous_7)","decl":{"start":{"line":47,"column":2},"end":{"line":47,"column":3}},"loc":{"start":{"line":47,"column":21},"end":{"line":49,"column":3}},"line":47},"8":{"name":"(anonymous_8)","decl":{"start":{"line":48,"column":27},"end":{"line":48,"column":28}},"loc":{"start":{"line":48,"column":35},"end":{"line":48,"column":40}},"line":48},"9":{"name":"(anonymous_9)","decl":{"start":{"line":51,"column":2},"end":{"line":51,"column":3}},"loc":{"start":{"line":51,"column":33},"end":{"line":60,"column":3}},"line":51},"10":{"name":"(anonymous_10)","decl":{"start":{"line":53,"column":19},"end":{"line":53,"column":20}},"loc":{"start":{"line":53,"column":29},"end":{"line":58,"column":5}},"line":53},"11":{"name":"(anonymous_11)","decl":{"start":{"line":62,"column":2},"end":{"line":62,"column":3}},"loc":{"start":{"line":62,"column":35},"end":{"line":71,"column":3}},"line":62},"12":{"name":"(anonymous_12)","decl":{"start":{"line":64,"column":32},"end":{"line":64,"column":33}},"loc":{"start":{"line":64,"column":45},"end":{"line":68,"column":5}},"line":64},"13":{"name":"(anonymous_13)","decl":{"start":{"line":73,"column":2},"end":{"line":73,"column":3}},"loc":{"start":{"line":73,"column":22},"end":{"line":81,"column":3}},"line":73},"14":{"name":"(anonymous_14)","decl":{"start":{"line":75,"column":22},"end":{"line":75,"column":23}},"loc":{"start":{"line":75,"column":29},"end":{"line":79,"column":5}},"line":75},"15":{"name":"(anonymous_15)","decl":{"start":{"line":83,"column":2},"end":{"line":83,"column":3}},"loc":{"start":{"line":83,"column":13},"end":{"line":85,"column":3}},"line":83}},"branchMap":{"0":{"loc":{"start":{"line":16,"column":4},"end":{"line":18,"column":5}},"type":"if","locations":[{"start":{"line":16,"column":4},"end":{"line":18,"column":5}},{"start":{},"end":{}}],"line":16},"1":{"loc":{"start":{"line":23,"column":6},"end":{"line":25,"column":7}},"type":"if","locations":[{"start":{"line":23,"column":6},"end":{"line":25,"column":7}},{"start":{},"end":{}}],"line":23},"2":{"loc":{"start":{"line":31,"column":6},"end":{"line":33,"column":7}},"type":"if","locations":[{"start":{"line":31,"column":6},"end":{"line":33,"column":7}},{"start":{},"end":{}}],"line":31},"3":{"loc":{"start":{"line":31,"column":9},"end":{"line":31,"column":48}},"type":"binary-expr","locations":[{"start":{"line":31,"column":9},"end":{"line":31,"column":23}},{"start":{"line":31,"column":27},"end":{"line":31,"column":48}}],"line":31},"4":{"loc":{"start":{"line":41,"column":6},"end":{"line":43,"column":7}},"type":"if","locations":[{"start":{"line":41,"column":6},"end":{"line":43,"column":7}},{"start":{},"end":{}}],"line":41},"5":{"loc":{"start":{"line":41,"column":9},"end":{"line":41,"column":37}},"type":"binary-expr","locations":[{"start":{"line":41,"column":9},"end":{"line":41,"column":21}},{"start":{"line":41,"column":25},"end":{"line":41,"column":37}}],"line":41},"6":{"loc":{"start":{"line":55,"column":6},"end":{"line":57,"column":7}},"type":"if","locations":[{"start":{"line":55,"column":6},"end":{"line":57,"column":7}},{"start":{},"end":{}}],"line":55},"7":{"loc":{"start":{"line":65,"column":6},"end":{"line":67,"column":7}},"type":"if","locations":[{"start":{"line":65,"column":6},"end":{"line":67,"column":7}},{"start":{},"end":{}}],"line":65},"8":{"loc":{"start":{"line":76,"column":6},"end":{"line":78,"column":7}},"type":"if","locations":[{"start":{"line":76,"column":6},"end":{"line":78,"column":7}},{"start":{},"end":{}}],"line":76}},"s":{"0":2,"1":1,"2":1,"3":0,"4":0,"5":2,"6":1,"7":1,"8":5,"9":0,"10":5,"11":5,"12":30,"13":1,"14":0,"15":0,"16":0,"17":0,"18":0,"19":1,"20":5,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0},"f":{"0":2,"1":1,"2":5,"3":5,"4":30,"5":0,"6":0,"7":1,"8":5,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0},"b":{"0":[1,1],"1":[0,5],"2":[1,29],"3":[30,6],"4":[0,0],"5":[0,0],"6":[0,0],"7":[0,0],"8":[0,0]},"_coverageSchema":"1a1c01bbd47fc00a2c39e90264f33305004495a9","hash":"ec056de4f933c393990fa4f512bd06b3cd26866f"} +} diff --git a/coverage/lcov-report/Lotto.js.html b/coverage/lcov-report/Lotto.js.html new file mode 100644 index 000000000..adf5f0830 --- /dev/null +++ b/coverage/lcov-report/Lotto.js.html @@ -0,0 +1,355 @@ + + + + + + Code coverage report for Lotto.js + + + + + + + + + +
+
+

All files Lotto.js

+
+ +
+ 34.21% + Statements + 13/38 +
+ + +
+ 38.88% + Branches + 7/18 +
+ + +
+ 43.75% + Functions + 7/16 +
+ + +
+ 32.43% + Lines + 12/37 +
+ + +
+

+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +

+ +
+
+ 

+
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91 
+ 
+ 
+ 
+ 
+ 
+ 
+2x
+1x
+1x
+ 
+ 
+ 
+ 
+ 
+2x
+1x
+ 
+ 
+ 
+ 
+1x
+5x
+ 
+ 
+5x
+ 
+ 
+ 
+5x
+30x
+1x
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+5x
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
import {Random} from '@woowacourse/mission-utils'
+import * as Console from "node:console";
+ 
+class Lotto {
+  #numbers;
+ 
+  constructor(numbers) {
+    this.#validate(numbers);
+    this.sortNumber(numbers);
+    this.isUniqueNumber(numbers);
+    this.checkNumberRange(numbers);
+    this.#numbers = numbers;
+  }
+ 
+  #validate(numbers) {
+    if (numbers.length !== 6) {
+      throw new Error("[ERROR] 로또 번호는 6개여야 합니다.");
+    }
+  }
+ 
+  isUniqueNumber(numbers){
+    numbers.map((num, index)=>{
+      Iif(isNaN(num)){
+        throw new Error("[ERROR] : 로또 번호는 숫자여야합니다.")
+      }
+      this.checkDupNumber(num, index, numbers);
+    })
+  }
+  checkDupNumber(target, targetIndex, numbers){
+    numbers.map((num, index)=>{
+      if(num === target && targetIndex !== index){
+        throw new Error("[ERROR] : 로또 번호는 중복될 수 없습니다.")
+      }
+    })
+  }
+ 
+  checkNumberRange(numbers){
+    const minNum = 1;
+    const maxNum = 45;
+    numbers.map((num)=>{
+      if(num > maxNum || num < minNum){
+        throw new Error("[ERROR] : 로또 번호는 1부터 45 사이의 숫자여야 합니다.")
+      }
+    })
+  }
+ 
+  sortNumber(numbers){
+    numbers = numbers.sort((a,b)=> a - b);
+  }
+ 
+  isNumberWin(number, winNumbers){
+    let win = false;
+    winNumbers.map((winNum)=>{
+      winNum = Number.parseInt(winNum);
+      if(number === winNum){
+        win = true;
+      }
+    })
+    return win;
+  }
+ 
+  isLottoWin(targetLotto, winLotto){
+    let winNumCount = 0;
+    targetLotto.getNumber().map((targetNum)=>{
+      if(this.isNumberWin(targetNum, winLotto.getNumber())){
+        winNumCount++;
+      }
+    });
+ 
+    return winNumCount;
+  }
+ 
+  isBonus(bonusNumber){
+    let winBonus = false;
+    this.#numbers.map((num)=>{
+      if(num === Number.parseInt(bonusNumber)){
+        winBonus = true;
+      }
+    });
+    return winBonus;
+  }
+ 
+  getNumber(){
+    return this.#numbers;
+  }
+ 
+  // TODO: 추가 기능 구현
+}
+ 
+export default Lotto;
+ 
+ +
+
+
+ Code coverage generated by + istanbul + at 2024-11-04T12:43:27.371Z +
+ + + + + + + \ No newline at end of file diff --git a/coverage/lcov-report/base.css b/coverage/lcov-report/base.css new file mode 100644 index 000000000..f418035b4 --- /dev/null +++ b/coverage/lcov-report/base.css @@ -0,0 +1,224 @@ +body, html { + margin:0; padding: 0; + height: 100%; +} +body { + font-family: Helvetica Neue, Helvetica, Arial; + font-size: 14px; + color:#333; +} +.small { font-size: 12px; } +*, *:after, *:before { + -webkit-box-sizing:border-box; + -moz-box-sizing:border-box; + box-sizing:border-box; + } +h1 { font-size: 20px; margin: 0;} +h2 { font-size: 14px; } +pre { + font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace; + margin: 0; + padding: 0; + -moz-tab-size: 2; + -o-tab-size: 2; + tab-size: 2; +} +a { color:#0074D9; text-decoration:none; } +a:hover { text-decoration:underline; } +.strong { font-weight: bold; } +.space-top1 { padding: 10px 0 0 0; } +.pad2y { padding: 20px 0; } +.pad1y { padding: 10px 0; } +.pad2x { padding: 0 20px; } +.pad2 { padding: 20px; } +.pad1 { padding: 10px; } +.space-left2 { padding-left:55px; } +.space-right2 { padding-right:20px; } +.center { text-align:center; } +.clearfix { display:block; } +.clearfix:after { + content:''; + display:block; + height:0; + clear:both; + visibility:hidden; + } +.fl { float: left; } +@media only screen and (max-width:640px) { + .col3 { width:100%; max-width:100%; } + .hide-mobile { display:none!important; } +} + +.quiet { + color: #7f7f7f; + color: rgba(0,0,0,0.5); +} +.quiet a { opacity: 0.7; } + +.fraction { + font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-size: 10px; + color: #555; + background: #E8E8E8; + padding: 4px 5px; + border-radius: 3px; + vertical-align: middle; +} + +div.path a:link, div.path a:visited { color: #333; } +table.coverage { + border-collapse: collapse; + margin: 10px 0 0 0; + padding: 0; +} + +table.coverage td { + margin: 0; + padding: 0; + vertical-align: top; +} +table.coverage td.line-count { + text-align: right; + padding: 0 5px 0 20px; +} +table.coverage td.line-coverage { + text-align: right; + padding-right: 10px; + min-width:20px; +} + +table.coverage td span.cline-any { + display: inline-block; + padding: 0 5px; + width: 100%; +} +.missing-if-branch { + display: inline-block; + margin-right: 5px; + border-radius: 3px; + position: relative; + padding: 0 4px; + background: #333; + color: yellow; +} + +.skip-if-branch { + display: none; + margin-right: 10px; + position: relative; + padding: 0 4px; + background: #ccc; + color: white; +} +.missing-if-branch .typ, .skip-if-branch .typ { + color: inherit !important; +} +.coverage-summary { + border-collapse: collapse; + width: 100%; +} +.coverage-summary tr { border-bottom: 1px solid #bbb; } +.keyline-all { border: 1px solid #ddd; } +.coverage-summary td, .coverage-summary th { padding: 10px; } +.coverage-summary tbody { border: 1px solid #bbb; } +.coverage-summary td { border-right: 1px solid #bbb; } +.coverage-summary td:last-child { border-right: none; } +.coverage-summary th { + text-align: left; + font-weight: normal; + white-space: nowrap; +} +.coverage-summary th.file { border-right: none !important; } +.coverage-summary th.pct { } +.coverage-summary th.pic, +.coverage-summary th.abs, +.coverage-summary td.pct, +.coverage-summary td.abs { text-align: right; } +.coverage-summary td.file { white-space: nowrap; } +.coverage-summary td.pic { min-width: 120px !important; } +.coverage-summary tfoot td { } + +.coverage-summary .sorter { + height: 10px; + width: 7px; + display: inline-block; + margin-left: 0.5em; + background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent; +} +.coverage-summary .sorted .sorter { + background-position: 0 -20px; +} +.coverage-summary .sorted-desc .sorter { + background-position: 0 -10px; +} +.status-line { height: 10px; } +/* yellow */ +.cbranch-no { background: yellow !important; color: #111; } +/* dark red */ +.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 } +.low .chart { border:1px solid #C21F39 } +.highlighted, +.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{ + background: #C21F39 !important; +} +/* medium red */ +.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE } +/* light red */ +.low, .cline-no { background:#FCE1E5 } +/* light green */ +.high, .cline-yes { background:rgb(230,245,208) } +/* medium green */ +.cstat-yes { background:rgb(161,215,106) } +/* dark green */ +.status-line.high, .high .cover-fill { background:rgb(77,146,33) } +.high .chart { border:1px solid rgb(77,146,33) } +/* dark yellow (gold) */ +.status-line.medium, .medium .cover-fill { background: #f9cd0b; } +.medium .chart { border:1px solid #f9cd0b; } +/* light yellow */ +.medium { background: #fff4c2; } + +.cstat-skip { background: #ddd; color: #111; } +.fstat-skip { background: #ddd; color: #111 !important; } +.cbranch-skip { background: #ddd !important; color: #111; } + +span.cline-neutral { background: #eaeaea; } + +.coverage-summary td.empty { + opacity: .5; + padding-top: 4px; + padding-bottom: 4px; + line-height: 1; + color: #888; +} + +.cover-fill, .cover-empty { + display:inline-block; + height: 12px; +} +.chart { + line-height: 0; +} +.cover-empty { + background: white; +} +.cover-full { + border-right: none !important; +} +pre.prettyprint { + border: none !important; + padding: 0 !important; + margin: 0 !important; +} +.com { color: #999 !important; } +.ignore-none { color: #999; font-weight: normal; } + +.wrapper { + min-height: 100%; + height: auto !important; + height: 100%; + margin: 0 auto -48px; +} +.footer, .push { + height: 48px; +} diff --git a/coverage/lcov-report/block-navigation.js b/coverage/lcov-report/block-navigation.js new file mode 100644 index 000000000..cc1213023 --- /dev/null +++ b/coverage/lcov-report/block-navigation.js @@ -0,0 +1,87 @@ +/* eslint-disable */ +var jumpToCode = (function init() { + // Classes of code we would like to highlight in the file view + var missingCoverageClasses = ['.cbranch-no', '.cstat-no', '.fstat-no']; + + // Elements to highlight in the file listing view + var fileListingElements = ['td.pct.low']; + + // We don't want to select elements that are direct descendants of another match + var notSelector = ':not(' + missingCoverageClasses.join('):not(') + ') > '; // becomes `:not(a):not(b) > ` + + // Selecter that finds elements on the page to which we can jump + var selector = + fileListingElements.join(', ') + + ', ' + + notSelector + + missingCoverageClasses.join(', ' + notSelector); // becomes `:not(a):not(b) > a, :not(a):not(b) > b` + + // The NodeList of matching elements + var missingCoverageElements = document.querySelectorAll(selector); + + var currentIndex; + + function toggleClass(index) { + missingCoverageElements + .item(currentIndex) + .classList.remove('highlighted'); + missingCoverageElements.item(index).classList.add('highlighted'); + } + + function makeCurrent(index) { + toggleClass(index); + currentIndex = index; + missingCoverageElements.item(index).scrollIntoView({ + behavior: 'smooth', + block: 'center', + inline: 'center' + }); + } + + function goToPrevious() { + var nextIndex = 0; + if (typeof currentIndex !== 'number' || currentIndex === 0) { + nextIndex = missingCoverageElements.length - 1; + } else if (missingCoverageElements.length > 1) { + nextIndex = currentIndex - 1; + } + + makeCurrent(nextIndex); + } + + function goToNext() { + var nextIndex = 0; + + if ( + typeof currentIndex === 'number' && + currentIndex < missingCoverageElements.length - 1 + ) { + nextIndex = currentIndex + 1; + } + + makeCurrent(nextIndex); + } + + return function jump(event) { + if ( + document.getElementById('fileSearch') === document.activeElement && + document.activeElement != null + ) { + // if we're currently focused on the search input, we don't want to navigate + return; + } + + switch (event.which) { + case 78: // n + case 74: // j + goToNext(); + break; + case 66: // b + case 75: // k + case 80: // p + goToPrevious(); + break; + } + }; +})(); +window.addEventListener('keydown', jumpToCode); diff --git a/coverage/lcov-report/favicon.png b/coverage/lcov-report/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..c1525b811a167671e9de1fa78aab9f5c0b61cef7 GIT binary patch literal 445 zcmV;u0Yd(XP))rP{nL}Ln%S7`m{0DjX9TLF* zFCb$4Oi7vyLOydb!7n&^ItCzb-%BoB`=x@N2jll2Nj`kauio%aw_@fe&*}LqlFT43 z8doAAe))z_%=P%v^@JHp3Hjhj^6*Kr_h|g_Gr?ZAa&y>wxHE99Gk>A)2MplWz2xdG zy8VD2J|Uf#EAw*bo5O*PO_}X2Tob{%bUoO2G~T`@%S6qPyc}VkhV}UifBuRk>%5v( z)x7B{I~z*k<7dv#5tC+m{km(D087J4O%+<<;K|qwefb6@GSX45wCK}Sn*> + + + + Code coverage report for All files + + + + + + + + + +
+
+

All files

+
+ +
+ 34.21% + Statements + 13/38 +
+ + +
+ 38.88% + Branches + 7/18 +
+ + +
+ 43.75% + Functions + 7/16 +
+ + +
+ 32.43% + Lines + 12/37 +
+ + +
+

+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +

+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileStatementsBranchesFunctionsLines
Lotto.js +
+ 		34.21%13/3838.88%7/1843.75%7/1632.43%12/37
+
+
+
+
+ Code coverage generated by + istanbul + at 2024-11-04T12:43:27.371Z +
+ + + + + + + \ No newline at end of file diff --git a/coverage/lcov-report/prettify.css b/coverage/lcov-report/prettify.css new file mode 100644 index 000000000..b317a7cda --- /dev/null +++ b/coverage/lcov-report/prettify.css @@ -0,0 +1 @@ +.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee} diff --git a/coverage/lcov-report/prettify.js b/coverage/lcov-report/prettify.js new file mode 100644 index 000000000..b3225238f --- /dev/null +++ b/coverage/lcov-report/prettify.js @@ -0,0 +1,2 @@ +/* eslint-disable */ +window.PR_SHOULD_USE_CONTINUATION=true;(function(){var h=["break,continue,do,else,for,if,return,while"];var u=[h,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var p=[u,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var l=[p,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var x=[p,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var R=[x,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"];var r="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes";var w=[p,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var s="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var I=[h,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var f=[h,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var H=[h,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var A=[l,R,w,s+I,f,H];var e=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/;var C="str";var z="kwd";var j="com";var O="typ";var G="lit";var L="pun";var F="pln";var m="tag";var E="dec";var J="src";var P="atn";var n="atv";var N="nocode";var M="(?:^^\\.?|[+-]|\\!|\\!=|\\!==|\\#|\\%|\\%=|&|&&|&&=|&=|\\(|\\*|\\*=|\\+=|\\,|\\-=|\\->|\\/|\\/=|:|::|\\;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\@|\\[|\\^|\\^=|\\^\\^|\\^\\^=|\\{|\\||\\|=|\\|\\||\\|\\|=|\\~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function k(Z){var ad=0;var S=false;var ac=false;for(var V=0,U=Z.length;V122)){if(!(al<65||ag>90)){af.push([Math.max(65,ag)|32,Math.min(al,90)|32])}if(!(al<97||ag>122)){af.push([Math.max(97,ag)&~32,Math.min(al,122)&~32])}}}}af.sort(function(av,au){return(av[0]-au[0])||(au[1]-av[1])});var ai=[];var ap=[NaN,NaN];for(var ar=0;arat[0]){if(at[1]+1>at[0]){an.push("-")}an.push(T(at[1]))}}an.push("]");return an.join("")}function W(al){var aj=al.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var ah=aj.length;var an=[];for(var ak=0,am=0;ak=2&&ai==="["){aj[ak]=X(ag)}else{if(ai!=="\\"){aj[ak]=ag.replace(/[a-zA-Z]/g,function(ao){var ap=ao.charCodeAt(0);return"["+String.fromCharCode(ap&~32,ap|32)+"]"})}}}}return aj.join("")}var aa=[];for(var V=0,U=Z.length;V=0;){S[ac.charAt(ae)]=Y}}var af=Y[1];var aa=""+af;if(!ag.hasOwnProperty(aa)){ah.push(af);ag[aa]=null}}ah.push(/[\0-\uffff]/);V=k(ah)})();var X=T.length;var W=function(ah){var Z=ah.sourceCode,Y=ah.basePos;var ad=[Y,F];var af=0;var an=Z.match(V)||[];var aj={};for(var ae=0,aq=an.length;ae=5&&"lang-"===ap.substring(0,5);if(am&&!(ai&&typeof ai[1]==="string")){am=false;ap=J}if(!am){aj[ag]=ap}}var ab=af;af+=ag.length;if(!am){ad.push(Y+ab,ap)}else{var al=ai[1];var ak=ag.indexOf(al);var ac=ak+al.length;if(ai[2]){ac=ag.length-ai[2].length;ak=ac-al.length}var ar=ap.substring(5);B(Y+ab,ag.substring(0,ak),W,ad);B(Y+ab+ak,al,q(ar,al),ad);B(Y+ab+ac,ag.substring(ac),W,ad)}}ah.decorations=ad};return W}function i(T){var W=[],S=[];if(T.tripleQuotedStrings){W.push([C,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(T.multiLineStrings){W.push([C,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{W.push([C,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(T.verbatimStrings){S.push([C,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var Y=T.hashComments;if(Y){if(T.cStyleComments){if(Y>1){W.push([j,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{W.push([j,/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}S.push([C,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,null])}else{W.push([j,/^#[^\r\n]*/,null,"#"])}}if(T.cStyleComments){S.push([j,/^\/\/[^\r\n]*/,null]);S.push([j,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(T.regexLiterals){var X=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");S.push(["lang-regex",new RegExp("^"+M+"("+X+")")])}var V=T.types;if(V){S.push([O,V])}var U=(""+T.keywords).replace(/^ | $/g,"");if(U.length){S.push([z,new RegExp("^(?:"+U.replace(/[\s,]+/g,"|")+")\\b"),null])}W.push([F,/^\s+/,null," \r\n\t\xA0"]);S.push([G,/^@[a-z_$][a-z_$@0-9]*/i,null],[O,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[F,/^[a-z_$][a-z_$@0-9]*/i,null],[G,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[F,/^\\[\s\S]?/,null],[L,/^.[^\s\w\.$@\'\"\`\/\#\\]*/,null]);return g(W,S)}var K=i({keywords:A,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function Q(V,ag){var U=/(?:^|\s)nocode(?:\s|$)/;var ab=/\r\n?|\n/;var ac=V.ownerDocument;var S;if(V.currentStyle){S=V.currentStyle.whiteSpace}else{if(window.getComputedStyle){S=ac.defaultView.getComputedStyle(V,null).getPropertyValue("white-space")}}var Z=S&&"pre"===S.substring(0,3);var af=ac.createElement("LI");while(V.firstChild){af.appendChild(V.firstChild)}var W=[af];function ae(al){switch(al.nodeType){case 1:if(U.test(al.className)){break}if("BR"===al.nodeName){ad(al);if(al.parentNode){al.parentNode.removeChild(al)}}else{for(var an=al.firstChild;an;an=an.nextSibling){ae(an)}}break;case 3:case 4:if(Z){var am=al.nodeValue;var aj=am.match(ab);if(aj){var ai=am.substring(0,aj.index);al.nodeValue=ai;var ah=am.substring(aj.index+aj[0].length);if(ah){var ak=al.parentNode;ak.insertBefore(ac.createTextNode(ah),al.nextSibling)}ad(al);if(!ai){al.parentNode.removeChild(al)}}}break}}function ad(ak){while(!ak.nextSibling){ak=ak.parentNode;if(!ak){return}}function ai(al,ar){var aq=ar?al.cloneNode(false):al;var ao=al.parentNode;if(ao){var ap=ai(ao,1);var an=al.nextSibling;ap.appendChild(aq);for(var am=an;am;am=an){an=am.nextSibling;ap.appendChild(am)}}return aq}var ah=ai(ak.nextSibling,0);for(var aj;(aj=ah.parentNode)&&aj.nodeType===1;){ah=aj}W.push(ah)}for(var Y=0;Y=S){ah+=2}if(V>=ap){Z+=2}}}var t={};function c(U,V){for(var S=V.length;--S>=0;){var T=V[S];if(!t.hasOwnProperty(T)){t[T]=U}else{if(window.console){console.warn("cannot override language handler %s",T)}}}}function q(T,S){if(!(T&&t.hasOwnProperty(T))){T=/^\s*]*(?:>|$)/],[j,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[L,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);c(g([[F,/^[\s]+/,null," \t\r\n"],[n,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[m,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[P,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[L,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);c(g([],[[n,/^[\s\S]+/]]),["uq.val"]);c(i({keywords:l,hashComments:true,cStyleComments:true,types:e}),["c","cc","cpp","cxx","cyc","m"]);c(i({keywords:"null,true,false"}),["json"]);c(i({keywords:R,hashComments:true,cStyleComments:true,verbatimStrings:true,types:e}),["cs"]);c(i({keywords:x,cStyleComments:true}),["java"]);c(i({keywords:H,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);c(i({keywords:I,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);c(i({keywords:s,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);c(i({keywords:f,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);c(i({keywords:w,cStyleComments:true,regexLiterals:true}),["js"]);c(i({keywords:r,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);c(g([],[[C,/^[\s\S]+/]]),["regex"]);function d(V){var U=V.langExtension;try{var S=a(V.sourceNode);var T=S.sourceCode;V.sourceCode=T;V.spans=S.spans;V.basePos=0;q(U,T)(V);D(V)}catch(W){if("console" in window){console.log(W&&W.stack?W.stack:W)}}}function y(W,V,U){var S=document.createElement("PRE");S.innerHTML=W;if(U){Q(S,U)}var T={langExtension:V,numberLines:U,sourceNode:S};d(T);return S.innerHTML}function b(ad){function Y(af){return document.getElementsByTagName(af)}var ac=[Y("pre"),Y("code"),Y("xmp")];var T=[];for(var aa=0;aa=0){var ah=ai.match(ab);var am;if(!ah&&(am=o(aj))&&"CODE"===am.tagName){ah=am.className.match(ab)}if(ah){ah=ah[1]}var al=false;for(var ak=aj.parentNode;ak;ak=ak.parentNode){if((ak.tagName==="pre"||ak.tagName==="code"||ak.tagName==="xmp")&&ak.className&&ak.className.indexOf("prettyprint")>=0){al=true;break}}if(!al){var af=aj.className.match(/\blinenums\b(?::(\d+))?/);af=af?af[1]&&af[1].length?+af[1]:true:false;if(af){Q(aj,af)}S={langExtension:ah,sourceNode:aj,numberLines:af};d(S)}}}if(X]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]); diff --git a/coverage/lcov-report/sort-arrow-sprite.png b/coverage/lcov-report/sort-arrow-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed68316eb3f65dec9063332d2f69bf3093bbfab GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^>_9Bd!3HEZxJ@+%Qh}Z>jv*C{$p!i!8j}?a+@3A= zIAGwzjijN=FBi!|L1t?LM;Q;gkwn>2cAy-KV{dn nf0J1DIvEHQu*n~6U}x}qyky7vi4|9XhBJ7&`njxgN@xNA8m%nc literal 0 HcmV?d00001 diff --git a/coverage/lcov-report/sorter.js b/coverage/lcov-report/sorter.js new file mode 100644 index 000000000..2bb296a8c --- /dev/null +++ b/coverage/lcov-report/sorter.js @@ -0,0 +1,196 @@ +/* eslint-disable */ +var addSorting = (function() { + 'use strict'; + var cols, + currentSort = { + index: 0, + desc: false + }; + + // returns the summary table element + function getTable() { + return document.querySelector('.coverage-summary'); + } + // returns the thead element of the summary table + function getTableHeader() { + return getTable().querySelector('thead tr'); + } + // returns the tbody element of the summary table + function getTableBody() { + return getTable().querySelector('tbody'); + } + // returns the th element for nth column + function getNthColumn(n) { + return getTableHeader().querySelectorAll('th')[n]; + } + + function onFilterInput() { + const searchValue = document.getElementById('fileSearch').value; + const rows = document.getElementsByTagName('tbody')[0].children; + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + if ( + row.textContent + .toLowerCase() + .includes(searchValue.toLowerCase()) + ) { + row.style.display = ''; + } else { + row.style.display = 'none'; + } + } + } + + // loads the search box + function addSearchBox() { + var template = document.getElementById('filterTemplate'); + var templateClone = template.content.cloneNode(true); + templateClone.getElementById('fileSearch').oninput = onFilterInput; + template.parentElement.appendChild(templateClone); + } + + // loads all columns + function loadColumns() { + var colNodes = getTableHeader().querySelectorAll('th'), + colNode, + cols = [], + col, + i; + + for (i = 0; i < colNodes.length; i += 1) { + colNode = colNodes[i]; + col = { + key: colNode.getAttribute('data-col'), + sortable: !colNode.getAttribute('data-nosort'), + type: colNode.getAttribute('data-type') || 'string' + }; + cols.push(col); + if (col.sortable) { + col.defaultDescSort = col.type === 'number'; + colNode.innerHTML = + colNode.innerHTML + ''; + } + } + return cols; + } + // attaches a data attribute to every tr element with an object + // of data values keyed by column name + function loadRowData(tableRow) { + var tableCols = tableRow.querySelectorAll('td'), + colNode, + col, + data = {}, + i, + val; + for (i = 0; i < tableCols.length; i += 1) { + colNode = tableCols[i]; + col = cols[i]; + val = colNode.getAttribute('data-value'); + if (col.type === 'number') { + val = Number(val); + } + data[col.key] = val; + } + return data; + } + // loads all row data + function loadData() { + var rows = getTableBody().querySelectorAll('tr'), + i; + + for (i = 0; i < rows.length; i += 1) { + rows[i].data = loadRowData(rows[i]); + } + } + // sorts the table using the data for the ith column + function sortByIndex(index, desc) { + var key = cols[index].key, + sorter = function(a, b) { + a = a.data[key]; + b = b.data[key]; + return a < b ? -1 : a > b ? 1 : 0; + }, + finalSorter = sorter, + tableBody = document.querySelector('.coverage-summary tbody'), + rowNodes = tableBody.querySelectorAll('tr'), + rows = [], + i; + + if (desc) { + finalSorter = function(a, b) { + return -1 * sorter(a, b); + }; + } + + for (i = 0; i < rowNodes.length; i += 1) { + rows.push(rowNodes[i]); + tableBody.removeChild(rowNodes[i]); + } + + rows.sort(finalSorter); + + for (i = 0; i < rows.length; i += 1) { + tableBody.appendChild(rows[i]); + } + } + // removes sort indicators for current column being sorted + function removeSortIndicators() { + var col = getNthColumn(currentSort.index), + cls = col.className; + + cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, ''); + col.className = cls; + } + // adds sort indicators for current column being sorted + function addSortIndicators() { + getNthColumn(currentSort.index).className += currentSort.desc + ? ' sorted-desc' + : ' sorted'; + } + // adds event listeners for all sorter widgets + function enableUI() { + var i, + el, + ithSorter = function ithSorter(i) { + var col = cols[i]; + + return function() { + var desc = col.defaultDescSort; + + if (currentSort.index === i) { + desc = !currentSort.desc; + } + sortByIndex(i, desc); + removeSortIndicators(); + currentSort.index = i; + currentSort.desc = desc; + addSortIndicators(); + }; + }; + for (i = 0; i < cols.length; i += 1) { + if (cols[i].sortable) { + // add the click event handler on the th so users + // dont have to click on those tiny arrows + el = getNthColumn(i).querySelector('.sorter').parentElement; + if (el.addEventListener) { + el.addEventListener('click', ithSorter(i)); + } else { + el.attachEvent('onclick', ithSorter(i)); + } + } + } + } + // adds sorting functionality to the UI + return function() { + if (!getTable()) { + return; + } + cols = loadColumns(); + loadData(); + addSearchBox(); + addSortIndicators(); + enableUI(); + }; +})(); + +window.addEventListener('load', addSorting); diff --git a/coverage/lcov.info b/coverage/lcov.info new file mode 100644 index 000000000..1a453511c --- /dev/null +++ b/coverage/lcov.info @@ -0,0 +1,96 @@ +TN: +SF:src\Lotto.js +FN:7,(anonymous_0) +FN:21,(anonymous_1) +FN:22,(anonymous_2) +FN:29,(anonymous_3) +FN:30,(anonymous_4) +FN:37,(anonymous_5) +FN:40,(anonymous_6) +FN:47,(anonymous_7) +FN:48,(anonymous_8) +FN:51,(anonymous_9) +FN:53,(anonymous_10) +FN:62,(anonymous_11) +FN:64,(anonymous_12) +FN:73,(anonymous_13) +FN:75,(anonymous_14) +FN:83,(anonymous_15) +FNF:16 +FNH:7 +FNDA:2,(anonymous_0) +FNDA:1,(anonymous_1) +FNDA:5,(anonymous_2) +FNDA:5,(anonymous_3) +FNDA:30,(anonymous_4) +FNDA:0,(anonymous_5) +FNDA:0,(anonymous_6) +FNDA:1,(anonymous_7) +FNDA:5,(anonymous_8) +FNDA:0,(anonymous_9) +FNDA:0,(anonymous_10) +FNDA:0,(anonymous_11) +FNDA:0,(anonymous_12) +FNDA:0,(anonymous_13) +FNDA:0,(anonymous_14) +FNDA:0,(anonymous_15) +DA:8,2 +DA:9,1 +DA:10,1 +DA:11,0 +DA:12,0 +DA:16,2 +DA:17,1 +DA:22,1 +DA:23,5 +DA:24,0 +DA:26,5 +DA:30,5 +DA:31,30 +DA:32,1 +DA:38,0 +DA:39,0 +DA:40,0 +DA:41,0 +DA:42,0 +DA:48,5 +DA:52,0 +DA:53,0 +DA:54,0 +DA:55,0 +DA:56,0 +DA:59,0 +DA:63,0 +DA:64,0 +DA:65,0 +DA:66,0 +DA:70,0 +DA:74,0 +DA:75,0 +DA:76,0 +DA:77,0 +DA:80,0 +DA:84,0 +LF:37 +LH:12 +BRDA:16,0,0,1 +BRDA:16,0,1,1 +BRDA:23,1,0,0 +BRDA:23,1,1,5 +BRDA:31,2,0,1 +BRDA:31,2,1,29 +BRDA:31,3,0,30 +BRDA:31,3,1,6 +BRDA:41,4,0,0 +BRDA:41,4,1,0 +BRDA:41,5,0,0 +BRDA:41,5,1,0 +BRDA:55,6,0,0 +BRDA:55,6,1,0 +BRDA:65,7,0,0 +BRDA:65,7,1,0 +BRDA:76,8,0,0 +BRDA:76,8,1,0 +BRF:18 +BRH:7 +end_of_record diff --git a/src/App.js b/src/App.js index c91551e59..e04a374f7 100644 --- a/src/App.js +++ b/src/App.js @@ -10,16 +10,15 @@ const moneyUnit = 1000; class App { async run() { - // Console.print("구매할 금액을 입력해주세요."); - // const totalMoney = await Console.readLineAsync(""); + let correctInput = false; let totalMoney = 0; while(!correctInput){ - totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요."); + totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요.\n"); if(totalMoney % moneyUnit !== 0){ - // throw new Error("[ERROR] 구입 금액은 1000원 단위여야 합니다.") Console.print("[ERROR] 구입 금액은 1000원 단위여야 합니다."); + continue; } correctInput = true; } @@ -31,13 +30,10 @@ class App { for(let i = 0; i < lottoCount; i++){ lottoNumber.push(new Lotto(Random.pickUniqueNumbersInRange(1,45,6))); } - // const lottoNumber = [new Lotto([1,2,3,4,5,6]), - // new Lotto([45, 43, 42, 41, 40, 39]), - // new Lotto([5,6,4,2,7,8]), new Lotto([2,3,4,5,6,7]), - // new Lotto([4,5,6,7,8,9])]; lottoNumber.map((lotto)=>{ - Console.print(lotto.getNumber()); + const output = Object.values(lotto.getNumber()).join(', '); + Console.print(`[${output}]`); }) Console.print(""); @@ -89,7 +85,7 @@ class App { const rank = index + 1; let matchCount = convertRankToMatchCount(rank); if(matchCount === -secRankMatch){ - matchBonus = ", 보너스 볼 일치"; + matchBonus = ", 보너스 볼 일치 "; matchCount = secRankMatch; } earnMoney += winPriceNumber[index]*winEntry; @@ -99,13 +95,12 @@ class App { }) Console.print(result); - Console.print(`총 수익률은 ${calRevenueRate(totalMoney, earnMoney)}%입니다`); + Console.print(`총 수익률은 ${calRevenueRate(totalMoney, earnMoney)}%입니다.`); } } function calRevenueRate(costMoney, earnMoney){ - const profit = earnMoney - costMoney; - const RevenueRate = (profit / costMoney) * 100; + const RevenueRate = (earnMoney / costMoney) * 100; return RevenueRate.toFixed(1); } From e3bfc71313ea22d974e286890b1a4a4eb239b24e Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 23:41:43 +0900 Subject: [PATCH 17/18] =?UTF-8?q?feat(input,=20ERROR)=20=EC=9E=98=EB=AA=BB?= =?UTF-8?q?=EB=90=9C=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C,=20=EB=8B=A4?= =?UTF-8?q?=EC=8B=9C=20=EC=9E=85=EB=A0=A5=EB=B0=9B=EB=8A=94=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 잘못된 사용자 입력에 대해서 에러를 띄우고 프로그램 종료가 아니라, 적절한 에러메세지와 함께 다시 입력받도록 하는 기능을 추가 --- src/App.js | 271 ++++++++++++++++++++++++++++++++------------------- src/Lotto.js | 146 ++++++++++++++------------- 2 files changed, 242 insertions(+), 175 deletions(-) diff --git a/src/App.js b/src/App.js index e04a374f7..497e89a82 100644 --- a/src/App.js +++ b/src/App.js @@ -9,127 +9,196 @@ const maxRank = 5, secRankMatch = 5; const moneyUnit = 1000; class App { - async run() { - - let correctInput = false; - - let totalMoney = 0; - while(!correctInput){ - totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요.\n"); - if(totalMoney % moneyUnit !== 0){ - Console.print("[ERROR] 구입 금액은 1000원 단위여야 합니다."); - continue; - } - correctInput = true; + async run() { + + let correctInput = false; + + let totalMoney = 0; + while (!correctInput) { + totalMoney = await Console.readLineAsync("구매할 금액을 입력해주세요.\n"); + if (totalMoney % moneyUnit !== 0) { + Console.print("[ERROR] 구입 금액은 1000원 단위여야 합니다."); + continue; + } + correctInput = true; + } + + const lottoCount = totalMoney / moneyUnit; + Console.print(`${lottoCount}개를 구매했습니다.`); + + const lottoNumber = []; + for (let i = 0; i < lottoCount; i++) { + lottoNumber.push(new Lotto(Random.pickUniqueNumbersInRange(1, 45, 6))); + } + + lottoNumber.map((lotto) => { + const output = Object.values(lotto.getNumber()).join(', '); + Console.print(`[${output}]`); + }) + Console.print(""); + + correctInput = false; + let winString = ""; + let winNumber; + while (!correctInput) { + winString = await Console.readLineAsync("당첨 번호를 입력해주세요 : "); + winNumber = winString.split(','); + + if(winNumber.length !== firRankMatch){ + Console.print("[ERROR] : 당첨번호는 6개 숫자여야합니다."); + correctInput = false; + continue; + } + + winNumber.map((num) => { + num = Number.parseInt(num); + }) + + if (!isUniqueNumber(winNumber) || !checkNumberRange(winNumber)) { + correctInput = false; + continue; + } + correctInput = true; + + } + const winLotto = new Lotto(winNumber); + + let bonusNumber; + correctInput = false; + let flag = 0; + while (!correctInput) { + flag = 0; + bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); + if (flag === 0 && isNaN(bonusNumber)) { + Console.print("[ERROR] : 로또 번호는 숫자여야합니다."); + flag = 1; + } + const minNum = 1; + const maxNum = 45; + winNumber.map((winNum) => { + if (flag === 0 && winNum === bonusNumber) { + Console.print("[ERROR] : 보너스 번호는 당첨 번호와 중복될 수 없습니다."); + flag = 2; + } + if (flag === 0 && (bonusNumber < minNum || bonusNumber > maxNum)) { + Console.print(`[ERROR] : 보너스 번호는 ${minNum}부터 ${maxNum}까지의 숫자여야 합니다.`); + flag = 3; + } + }) + if (flag === 0) { + correctInput = true; + } + } + + Console.print("당첨 통계\n---"); + + const winList = new Array(maxRank).fill(0); + lottoNumber.map((lotto) => { + const rank = convertMatchCountToRank(lotto, winLotto, bonusNumber); + if (rank <= maxRank) { + winList[rank - 1]++; + } + + }); + + let result = ""; + let earnMoney = 0; + + winList.map((winEntry, index) => { + let matchBonus = " "; + const rank = index + 1; + let matchCount = convertRankToMatchCount(rank); + if (matchCount === -secRankMatch) { + matchBonus = ", 보너스 볼 일치 "; + matchCount = secRankMatch; + } + earnMoney += winPriceNumber[index] * winEntry; + + const resultEntry = `${matchCount}개 일치${matchBonus}(${winPriceString[index]}원) - ${winEntry}개`; + result = resultEntry + "\n" + result; + }) + Console.print(result); + + Console.print(`총 수익률은 ${calRevenueRate(totalMoney, earnMoney)}%입니다.`); } +} - const lottoCount = totalMoney / moneyUnit; - Console.print(`${lottoCount}개를 구매했습니다.`); - - const lottoNumber = []; - for(let i = 0; i < lottoCount; i++){ - lottoNumber.push(new Lotto(Random.pickUniqueNumbersInRange(1,45,6))); - } - lottoNumber.map((lotto)=>{ - const output = Object.values(lotto.getNumber()).join(', '); - Console.print(`[${output}]`); +function isUniqueNumber(numbers) { + let flag = 0; + numbers.map((num, index) => { + if (isNaN(num)) { + flag = 1; + } else { + if (checkDupNumber(num, index, numbers) === 2) { + flag = 2; + } + } }) - Console.print(""); - - correctInput = false; - let winString = ""; - //while(!correctInput){ - winString = await Console.readLineAsync("당첨 번호를 입력해주세요 : "); - const winNumber = winString.split(','); - - winNumber.map((num)=>{ - num = Number.parseInt(num); - }) - const winLotto = new Lotto(winNumber); - //} - - const bonusNumber = await Console.readLineAsync("보너스 번호를 입력해주세요 : "); - if(isNaN(bonusNumber)){ - throw new Error("[ERROR] : 로또 번호는 숫자여야합니다.") + if (flag === 1) { + Console.print("[ERROR] : 로또 번호는 숫자여야합니다."); } + if (flag === 2) { + Console.print("[ERROR] : 로또 번호는 중복될 수 없습니다."); + } + return flag === 0; +} - const minNum = 1; - const maxNum = 45; - winNumber.map((winNum)=>{ - if(winNum === bonusNumber){ - throw new Error("[ERROR] : 보너스 번호는 당첨 번호와 중복될 수 없습니다."); - } - if(bonusNumber < minNum || bonusNumber > maxNum){ - throw new Error(`[ERROR] : 보너스 번호는 ${minNum}부터 ${maxNum}까지의 숫자여야 합니다.`); - } +function checkDupNumber(target, targetIndex, numbers) { + let flag = 0; + numbers.map((num, index) => { + if (num === target && targetIndex !== index) { + flag = 2; + } }) + return flag; +} - Console.print("당첨 통계\n---"); - - const winList = new Array(maxRank).fill(0); - lottoNumber.map((lotto)=>{ - const rank = convertMatchCountToRank(lotto, winLotto, bonusNumber); - if(rank <= maxRank){ - winList[rank-1]++; - } - - }); - - let result = ""; - let earnMoney = 0; - - winList.map((winEntry,index)=>{ - let matchBonus = " "; - const rank = index + 1; - let matchCount = convertRankToMatchCount(rank); - if(matchCount === -secRankMatch){ - matchBonus = ", 보너스 볼 일치 "; - matchCount = secRankMatch; - } - earnMoney += winPriceNumber[index]*winEntry; - - const resultEntry = `${matchCount}개 일치${matchBonus}(${winPriceString[index]}원) - ${winEntry}개`; - result = resultEntry + "\n" + result; +function checkNumberRange(numbers) { + let flag = 0; + const minNum = 1; + const maxNum = 45; + numbers.map((num) => { + if (num > maxNum || num < minNum) { + Console.print("[ERROR] : 로또 번호는 1부터 45 사이의 숫자여야 합니다."); + flag = 1; + } }) - Console.print(result); - - Console.print(`총 수익률은 ${calRevenueRate(totalMoney, earnMoney)}%입니다.`); - } + return flag === 0; } -function calRevenueRate(costMoney, earnMoney){ - const RevenueRate = (earnMoney / costMoney) * 100; - return RevenueRate.toFixed(1); +function calRevenueRate(costMoney, earnMoney) { + const RevenueRate = (earnMoney / costMoney) * 100; + return RevenueRate.toFixed(1); } -function convertRankToMatchCount(rank){ - const tool = 8; - const secWin = 2; - const firWin = 1; +function convertRankToMatchCount(rank) { + const tool = 8; + const secWin = 2; + const firWin = 1; - let matchCount = tool - rank; - if(rank === secWin) - return -5;//일단 5등처리 - if(rank === firWin) - return 6; + let matchCount = tool - rank; + if (rank === secWin) + return -5;//일단 5등처리 + if (rank === firWin) + return 6; - return matchCount; + return matchCount; } -function convertMatchCountToRank(lotto, winLotto, bonusNumber){ - const tool = 8; - let matchCount = lotto.isLottoWin(lotto, winLotto); +function convertMatchCountToRank(lotto, winLotto, bonusNumber) { + const tool = 8; + let matchCount = lotto.isLottoWin(lotto, winLotto); - if(matchCount === firRankMatch){ - matchCount++; - } - if(matchCount === secRankMatch && lotto.isBonus(bonusNumber)){ - matchCount++; - } + if (matchCount === firRankMatch) { + matchCount++; + } + if (matchCount === secRankMatch && lotto.isBonus(bonusNumber)) { + matchCount++; + } - return (tool - matchCount); + return (tool - matchCount); } export default App; diff --git a/src/Lotto.js b/src/Lotto.js index 47393b7c7..b6f864113 100644 --- a/src/Lotto.js +++ b/src/Lotto.js @@ -1,90 +1,88 @@ -import {Random} from '@woowacourse/mission-utils' -import * as Console from "node:console"; - class Lotto { - #numbers; + #numbers; - constructor(numbers) { - this.#validate(numbers); - this.sortNumber(numbers); - this.isUniqueNumber(numbers); - this.checkNumberRange(numbers); - this.#numbers = numbers; - } + constructor(numbers) { + this.#validate(numbers); + this.sortNumber(numbers); + this.isUniqueNumber(numbers); + this.checkNumberRange(numbers); + this.#numbers = numbers; + } - #validate(numbers) { - if (numbers.length !== 6) { - throw new Error("[ERROR] 로또 번호는 6개여야 합니다."); + #validate(numbers) { + if (numbers.length !== 6) { + throw new Error("[ERROR] 로또 번호는 6개여야 합니다."); + } } - } - isUniqueNumber(numbers){ - numbers.map((num, index)=>{ - if(isNaN(num)){ - throw new Error("[ERROR] : 로또 번호는 숫자여야합니다.") - } - this.checkDupNumber(num, index, numbers); - }) - } - checkDupNumber(target, targetIndex, numbers){ - numbers.map((num, index)=>{ - if(num === target && targetIndex !== index){ - throw new Error("[ERROR] : 로또 번호는 중복될 수 없습니다.") - } - }) - } + isUniqueNumber(numbers) { + numbers.map((num, index) => { + if (isNaN(num)) { + throw new Error("[ERROR] : 로또 번호는 숫자여야합니다.") + } + this.checkDupNumber(num, index, numbers); + }) + } - checkNumberRange(numbers){ - const minNum = 1; - const maxNum = 45; - numbers.map((num)=>{ - if(num > maxNum || num < minNum){ - throw new Error("[ERROR] : 로또 번호는 1부터 45 사이의 숫자여야 합니다.") - } - }) - } + checkDupNumber(target, targetIndex, numbers) { + numbers.map((num, index) => { + if (num === target && targetIndex !== index) { + throw new Error("[ERROR] : 로또 번호는 중복될 수 없습니다.") + } + }) + } - sortNumber(numbers){ - numbers = numbers.sort((a,b)=> a - b); - } + checkNumberRange(numbers) { + const minNum = 1; + const maxNum = 45; + numbers.map((num) => { + if (num > maxNum || num < minNum) { + throw new Error("[ERROR] : 로또 번호는 1부터 45 사이의 숫자여야 합니다.") + } + }) + } - isNumberWin(number, winNumbers){ - let win = false; - winNumbers.map((winNum)=>{ - winNum = Number.parseInt(winNum); - if(number === winNum){ - win = true; - } - }) - return win; - } + sortNumber(numbers) { + numbers = numbers.sort((a, b) => a - b); + } - isLottoWin(targetLotto, winLotto){ - let winNumCount = 0; - targetLotto.getNumber().map((targetNum)=>{ - if(this.isNumberWin(targetNum, winLotto.getNumber())){ - winNumCount++; - } - }); + isNumberWin(number, winNumbers) { + let win = false; + winNumbers.map((winNum) => { + winNum = Number.parseInt(winNum); + if (number === winNum) { + win = true; + } + }) + return win; + } - return winNumCount; - } + isLottoWin(targetLotto, winLotto) { + let winNumCount = 0; + targetLotto.getNumber().map((targetNum) => { + if (this.isNumberWin(targetNum, winLotto.getNumber())) { + winNumCount++; + } + }); - isBonus(bonusNumber){ - let winBonus = false; - this.#numbers.map((num)=>{ - if(num === Number.parseInt(bonusNumber)){ - winBonus = true; - } - }); - return winBonus; - } + return winNumCount; + } - getNumber(){ - return this.#numbers; - } + isBonus(bonusNumber) { + let winBonus = false; + this.#numbers.map((num) => { + if (num === Number.parseInt(bonusNumber)) { + winBonus = true; + } + }); + return winBonus; + } + + getNumber() { + return this.#numbers; + } - // TODO: 추가 기능 구현 + // TODO: 추가 기능 구현 } export default Lotto; From c8d0f3ba23e5da5f8db28d11bf22eaff32542b00 Mon Sep 17 00:00:00 2001 From: Glyph8 Date: Mon, 4 Nov 2024 23:47:58 +0900 Subject: [PATCH 18/18] =?UTF-8?q?test(LottoTest.js)=20=EB=A1=9C=EB=98=90?= =?UTF-8?q?=EC=9D=98=20=EC=97=AC=EB=9F=AC=20=EA=B2=BD=EC=9A=B0=EC=97=90=20?= =?UTF-8?q?=EB=8C=80=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __tests__/ApplicationTest.js | 2 ++ __tests__/LottoTest.js | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/__tests__/ApplicationTest.js b/__tests__/ApplicationTest.js index 872380c9c..5c7039468 100644 --- a/__tests__/ApplicationTest.js +++ b/__tests__/ApplicationTest.js @@ -91,6 +91,8 @@ describe("로또 테스트", () => { }); }); + + test("예외 테스트", async () => { await runException("1000j"); }); diff --git a/__tests__/LottoTest.js b/__tests__/LottoTest.js index 409aaf69b..87ae24107 100644 --- a/__tests__/LottoTest.js +++ b/__tests__/LottoTest.js @@ -14,5 +14,15 @@ describe("로또 클래스 테스트", () => { }).toThrow("[ERROR]"); }); - // TODO: 추가 기능 구현에 따른 테스트 코드 작성 + test("로또 번호에 숫자가 아닌 문자가 있으면 예외가 발생한다.", () => { + expect(() => { + new Lotto(['a', 'b', 'c', 'd', 'e', 'f']); + }).toThrow("[ERROR]"); + }); + + test("로또 번호에 숫자 범위가 1-45가 아닌 경우 예외가 발생한다.", () => { + expect(() => { + new Lotto([0, -1, 24, 48, 49, 52]); + }).toThrow("[ERROR]"); + }); });