fix: handle missing conditions in getCardValue

Author: SandzSoft

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

@@ -22,16 +22,27 @@
 // execute the code to ensure all tests pass.
 
 function getCardValue(card) {
-  let rank = card.slice(0, -1);
+  let rankStr = card.slice(0, -1);
+  let rank = Number(rankStr);
+  console.log("rank :" + rank);
   let suit = card.slice(-1);
+  console.log("suit :" + suit);
   const suitArray = ["♠", "♥", "♦", "♣"];
-  if (!suitArray.includes(suit)) throw new Error("Invalid card");
-  if (rank === "A") return 11;
-  if (rank === "Q" || rank === "K" || rank === "J") return 10;
-  if (Number(rank) >= 2 && Number(rank) <= 10) return Number(rank);
-  throw new Error("Invalid card");
+  if (!suitArray.includes(suit) || !/^(10|[2-9])$/.test(rankStr)) {
+    throw new Error("Invalid card");
+  } else if (rank === "A") {
+    return 11;
+  } else if (rank === "Q" || rank === "K" || rank === "J") {
+    return 10;
+  } else if (rank >= 2 && rank <= 10 && Number.isInteger(rank)) {
+    return Number(rank);
+  } else {
+    throw new Error("Invalid card");
+  }
 }
 
+console.log(getCardValue("0002♠"));
+
 // The line below allows us to load the getCardValue function into tests in other files.
 // This will be useful in the "rewrite tests with jest" step.
 module.exports = getCardValue;
@@ -46,16 +57,16 @@ function assertEquals(actualOutput, targetOutput) {
 
 // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards.
 // Examples:
-assertEquals(getCardValue("A♠"), 11);
+/*assertEquals(getCardValue("A♠"), 11);
 assertEquals(getCardValue("A♣"), 11);
 assertEquals(getCardValue("Q♠"), 10);
 assertEquals(getCardValue("K♣"), 10);
 assertEquals(getCardValue("J♦"), 10);
 assertEquals(getCardValue("2♠"), 2);
-assertEquals(getCardValue("10♣"), 10);
+assertEquals(getCardValue("10♣"), 10);*/
 
 // Handling invalid cards
-try {
+/*try {
   getCardValue("AX");
   console.error("Error was not thrown for invalid card 😢");
 } catch (e) {
@@ -80,6 +91,6 @@ try {
   console.error("Error was not thrown for invalid card 😢");
 } catch (e) {
   console.log("Error thrown for invalid card 🎉");
-}
+}*/
 
 // What other invalid card cases can you think of?

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

@@ -18,6 +18,7 @@ describe("getCardValue", () => {
     test("Number cards return their value", () => {
       expect(getCardValue("2♠")).toEqual(2);
       expect(getCardValue("10♣")).toEqual(10);
+      expect(getCardValue("0002♣")).toEqual(2);
     });
   });
 
@@ -27,6 +28,8 @@ describe("getCardValue", () => {
       expect(() => getCardValue("B♣")).toThrow("Invalid card");
       expect(() => getCardValue("1♦")).toThrow("Invalid card");
       expect(() => getCardValue("11♣")).toThrow("Invalid card");
+      expect(() => getCardValue("0x02♠")).toThrow("Invalid card");
+      expect(() => getCardValue("2.1♠")).toThrow("Invalid card");
     });
   });
 });