Skip to content

London | May 2025 | Samuel Tarawally | Sprint 3 | Coursework #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
46d1dd2
ignores local vscode configurations
Tarawally Jul 14, 2025
322f47b
feat(get-angle-type): Implement angle type detection and add assertions
Tarawally Jul 18, 2025
a605763
feat(is-proper-fraction): Implement proper fraction check and add ass…
Tarawally Jul 18, 2025
b2b4431
feat(get-card-value): Implement card value retrieval and add assertions
Tarawally Jul 18, 2025
522a42d
feat(get-angle-type): Complete getAngleType function
Tarawally Jul 18, 2025
8f48f05
test(get-angle-type): Add Jest tests for angle type detection
Tarawally Jul 18, 2025
824799f
feat(is-proper-fraction): Complete isProperFraction function
Tarawally Jul 18, 2025
8d3de72
test(is-proper-fraction): Add Jest tests for proper fraction check
Tarawally Jul 18, 2025
1b18cc3
feat(get-card-value): Complete getCardValue function
Tarawally Jul 18, 2025
f75bb27
test(get-card-value): Add Jest tests for card value retrieval
Tarawally Jul 18, 2025
1e6c96d
feat(count): Implement character counting function
Tarawally Jul 18, 2025
825fb63
test(count): Add Jest tests for character counting
Tarawally Jul 18, 2025
b828e42
feat(get-ordinal-number): Implement ordinal number conversion
Tarawally Jul 18, 2025
ca00539
test(get-ordinal-number): Add Jest tests for ordinal number conversion
Tarawally Jul 18, 2025
45a420c
feat(repeat): Implement string repetition function
Tarawally Jul 18, 2025
92a8fcb
test(repeat): Add Jest tests for string repetition
Tarawally Jul 18, 2025
23caf51
Merge branch 'CodeYourFuture:main' into sprint-3
Tarawally Jul 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
node_modules
.DS_Store
.vscode
**/.DS_Store
**/.DS_Store
**/runme.md
.devcontainer/
24 changes: 21 additions & 3 deletions Sprint-3/1-key-implement/1-get-angle-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,21 @@
// Then, write the next test! :) Go through this process until all the cases are implemented

function getAngleType(angle) {
if (angle === 90) return "Right angle";
// read to the end, complete line 36, then pass your test here
if (angle < 90) {
return "Acute angle";
}
if (angle === 90) {
return "Right angle";
}
if (angle < 180) {
return "Obtuse angle";
}
if (angle === 180) {
return "Straight angle";
}
if (angle < 360) {
return "Reflex angle";
}
}

// we're going to use this helper function to make our assertions easier to read
Expand Down Expand Up @@ -44,13 +57,18 @@ assertEquals(acute, "Acute angle");
// Then the function should return "Obtuse angle"
const obtuse = getAngleType(120);
// ====> write your test here, and then add a line to pass the test in the function above
assertEquals(obtuse, "Obtuse angle");

// Case 4: Identify Straight Angles:
// When the angle is exactly 180 degrees,
// Then the function should return "Straight angle"
// ====> write your test here, and then add a line to pass the test in the function above
const straight = getAngleType(180);
assertEquals(straight, "Straight angle");

// Case 5: Identify Reflex Angles:
// When the angle is greater than 180 degrees and less than 360 degrees,
// Then the function should return "Reflex angle"
// ====> write your test here, and then add a line to pass the test in the function above
// ====> write your test here, and then add a line to pass the test in the function above
const reflex = getAngleType(270);
assertEquals(reflex, "Reflex angle");
10 changes: 9 additions & 1 deletion Sprint-3/1-key-implement/2-is-proper-fraction.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
// write one test at a time, and make it pass, build your solution up methodically

function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// A proper fraction is a fraction where the absolute value of the numerator is less than the denominator.
if (Math.abs(numerator) < denominator) {
return true;
}
return false;
}

// here's our helper again
Expand Down Expand Up @@ -41,13 +45,17 @@ assertEquals(improperFraction, false);
// Explanation: The fraction -4/7 is a proper fraction because the absolute value of the numerator (4) is less than the denominator (7). The function should return true.
const negativeFraction = isProperFraction(-4, 7);
// ====> complete with your assertion
assertEquals(negativeFraction, true);

// Equal Numerator and Denominator check:
// Input: numerator = 3, denominator = 3
// target output: false
// Explanation: The fraction 3/3 is not a proper fraction because the numerator is equal to the denominator. The function should return false.
const equalFraction = isProperFraction(3, 3);
// ====> complete with your assertion
assertEquals(equalFraction, false);

// Stretch:
// What other scenarios could you test for?
// We could test for a zero numerator, which should be a proper fraction, e.g. isProperFraction(0, 5) -> true.
// We could also consider how to handle division by zero, e.g. isProperFraction(2, 0), which is mathematically undefined.
36 changes: 35 additions & 1 deletion Sprint-3/1-key-implement/3-get-card-value.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,18 @@
// 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) {
if (rank === "A") return 11;
const rank = card.slice(0, -1);
if (rank === "A") {
return 11;
}
if (rank === "K" || rank === "Q" || rank === "J" || rank === "10") {
return 10;
}
const value = parseInt(rank, 10);
if (value >= 2 && value <= 9) {
return value;
}
throw new Error("Invalid card rank.");
}

// You need to write assertions for your function to check it works in different cases
Expand All @@ -34,18 +45,41 @@ assertEquals(aceofSpades, 11);
// Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5).
const fiveofHearts = getCardValue("5♥");
// ====> write your test here, and then add a line to pass the test in the function above
assertEquals(fiveofHearts, 5);
const nineOfClubs = getCardValue("9♣");
assertEquals(nineOfClubs, 9);

// Handle Face Cards (J, Q, K):
// Given a card with a rank of "10," "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 tenOfDiamonds = getCardValue("10♦");
assertEquals(tenOfDiamonds, 10);
const jackOfSpades = getCardValue("J♠");
assertEquals(jackOfSpades, 10);
const queenOfHearts = getCardValue("Q♥");
assertEquals(queenOfHearts, 10);
const kingOfClubs = getCardValue("K♣");
assertEquals(kingOfClubs, 10);

// Handle Ace (A):
// Given a card with a rank of "A",
// When the function is called with an Ace,
// Then it should, by default, assume the Ace is worth 11 points, which is a common rule in blackjack.
const aceOfClubs = getCardValue("A♣");
assertEquals(aceOfClubs, 11);

// 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."
try {
getCardValue("1♦");
} catch (e) {
assertEquals(e.message, "Invalid card rank.");
}
try {
getCardValue("X♠");
} catch (e) {
assertEquals(e.message, "Invalid card rank.");
}
29 changes: 17 additions & 12 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
function getAngleType(angle) {
if (angle === 90) return "Right angle";
// replace with your completed function from key-implement

if (angle < 90) {
return "Acute angle";
}
if (angle === 90) {
return "Right angle";
}
if (angle < 180) {
return "Obtuse angle";
}
if (angle === 180) {
return "Straight angle";
}
if (angle < 360) {
return "Reflex angle";
}
}








// Don't get bogged down in this detail
// Jest uses CommonJS module syntax by default as it's quite old
// We will upgrade our approach to ES6 modules in the next course module, so for now
// We will upgrade our approach to ES6 modules in the next course module, so for now
// we have just written the CommonJS module.exports syntax for you
module.exports = getAngleType;
module.exports = getAngleType;
15 changes: 15 additions & 0 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,30 @@ test("should identify right angle (90°)", () => {
// Case 2: Identify Acute Angles:
// When the angle is less than 90 degrees,
// Then the function should return "Acute angle"
test("should identify acute angles (< 90°)", () => {
expect(getAngleType(45)).toEqual("Acute angle");
expect(getAngleType(89)).toEqual("Acute angle");
});

// Case 3: Identify Obtuse Angles:
// When the angle is greater than 90 degrees and less than 180 degrees,
// Then the function should return "Obtuse angle"
test("should identify obtuse angles (> 90° and < 180°)", () => {
expect(getAngleType(120)).toEqual("Obtuse angle");
expect(getAngleType(179)).toEqual("Obtuse angle");
});

// Case 4: Identify Straight Angles:
// When the angle is exactly 180 degrees,
// Then the function should return "Straight angle"
test("should identify straight angle (180°)", () => {
expect(getAngleType(180)).toEqual("Straight angle");
});

// Case 5: Identify Reflex Angles:
// When the angle is greater than 180 degrees and less than 360 degrees,
// Then the function should return "Reflex angle"
test("should identify reflex angles (> 180° and < 360°)", () => {
expect(getAngleType(270)).toEqual("Reflex angle");
expect(getAngleType(359)).toEqual("Reflex angle");
});
9 changes: 6 additions & 3 deletions Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// add your completed function from key-implement here
// A proper fraction is a fraction where the absolute value of the numerator is less than the denominator.
if (Math.abs(numerator) < denominator) {
return true;
}
return false;
}

module.exports = isProperFraction;
module.exports = isProperFraction;
9 changes: 9 additions & 0 deletions Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@ test("should return true for a proper fraction", () => {
});

// Case 2: Identify Improper Fractions:
test("should return false for an improper fraction", () => {
expect(isProperFraction(5, 2)).toEqual(false);
});

// Case 3: Identify Negative Fractions:
test("should return true for a proper negative fraction", () => {
expect(isProperFraction(-4, 7)).toEqual(true);
});

// Case 4: Identify Equal Numerator and Denominator:
test("should return false when numerator and denominator are equal", () => {
expect(isProperFraction(3, 3)).toEqual(false);
});
14 changes: 12 additions & 2 deletions Sprint-3/2-mandatory-rewrite/3-get-card-value.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
function getCardValue(card) {
// replace with your code from key-implement
const rank = card.slice(0, -1);
if (rank === "A") {
return 11;
}
if (rank === "K" || rank === "Q" || rank === "J" || rank === "10") {
return 10;
}
const value = parseInt(rank, 10);
if (value >= 2 && value <= 9) {
return value;
}
throw new Error("Invalid card rank.");
}
module.exports = getCardValue;
module.exports = getCardValue;
26 changes: 23 additions & 3 deletions Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
const getCardValue = require("./3-get-card-value");

test("should return 11 for Ace of Spades", () => {
const aceofSpades = getCardValue("A♠");
expect(aceofSpades).toEqual(11);
});
const aceofSpades = getCardValue("A♠");
expect(aceofSpades).toEqual(11);
});

// Case 2: Handle Number Cards (2-10):
test("should return the correct value for number cards", () => {
expect(getCardValue("2♥")).toEqual(2);
expect(getCardValue("9♦")).toEqual(9);
});

// Case 3: Handle Face Cards (J, Q, K):
test("should return 10 for face cards and 10s", () => {
expect(getCardValue("10♣")).toEqual(10);
expect(getCardValue("J♠")).toEqual(10);
expect(getCardValue("Q♥")).toEqual(10);
expect(getCardValue("K♦")).toEqual(10);
});

// Case 4: Handle Ace (A):
test("should return 11 for any Ace", () => {
expect(getCardValue("A♣")).toEqual(11);
});

// Case 5: Handle Invalid Cards:
test("should throw an error for invalid card ranks", () => {
expect(() => getCardValue("1♦")).toThrow("Invalid card rank.");
expect(() => getCardValue("X♠")).toThrow("Invalid card rank.");
});
10 changes: 8 additions & 2 deletions Sprint-3/3-mandatory-practice/implement/count.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
function countChar(stringOfCharacters, findCharacter) {
return 5
let count = 0;
for (let i = 0; i < stringOfCharacters.length; i++) {
if (stringOfCharacters[i] === findCharacter) {
count++;
}
}
return count;
}

module.exports = countChar;
module.exports = countChar;
13 changes: 13 additions & 0 deletions Sprint-3/3-mandatory-practice/implement/count.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,16 @@ test("should count multiple occurrences of a character", () => {
// And a character char that does not exist within the case-sensitive str,
// When the function is called with these inputs,
// Then it should return 0, indicating that no occurrences of the char were found in the case-sensitive str.
test("should return 0 when character is not found", () => {
const str = "hello world";
const char = "z";
const count = countChar(str, char);
expect(count).toEqual(0);
});

test("should be case-sensitive", () => {
const str = "Hello World";
const char = "h";
const count = countChar(str, char);
expect(count).toEqual(0);
});
20 changes: 18 additions & 2 deletions Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
function getOrdinalNumber(num) {
return "1st";
const lastTwoDigits = num % 100;
const lastDigit = num % 10;

if (lastTwoDigits >= 11 && lastTwoDigits <= 13) {
return `${num}th`;
}

switch (lastDigit) {
case 1:
return `${num}st`;
case 2:
return `${num}nd`;
case 3:
return `${num}rd`;
default:
return `${num}th`;
}
}

module.exports = getOrdinalNumber;
module.exports = getOrdinalNumber;
Loading