CYF-ITP-South Africa | Rashaad Ebrahim | Module-Structuring-and-Testing-Data | Week 3

Sprint-3/implement/get-angle-type.js

@@ -27,7 +27,7 @@
 // Then the function should return "Reflex angle"
 
 module.exports = function getAngleType(angle) {
-  if (angle < 90) return "Acute angle";
+  if (angle > 0 && angle < 90) return "Acute angle";
   if (angle === 90) return "Right angle";
   if (angle > 90 && angle < 180) return "Obtuse angle";
   if (angle === 180) return "Straight angle";

Sprint-3/implement/get-angle-type.test.js

@@ -16,6 +16,6 @@ test('When the angle is exactly 180 degrees, the function should return "Straigh
   expect(getAngleType(180)).toBe("Straight angle");
 });
 
-test('When the angle is greater than 180 degrees and less than 360 degrees, the function should return "Reflex angle"', () => {
+test("Return Reflex angle for angles between 180 and 360 degrees", () => {
   expect(getAngleType(246)).toBe("Reflex angle");
 });

Sprint-3/implement/get-card-value.js

@@ -31,41 +31,19 @@
 // Then it should throw an error indicating "Invalid card rank."
 
 function getCardValue(card) {
-  if (typeof card !== "string") return "Input should be a sting.";
-  const cardValue = card
-    .toUpperCase()
-    .substring(0, card.indexOf(card.slice(-1)));
+  if (typeof card !== "string") return "Input should be a string.";
+  const cardValue = card.slice(0, -1).toUpperCase();
+  const allCards = ["A", "K", "Q", "J", "10", "9", "8", "7", "6", "5", "4", "3", "2", "1"];
   const faceCards = ["K", "Q", "J"];
 
-  /* If we wanted to exlude cards for not being a suite
-   const suites = ["♣", "♠", "♦", "♥"];
-   if (!suites.includes(card.slice(-1))) return "Invalid card rank.";
-  */
-  if (Number(cardValue) && Number(cardValue) >= 2 && Number(cardValue) <= 10)
-    return Number(cardValue);
-  if (faceCards.includes(cardValue)) return 10;
-  if (cardValue === "A") return 11;
+  if (allCards.includes(cardValue)) {
+    if (Number(cardValue) && Number(cardValue) >= 2 && Number(cardValue) <= 10)
+      return Number(cardValue);
+    if (faceCards.includes(cardValue)) return 10;
+    if (cardValue === "A") return 11;
+  }
 
   return "Invalid card rank.";
-
-  /* ### I'm not a fan of if/if else statements so I would have either used ternary operators or short circuiting.
-  return Number(cardValue)
-    ? Number(cardValue)
-    : faceCards.includes(cardValue)
-    ? 10
-    : cardValue === "A"
-    ? 11
-    : "Invalid card rank.";
-
-    OR
-
-    return (
-    (Number(cardValue) && Number(cardValue)) ||
-    (faceCards.includes(cardValue) && 10) ||
-    (cardValue === "A" && 11) ||
-    "Invalid card rank."
-  );
-  */
 }
 
 module.exports = getCardValue;

Sprint-3/implement/rotate-char.js

@@ -51,7 +51,7 @@ function rotateCharacter(char, shift) {
     }
     if (lettersLowerCase.indexOf(char) + shift > 25) {
       return lettersLowerCase.charAt(
-        lettersLowerCase.indexOf(char) - 26 + shift
+        lettersLowerCase.indexOf(char) - 26 + (shift % 26)
       );
     }
   }
@@ -62,11 +62,13 @@ function rotateCharacter(char, shift) {
     }
     if (lettersUpperCase.indexOf(char) + shift > 25) {
       return lettersUpperCase.charAt(
-        lettersUpperCase.indexOf(char) - 26 + shift
+        lettersUpperCase.indexOf(char) - 26 + (shift % 26)
       );
     }
   }
   return char;
 }
 
 module.exports = rotateCharacter;
+
+console.log(rotateCharacter("t", 300));

Sprint-3/implement/rotate-char.test.js

@@ -21,3 +21,4 @@ describe("rotateCharacter Tests", () => {
     expect(rotateCharacter("Y", 2)).toBe("A");
   });
 });
+

Sprint-3/revise/implement/card-validator.js

@@ -8,7 +8,7 @@ function cardValidator(ccNumber) {
 
   // Validation checks
   const isCorrectLength = ccString.length === 16; // Number must be 16 digits
-  const hasMultipleDigits = [...new Set(ccNumberArray)].length > 1; // At least two different digits
+  const hasMultipleDigits = new Set(ccNumberArray).size > 1; // At least two different digits
   const hasValidChars = digitsRegex.test(ccString); // All characters are numeric
   const endsWithEvenDigit = ccNumberArray[ccNumberArray.length - 1] % 2 === 0; // Last digit is even
   const isSumGreaterThan16 = ccNumberArray.reduce((a, c) => a + c, 0) > 16; // Sum of digits greater than 16
@@ -23,4 +23,4 @@ function cardValidator(ccNumber) {
   );
 }
 
-module.exports = cardValidator;
+module.exports = cardValidator;

Sprint-3/revise/implement/get-ordinal-number.js

@@ -7,25 +7,25 @@ function getOrdinalNumber(number) {
   const numberAsString = number.toString();
 
   // Helper variable
-  const exceptions = ["11", "12", "13"];
+  const exceptions = [11, 12, 13];
+  const lastDgit = number % 10;
+  const lastTwoDigits = number % 100;
 
-  if (
-    numberAsString.length > 1 &&
-    exceptions.includes(numberAsString.slice(numberAsString.length - 2))
-  ) {
+  if (number > 9 && exceptions.includes(lastTwoDigits)) {
     return `${number}th`;
   }
 
-  switch (numberAsString[numberAsString.length - 1]) {
-    case "1":
+  switch (lastDgit) {
+    case 1:
       return `${number}st`;
-    case "2":
+    case 2:
       return `${number}nd`;
-    case "3":
+    case 3:
       return `${number}rd`;
     default:
       return `${number}th`;
   }
 }
 
 module.exports = getOrdinalNumber;
+

Sprint-3/revise/investigate/find.js

@@ -30,6 +30,8 @@ console.log(find("code your future", "z"));
 // c) Why is index++ being used?
     // The ++ operator is the increment.  It mean to "add 1 to", 
     // so what index++ does is add 1 to index with each iteration of the while loop.
+    // The reason for this so that each character of the string can be checked.
 
 // d) What is the condition index < str.length used for?
     //  It's to ensure that the while loop is not an infinte loop. The loop will run till this condition becomes false.
+    //  The condition checks if index is less than the str.length. Once index is no longer less than str.length, the loop will end.