Skip to content

Commit cc3d083

Browse files
committed
Formatted the code
1 parent 02ceb6d commit cc3d083

1 file changed

Lines changed: 23 additions & 16 deletions

File tree

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,36 @@ function getCardValue(card) {
2727
let rank = card.slice(0, -1);
2828
let suit = card.slice(-1);
2929

30-
const validRanks = ["A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K"];
30+
const validRanks = [
31+
"A",
32+
"2",
33+
"3",
34+
"4",
35+
"5",
36+
"6",
37+
"7",
38+
"8",
39+
"9",
40+
"10",
41+
"J",
42+
"Q",
43+
"K",
44+
];
3145
const validSuits = ["♠", "♥", "♦", "♣"];
3246

3347
let isValidRank = validRanks.includes(rank);
3448
let isValidSuit = validSuits.includes(suit);
3549

50+
// Invalid Card
51+
if (!isValidRank || !isValidSuit) {
52+
throw new Error("Invalid Card");
53+
}
3654

37-
38-
// Invalid Card
39-
if( !isValidRank || !isValidSuit ){
40-
throw new Error("Invalid Card")
41-
}
42-
43-
if(rank == "A"){
55+
if (rank == "A") {
4456
return 11;
45-
}
46-
else if(rank == "J" || rank == "Q" || rank == "K"){
57+
} else if (rank == "J" || rank == "Q" || rank == "K") {
4758
return 10;
48-
}
49-
else return Number(rank);
50-
59+
} else return Number(rank);
5160
}
5261

5362
// The line below allows us to load the getCardValue function into tests in other files.
@@ -99,7 +108,6 @@ try {
99108
console.log("Error thrown for invalid card 🎉");
100109
}
101110

102-
103111
// What other invalid card cases can you think of?
104112
try {
105113
getCardValue("24♠");
@@ -110,12 +118,11 @@ try {
110118
console.log("Error thrown for invalid card 🎉");
111119
}
112120

113-
114121
try {
115122
getCardValue("44");
116123

117124
// This line will not be reached if an error is thrown as expected
118125
console.error("Error was not thrown for invalid card 😢");
119126
} catch (e) {
120127
console.log("Error thrown for invalid card 🎉");
121-
}
128+
}

0 commit comments

Comments
 (0)