Skip to content

London | May 2025 | Houssam Lahlah | Acoursework/sprint 3 #678

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

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2dd0a78
explain Increment count variable by 1 after initialization.
HoussamLh Jun 17, 2025
1bc5c74
Create initials variable by extracting first characters of first, mid…
HoussamLh Jun 17, 2025
b16d048
create two variable and Extract directory and file extension parts fr…
HoussamLh Jun 17, 2025
625c114
Add comments explaining how num is calculated as a random integer bet…
HoussamLh Jun 17, 2025
f5522e7
Add explanation for incrementing count variable by 1 after initializa…
HoussamLh Jun 17, 2025
2f17199
Update 0.js
HoussamLh Jun 19, 2025
5e31d7c
Update 1.js
HoussamLh Jun 19, 2025
5cf1cfd
Update 2.js
HoussamLh Jun 19, 2025
2d1e8dd
Update 3.js
HoussamLh Jun 19, 2025
4723bb9
implement getAngleType function with all angle cases and tests
HoussamLh Jul 20, 2025
85a7125
implement isProperFraction with tests for positive, negative, equal n…
HoussamLh Jul 20, 2025
a6dd884
Implement getCardValue to return correct blackjack values for all val…
HoussamLh Jul 20, 2025
cb53f9a
Export complete getAngleType() function for Jest testing
HoussamLh Jul 20, 2025
5a07227
Add Jest tests for all angle types in getAngleType()
HoussamLh Jul 20, 2025
a417fa0
Implement isProperFraction to handle proper, improper, and negative f…
HoussamLh Jul 20, 2025
461d0b6
Add unit tests for isProperFraction covering all key scenarios
HoussamLh Jul 20, 2025
057740b
Implement getCardValue function with support for number, face, and ac…
HoussamLh Jul 20, 2025
48444ef
Add tests for getCardValue covering number cards, face cards, and inv…
HoussamLh Jul 20, 2025
633a7af
Revert Sprint-1 folder to CYF's original version
HoussamLh Jul 21, 2025
6d8d7bb
Implement countChar function to count occurrences of a character in a…
HoussamLh Jul 21, 2025
50eaeb4
Implement getOrdinalNumber to handle ordinal suffixes correctly
HoussamLh Jul 21, 2025
e2c7e37
Implement repeat function with parameters and error handling
HoussamLh Jul 21, 2025
276c348
Implement find function to locate character index in string with deta…
HoussamLh Jul 21, 2025
28dfefd
just to writing a missing bits.
HoussamLh Jul 21, 2025
c3ed0d1
Implement credit card validator function
HoussamLh Jul 21, 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
18 changes: 13 additions & 5 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,11 @@
// 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 "Right angle";
if (angle < 90) return "Acute angle";
if (angle > 90 && angle < 180) return "Obtuse angle";
if (angle === 180) return "Straight angle";
if (angle > 180 && angle < 360) return "Reflex angle";
}

// we're going to use this helper function to make our assertions easier to read
Expand Down Expand Up @@ -39,18 +42,23 @@ assertEquals(right, "Right angle");
const acute = getAngleType(45);
assertEquals(acute, "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"
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
const reflex = getAngleType(270);
assertEquals(reflex, "Reflex angle");
20 changes: 18 additions & 2 deletions 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,9 @@
// write one test at a time, and make it pass, build your solution up methodically

function isProperFraction(numerator, denominator) {
// Use absolute value of numerator to handle negatives
if (numerator < denominator) return true;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see from your later implementation in section 2 you got this right. If you made changes, remember to copy them over

return false; // for all other cases
}

// here's our helper again
Expand Down Expand Up @@ -40,14 +42,28 @@ assertEquals(improperFraction, false);
// target output: true
// 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?

// Other scenarios to test could include:

// Cases where the numerator or denominator is zero (e.g., 0/5, 5/0) —
// especially to check for division by zero or invalid fractions.

// Fractions with negative denominators (e.g., 3/-4)
// to see if the function handles sign correctly.

// Very large numbers
// to check if the function works with large integers.

// Non-integer inputs (e.g., decimals or strings)
// to test input validation (if applicable).
26 changes: 24 additions & 2 deletions 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,12 @@
// 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); // remove the emoji
if (rank === "A") return 11;
if (["K", "Q", "J", "10"].includes(rank)) return 10;
const number = Number(rank);
if (number >= 2 && number <= 9) return number;
throw new Error("Invalid card rank");
}

// You need to write assertions for your function to check it works in different cases
Expand All @@ -33,19 +38,36 @@ assertEquals(aceofSpades, 11);
// 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♥");
// ====> write your test here, and then add a line to pass the test in the function above
assertEquals(fiveofHearts, 5);


// 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 jackofClubs = getCardValue("J♣");
assertEquals(jackofClubs, 10);

const queenofDiamonds = getCardValue("Q♦");
assertEquals(queenofDiamonds, 10);

const kingofHearts = getCardValue("K♥");
assertEquals(kingofHearts, 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 aceofSpades = getCardValue("A♠");
assertEquals(aceofSpades, 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."


// getCardValue("Z♠"); // should throw "Invalid card rank"


9 changes: 7 additions & 2 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
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 && angle < 180) return "Obtuse angle";
if (angle === 180) return "Straight angle";
if (angle > 180 && angle < 360) return "Reflex angle";
throw new Error("Invalid angle");
}


Expand All @@ -11,8 +14,10 @@ function getAngleType(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 have just written the CommonJS module.exports syntax for you

module.exports = getAngleType;
26 changes: 12 additions & 14 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@ test("should identify right angle (90°)", () => {
expect(getAngleType(90)).toEqual("Right angle");
});

// REPLACE the comments with the tests
// make your test descriptions as clear and readable as possible
test("should identify acute angle (< 90°)", () => {
expect(getAngleType(45)).toEqual("Acute angle");
});

// Case 2: Identify Acute Angles:
// When the angle is less than 90 degrees,
// Then the function should return "Acute angle"
test("should identify obtuse angle (> 90° and < 180°)", () => {
expect(getAngleType(120)).toEqual("Obtuse 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 straight angle (180°)", () => {
expect(getAngleType(180)).toEqual("Straight angle");
});

// Case 4: Identify Straight Angles:
// When the angle is exactly 180 degrees,
// Then the function should return "Straight angle"
test("should identify reflex angle (> 180° and < 360°)", () => {
expect(getAngleType(270)).toEqual("Reflex 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"
15 changes: 12 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,15 @@
// Explanation:
// It checks if the absolute value of the numerator
// is less than the absolute value of the denominator.


function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// add your completed function from key-implement here
if (denominator === 0) {
throw new Error("Denominator cannot be zero");
}

return Math.abs(numerator) < Math.abs(denominator);
}

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 negative proper fraction", () => {
expect(isProperFraction(-4, 7)).toEqual(true);
});

// Case 4: Identify Equal Numerator and Denominator:
test("should return false when numerator equals denominator", () => {
expect(isProperFraction(3, 3)).toEqual(false);
});
16 changes: 13 additions & 3 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
return 11;
const rank = card.slice(0, -1); // All characters except the last one (suit)

if (!rank) throw new Error("Invalid card rank");

if (rank === "A") return 11;
if (["K", "Q", "J", "10"].includes(rank)) return 10;

const number = Number(rank);
if (number >= 2 && number <= 9) return number;

throw new Error("Invalid card rank");
}
module.exports = getCardValue;

module.exports = getCardValue;
38 changes: 30 additions & 8 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,33 @@
const getCardValue = require("./3-get-card-value");

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

// Case 2: Handle Number Cards (2-10):
// Case 3: Handle Face Cards (J, Q, K):
// Case 4: Handle Ace (A):
// Case 5: Handle Invalid Cards:
expect(getCardValue("A♠")).toEqual(11);
});

// Case 2: Handle Number Cards (2-10)
test("should return 5 for Five of Hearts", () => {
expect(getCardValue("5♥")).toEqual(5);
});

test("should return 10 for Ten of Diamonds", () => {
expect(getCardValue("10♦")).toEqual(10);
});

// Case 3: Handle Face Cards (J, Q, K)
test("should return 10 for Jack of Clubs", () => {
expect(getCardValue("J♣")).toEqual(10);
});

test("should return 10 for Queen of Spades", () => {
expect(getCardValue("Q♠")).toEqual(10);
});

test("should return 10 for King of Hearts", () => {
expect(getCardValue("K♥")).toEqual(10);
});

// Case 5: Handle Invalid Cards
test("should throw an error for invalid card rank", () => {
expect(() => getCardValue("Z♣")).toThrow("Invalid card rank");
});

8 changes: 7 additions & 1 deletion 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 char of stringOfCharacters) {
if (char === findCharacter) {
count++;
}
}
return count;
}

module.exports = countChar;
11 changes: 9 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,12 @@
function getOrdinalNumber(num) {
return "1st";
const suffixes = ["th", "st", "nd", "rd"];
const value = num % 100;
if (value >= 11 && value <= 13) {
return num + "th";
}
const lastDigit = num % 10;
const suffix = suffixes[lastDigit] || "th";
return num + suffix;
}

module.exports = getOrdinalNumber;
module.exports = getOrdinalNumber;
17 changes: 17 additions & 0 deletions Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,20 @@ const getOrdinalNumber = require("./get-ordinal-number");
test("should return '1st' for 1", () => {
expect(getOrdinalNumber(1)).toEqual("1st");
});

test("should return '2nd' for 2", () => {
expect(getOrdinalNumber(2)).toEqual("2nd");
});

test("should return '3rd' for 3", () => {
expect(getOrdinalNumber(3)).toEqual("3rd");
});

test("should return '4th' for 4", () => {
expect(getOrdinalNumber(4)).toEqual("4th");
});

test("should return '11th' for 11", () => {
expect(getOrdinalNumber(11)).toEqual("11th");
});

9 changes: 6 additions & 3 deletions Sprint-3/3-mandatory-practice/implement/repeat.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
function repeat() {
return "hellohellohello";
function repeat(str, count) {
if (count < 0) {
throw new Error("Count must be non-negative");
}
return str.repeat(count);
}

module.exports = repeat;
module.exports = repeat;
Loading