Refactor getCardValue function to streamline rank handling and improve test organization

Author: MohammedNaru

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

@@ -7,27 +7,33 @@
 // complete the rest of the tests and cases
 // write one test at a time, and make it pass, build your solution up methodically
 // just make one change at a time -- don't rush -- programmers are deep and careful thinkers
+
 function getCardValue(card) {
-  // Extract the rank (everything except the last character, which is the suit emoji)
+  // Extract rank (all characters except final suit emoji)
   const rank = card.slice(0, -1);
 
-  // Handle Ace
-  if (rank === "A") {
-    return 11;
+  // Mapping for face card values
+  const faceValues = {
+    J: 10,
+    Q: 10,
+    K: 10,
+    A: 11,
+  };
+
+  // If rank is a face card, return mapped value
+  if (faceValues[rank]) {
+    return faceValues[rank];
   }
 
-  // Handle Face Cards (J, Q, K)
-  if (rank === "J" || rank === "Q" || rank === "K" || rank === "10") {
-    return 10;
-  }
+  // Valid number ranks 2–10 only
+  const validNumberRanks = ["2", "3", "4", "5", "6", "7", "8", "9", "10"];
 
-  // Handle Number Cards (2-9)
-  if (!isNaN(rank)) {
+  if (validNumberRanks.includes(rank)) {
     return Number(rank);
   }
 
-  // Handle Invalid Cards
-  throw new Error("Invalid card rank.");
+  // Anything else = invalid
+  throw new Error("Invalid card rank");
 }
 
 // The line below allows us to load the getCardValue function into tests in other files.
@@ -44,45 +50,28 @@ function assertEquals(actualOutput, targetOutput) {
   );
 }
 
-// Acceptance criteria:
-
-// Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will be a number 2-10, or one letter of J, Q, K, A),
-// When the function getCardValue is called with this card string as input,
-// Then it should return the numerical card value
-const aceofSpades = getCardValue("A♠");
-assertEquals(aceofSpades, 11);
+// ---------------- TESTS ----------------
 
-// Handle Number Cards (2-10):
-// Given a card with a rank between "2" and "9",
-// When the function is called with such a card,
-// Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5).
-const fiveofHearts = getCardValue("5♥");
-assertEquals(fiveofHearts, 5);
+// Handle Ace (A)
+const aceOfSpades = getCardValue("A♠");
+assertEquals(aceOfSpades, 11);
 
-const tenofClubs = getCardValue("10♣");
-assertEquals(tenofClubs, 10);
+// Handle Number Cards (2-9)
+const fiveOfHearts = getCardValue("5♥");
+assertEquals(fiveOfHearts, 5);
 
-// Handle Face Cards (J, Q, K):
-// Given a card with a rank of "J," "Q," or "K",
-// When the function is called with such a card,
-// Then it should return the value 10, as these cards are worth 10 points each in blackjack.
-const jackOfDiamonds = getCardValue("J♦");
-assertEquals(jackOfDiamonds, 10);
+// Handle 10
+const tenOfClubs = getCardValue("10♣");
+assertEquals(tenOfClubs, 10);
 
-const queenOfSpades = getCardValue("Q♠");
-assertEquals(queenOfSpades, 10);
+// Handle Face Cards (J, Q, K)
+const queenOfDiamonds = getCardValue("Q♦");
+assertEquals(queenOfDiamonds, 10);
 
-const kingOfHearts = getCardValue("K♥");
-assertEquals(kingOfHearts, 10);
-
-// Handle Invalid Cards:
-// Given a card with an invalid rank (neither a number nor a recognized face card),
-// When the function is called with such a card,
-// Then it should throw an error indicating "Invalid card rank."
+// Handle invalid card
 try {
-  getCardValue("Z♠");
+  getCardValue("15♣"); // invalid rank
+  console.assert(false, "Expected error for invalid rank");
 } catch (e) {
-  assertEquals(e.message, "Invalid card rank.");
+  console.assert(true);
 }
-
-console.log("All tests ran! If no errors, all passed.");