Skip to content

London | ITP-May-2025 | Surafel Workneh| Sprint-3 #637

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
ba7c348
update: Implement angle type identification in getAngleType function
SuWebOnes Jul 2, 2025
e6d6e76
UPdate: fix isProperFraction function to handle negative numbers and …
SuWebOnes Jul 2, 2025
cea3512
Update: fix getCardValue function to handle face cards, numeric ranks…
SuWebOnes Jul 2, 2025
d375cee
Update: fix getAngleType function to improve readability and ensure …
SuWebOnes Jul 2, 2025
f66a15a
Update: fix and test descriptions for angle type identification for c…
SuWebOnes Jul 2, 2025
e67b162
Update: comment out example console logs in getAngleType function for…
SuWebOnes Jul 2, 2025
0a7cda4
Update: test isProperFraction function to include comprehensive check…
SuWebOnes Jul 2, 2025
87fc686
Update: test isProperFraction function is correct and reintroduce usa…
SuWebOnes Jul 2, 2025
a52f2c1
Update: implement getCardValue function to return correct card values…
SuWebOnes Jul 2, 2025
e2c54d6
Update: fix test cases in getCardValue to improve readability and con…
SuWebOnes Jul 3, 2025
1014714
Update: fix countChar function with correct implementation and add ex…
SuWebOnes Jul 3, 2025
af66632
Update: add test case for countChar function to verify function
SuWebOnes Jul 3, 2025
a5879e7
Update: implement getOrdinalNumber function to return correct ordinal…
SuWebOnes Jul 3, 2025
e255a25
Update: fix code and test in getOrdinalNumber test case
SuWebOnes Jul 3, 2025
9b9d6fa
Update: fix repeat function to accept parameters and handle non-negat…
SuWebOnes Jul 3, 2025
4c03b27
Update: test cases in repeat.test.js for clarity
SuWebOnes Jul 3, 2025
d0371be
Update: comments foe questions to explain code in find.js for better…
SuWebOnes Jul 3, 2025
094657b
Update: fix password validation logic and comment out test cases
SuWebOnes Jul 3, 2025
d457ddd
Update: password validation test for consistency and clarity
SuWebOnes Jul 3, 2025
729f88f
update: Implement getAngleType function with tests for angle classifi…
SuWebOnes Jul 5, 2025
d17fa1d
update: Implement dir and ext extraction logic in 3-paths.js
SuWebOnes Jul 7, 2025
affd78a
update: fix ext extraction logic in 3-paths.js
SuWebOnes Jul 7, 2025
93fae64
update: add comment to ext extraction logic for clarity
SuWebOnes Jul 7, 2025
635a1a0
Update 3-paths.js
SuWebOnes Jul 12, 2025
2bfd808
changed log statement
SuWebOnes Jul 12, 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
2 changes: 1 addition & 1 deletion Sprint-1/1-key-exercises/3-paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ console.log(`The base part of ${filePath} is ${base}`);
const dir = ;
const ext = ;

// https://www.google.com/search?q=slice+mdn
// https://www.google.com/search?q=slice+mdn
21 changes: 17 additions & 4 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,16 @@
// 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";
// read to the end, complete line 36, then pass your test here
// if the angle is less than 90, return "Acute angle"
if (angle < 90) return "Acute angle";
// if the angle is greater than 90 and less than 180, return "Obtuse angle"
if (angle > 90 && angle < 180) return "Obtuse angle";
// if the angle is exactly 180, return "Straight angle"
if (angle === 180) return "Straight angle";
// if the angle is greater than 180 and less than 360, return "Reflex 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 All @@ -20,7 +28,7 @@ function assertEquals(actualOutput, targetOutput) {
`Expected ${actualOutput} to equal ${targetOutput}`
);
}

console.log("hello");
// Acceptance criteria:

// Given an angle in degrees,
Expand All @@ -43,14 +51,19 @@ assertEquals(acute, "Acute angle");
// When the angle is greater than 90 degrees and less than 180 degrees,
// Then the function should return "Obtuse angle"
const obtuse = getAngleType(120);
assertEquals(obtuse, "Obtuse angle");
// ====> write your test here, and then add a line to pass the test in the function above

// 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 straightAngle = getAngleType(180);
assertEquals(straightAngle, "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

Choose a reason for hiding this comment

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

Hi Surafel, good work on this. Just check that your function returns something for angles like 360 or any number outside 0 to 360. Right now, it doesn’t handle those cases.

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,8 @@
// write one test at a time, and make it pass, build your solution up methodically

function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// if (numerator < denominator) return true; it will not work for negative numbers

Choose a reason for hiding this comment

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

your function should also check if the denominator is zero. If it is, the function should return false because a fraction cannot have a zero as the denominator. Try adding that check. Keep going, you are doing well!

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

// here's our helper again
Expand Down Expand Up @@ -41,13 +42,28 @@ 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?

// Zero Numerator check:
// Input: numerator = 0, denominator = 5
// target output: true
// Explanation: The fraction 0/5 is a proper fraction because the numerator (0) is less than the denominator (5). The function should return true.
const zeroNumerator = isProperFraction(0, 5);
assertEquals(zeroNumerator, true);

// Zero Denominator check:
// Input: numerator = 4, denominator = 0
// target output: false
// Explanation: A fraction with a zero denominator is undefined. The function should return false to indicate it's not a valid proper fraction.
const zeroDenominator = isProperFraction(4, 0);
assertEquals(zeroDenominator, false);
39 changes: 38 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,22 @@
// 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); // Extract the rank from the card string

if (rank === "A") return 11;

// Face cards and 10 are worth 10 points
if (["10", "J", "Q", "K"].includes(rank)) {
return 10;
}
// Convert rank to number and check if it's a valid number card
const numericRank = Number(rank);
if (!isNaN(numericRank)) {
return numericRank;
}
// If rank is not valid, throw an error
throw new Error("Invalid card rank.");
// Note: The function assumes the input is always a valid card string
}

// You need to write assertions for your function to check it works in different cases
Expand All @@ -34,18 +49,40 @@ 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); // 5 of Hearts should return 5 but still we need to implement this in the function

// 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); // 10 of Diamonds should return 10
const jackOfClubs = getCardValue("J♣");
assertEquals(jackOfClubs, 10); // Jack of Clubs should return 10
const queenOfSpades = getCardValue("Q♠");
assertEquals(queenOfSpades, 10); // Queen of Spades should return 10
const kingOfHearts = getCardValue("K♥");
assertEquals(kingOfHearts, 10); // King of Hearts should return 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 aceOfDiamonds = getCardValue("A♦");
assertEquals(aceOfDiamonds, 11); // Ace of Diamonds should return 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."
// Invalid card test (should throw error)
try {
getCardValue("Z♠");
console.assert(false, "Expected error for invalid rank");
} catch (e) {
console.assert(
e.message === "Invalid card rank.",
`Unexpected error message: ${e.message}`
);
}
31 changes: 23 additions & 8 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
function getAngleType(angle) {
if (angle === 90) return "Right angle";
// replace with your completed function from key-implement
// Step 1: Check for a right angle (exactly 90 degrees)
if (angle === 90) return "Right angle";

}




// Step 2: Check for a straight angle (exactly 180 degrees)
if (angle === 180) return "Straight angle";

// Step 3: Check for an acute angle (between 0 and 90)
if (angle > 0 && angle < 90) return "Acute Angle";

// Step 4: Check for an obtuse angle (between 90 and 180)
if (angle > 90 && angle < 180) return "Obtuse angle";
// Step 5: Check for a reflex angle (between 180 and 360)
if (angle > 180 && angle < 360) return "Reflex angle";

// Step 6: Handle invalid or unsupported input
return "Invalid 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;

// console.log(getAngleType(90)); // "Right angle"
// console.log(getAngleType(180)); // "Straight angle"
// console.log(getAngleType(45)); // "Acute angle"
// console.log(getAngleType(120)); // "Obtuse angle"
// console.log(getAngleType(0)); // "Invalid angle"
// console.log(getAngleType(200)); // "Invalid angle"
// console.log(getAngleType(90.5)); // "Invalid angle"
19 changes: 13 additions & 6 deletions Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
const getAngleType = require("./1-get-angle-type");
const getAngleType = require("./1-get-angle-type"); // Import the function to be tested

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

// 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");
});
// 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 angle (>90 && <180)", () => {
expect(getAngleType(120)).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 Straight Angle (> 180 && < 360)", () => {
expect(getAngleType(278)).toEqual("Reflex angle");
});
19 changes: 16 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,19 @@
function isProperFraction(numerator, denominator) {
if (numerator < denominator) return true;
// add your completed function from key-implement here
if (denominator === 0) return false; // Avoid division by zero
if (numerator < 0 || denominator < 0) return false; // Proper fractions are positive
if (numerator < denominator) return true; // Proper if numerator < denominator
return false; // Otherwise, it's improper
}

module.exports = isProperFraction;
module.exports = isProperFraction;
// Test cases for the isProperFraction function
console.log(isProperFraction(1, 2)); // true
console.log(isProperFraction(3, 4)); // true
console.log(isProperFraction(5, 5)); // false
console.log(isProperFraction(7, 6)); // false
console.log(isProperFraction(0, 1)); // true
console.log(isProperFraction(1, 0)); // false (denominator is zero)
console.log(isProperFraction(-1, 2)); // false (negative numerator)
console.log(isProperFraction(1, -2)); // false (negative denominator)
console.log(isProperFraction(-1, -2)); // false (both negative)
console.log(isProperFraction(2, 3)); // true
30 changes: 23 additions & 7 deletions Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
const isProperFraction = require("./2-is-proper-fraction");
function isProperFraction(numerator, denominator) {
// Case 1: Check for zero denominator (undefined)
if (denominator === 0) return false;

test("should return true for a proper fraction", () => {
expect(isProperFraction(2, 3)).toEqual(true);
});
// Case 2: Check for negative values (numerator or denominator)
if (numerator < 0 || denominator < 0) return false;

// Case 2: Identify Improper Fractions:
// Case 3: Check for equal numerator and denominator
if (numerator === denominator) return false;

// Case 3: Identify Negative Fractions:
// Case 4: Check for proper fraction (numerator < denominator)
return numerator < denominator;
}
module.exports = isProperFraction;
// usage examples
console.log(isProperFraction(2, 3)); // true
console.log(isProperFraction(5, 3)); // false
console.log(isProperFraction(3, 3)); // false
console.log(isProperFraction(-2, 3)); // false
console.log(isProperFraction(2, -3)); // false
console.log(isProperFraction(0, 5)); // true (0 < 5)
console.log(isProperFraction(2, 2)); // false

// Case 4: Identify Equal Numerator and Denominator:
// Test cases for the isProperFraction function
// test("should return true for a proper fraction", () => {
// expect(isProperFraction(2, 3)).toEqual(true);
// });
21 changes: 18 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,20 @@
function getCardValue(card) {
// replace with your code from key-implement
return 11;
// replace with your code from key-implement
// return 11; // always return 11 for testing purposes that is wrong
const rank = card.slice(0, -1); // Extract rank (everything except the last character)
if (rank === "A") return 11; // handle Ace as 11
if (["K", "Q", "J"].includes(rank)) return 10; // handle face cards as 10
const numerincRank = parseInt(rank); //Handle number cards 2–9
Copy link

@Pappyjay157 Pappyjay157 Jul 10, 2025

Choose a reason for hiding this comment

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

There's a typo in numerincRank , it should be numericRank.

if (numerincRank >= 2 && numerincRank <= 9) {
return numerincRank; // Return the numeric value for cards 2-9
}
// Invalid card rank
return 0;
}
module.exports = getCardValue;
module.exports = getCardValue;

// // Test cases
console.log(getCardValue("A♠")); // 11
console.log(getCardValue("7♥")); // 7
console.log(getCardValue("K♦")); // 10
console.log(getCardValue("A♣")); // 11
22 changes: 19 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,27 @@
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 7 for 7 of Hearts", () => {
const sevenOfHearts = getCardValue("7♥");
expect(sevenOfHearts).toEqual(7);
});
// Case 3: Handle Face Cards (J, Q, K):
test("should return 10 for King of Diamonds", () => {
const kingOfDiamonds = getCardValue("K♦");
expect(kingOfDiamonds).toEqual(10);
});
// Case 4: Handle Ace (A):
test("should return 11 for Ace of Clubs", () => {
const aceOfClubs = getCardValue("A♣");
expect(aceOfClubs).toEqual(11);
});
// Case 5: Handle Invalid Cards:
test("should return 0 for invalid card 'X♠'", () => {
const invalidCard = getCardValue("X♠");
expect(invalidCard).toEqual(0);
});
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
// return 5; //This will always return 5, regardless of the inputs. So it’s just a placeholder.
return stringOfCharacters.split(findCharacter).length - 1;
}

module.exports = countChar;
module.exports = countChar;

// console.log(countChar("hello", "l")); // 2
// console.log(countChar("hello world", "o")); // 2
// console.log(countChar("banana", "a")); // 3
// console.log(countChar("mississippi", "i")); // 5
8 changes: 8 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,11 @@ 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 the character is not present", () => {
const str = "aaaaa";
const char = "z"; // 'z' does not exist in "aaaaa"
const count = countChar(str, char);
expect(count).toEqual(0);
});

module.exports = countChar;

Choose a reason for hiding this comment

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

"module.exports = countChar;"
This line should not be in the test file. It is only needed in the main function file where the function is defined.

Loading