Fix OOP exercises

Author: Shehab Abdel-Salam

chapters/chapter10_oop/exercises/exercise_68.py

@@ -10,6 +10,7 @@
 # v2 = Vector(4, 5, 6)
 # v3 = v1 + v2
 # v4 = v1 - v2
+from __future__ import annotations
 
 
 class Vector3D:

chapters/chapter10_oop/exercises/exercise_69.py

@@ -1,6 +1,32 @@
-# Exercise 69 - Calculator Class
-# Create a class called Calculator. The class should have two methods: add and subtract.
-# The two methods should be class methods and should take two arguments each.
+# Exercise 69 - TaxCalculator Class
+# Define a `TaxCalculator` class that calculates the tax for a given income.
+# The class should have a method `calculate_tax` that takes an income as a parameter and returns the tax amount.
+# The tax should be calculated based on the following rules:
+# - 0% tax for income less than or equal to 10,000
+# - 10% tax for income greater than 10,000 and less than or equal to 50,000
+# - 20% tax for income greater than 50,000 and less than or equal to 100,000
+# - 30% tax for income greater than 100,000
 
+# Example:
+# tax_calculator = TaxCalculator()
+# tax_calculator.calculate_tax(5000) => 0
+# tax_calculator.calculate_tax(15000) => 500
+# tax_calculator.calculate_tax(75000) => 10000
 
-class Calculator: ...
+
+class TaxCalculator:
+    def __init__(self):
+        self.income = 0
+
+    def calculate_tax(self, income: int) -> float:
+        self.income = income
+        if self.income <= 10000:
+            return 0
+        elif self.income <= 50000:
+            return self.income * 0.1
+        elif self.income <= 100000:
+            return self.income * 0.2
+        elif self.income > 100000:
+            return self.income * 0.3
+        else:
+            return 0

chapters/chapter10_oop/exercises/exercise_70.py

@@ -10,6 +10,10 @@
 # circle = Circle(5)
 # assert circle.area() == 78.54
 
+from abc import ABC, abstractmethod
+
+PI = 3.14159
+
 
 class Shape:
     # Your code should go here.

chapters/chapter10_oop/exercises/exercise_71.py

@@ -1,4 +1,4 @@
-# Exercise 71 - Library Management System [Part 1/4]
+# Exercise 71 - Library Management System [Part 1/3]
 # In the next three exercises, you will implement a simple library management system.
 # Let's start first by defining our core classes (Book and Author).
 

chapters/chapter10_oop/exercises/exercise_72.py

@@ -1,5 +1,4 @@
-# Exercise 72 - Library Management System [Part 2/4]
-# In the previous exercise, you defined the core classes for a library management system.
+# Exercise 72 - Library Management System [Part 2/3]
 # In this exercise, you will implement the `BookShelf` class that will hold a collection of books.
 
 # The `BookShelf` class should have the following methods:
@@ -9,16 +8,20 @@
 # 3. `get_books() -> List[Book]`: Return a list of all the books on the shelf.
 # 4. `get_books_by_genre(genre: Genre) -> List[Book]`: Return a list of books by genre.
 
-# Note: Define any additional methods or attributes that you think are necessary for the `Shelf` class.
+# Note: Feel free to define any additional methods or attributes that
+# you think are necessary for the `BookShelf` class.
 
-# Example of the expected behavior:
+# Example:
 # author = Author("John", "Doe")
 # book1 = Book("The Book", author, 2021, Genre.Fiction)
 # shelf = BookShelf([book1])
 # book2 = Book("Another Book", author, 2022, Genre.Fiction)
 # shelf.add_book(book2)
 # assert shelf.get_books() == [book1, book2]
 # assert shelf.get_books_by_genre(Genre.Fiction) == [book1, book2]
+# shelf.remove_book(book1)
+
+from .exercise_71 import Book, Genre
 
 
 class BookShelf:

chapters/chapter10_oop/exercises/exercise_73.py

@@ -1,15 +1,35 @@
-# Exercise 73 - Library Management System [Part 3/4]
-# In the previous two exercises, you defined the core classes for a library management system.
+# Exercise 73 - Library Management System [Part 3/3]
 # In this exercise, you will implement the `Library` class that will hold a collection of shelves.
 
 # The `Library` class should have the following methods:
 # 1. `add_shelf(shelf: BookShelf)`: Add a shelf to the library.
 # 2. `remove_shelf(shelf: BookShelf)`: Remove a shelf from the library.
-# 3. `get_books() -> List[Book]`: Return a list of all the books in the library.
+# 3. `get_books() -> List[Book]`: Return a list of all the books from all the shelves in the library.
 # 4. `is_book_in_library(book: Book) -> bool`: Return `True` if the book is in the library, otherwise `False`.
 
 
-# Note: Define any additional methods or attributes that you think are necessary for the `Library` class.
+# Note: Feel free to define any additional methods or attributes that
+# you think are necessary for the `BookShelf` class.
+
+
+# Example:
+# author = Author("John", "Doe")
+# book1 = Book("The Book", author, 2021, Genre.Fiction)
+# shelf1 = BookShelf([book1])
+# book2 = Book("Another Book", author, 2022, Genre.Fiction)
+# shelf2 = BookShelf([book2])
+# library = Library()
+# library.add_shelf(shelf1)
+# library.add_shelf(shelf2)
+# assert library.get_books() == [book1, book2]
+# assert library.is_book_in_library(book1) is True
+# assert library.is_book_in_library(Book("Non Existing Book", author, 2021, Genre.Fiction)) is False
+# library.remove_shelf(shelf1)
+# assert library.get_books() == [book2]
+from .exercise_71 import Book, Genre
+from .exercise_72 import BookShelf
+
+
 class Library:
     # Add your code here.
     ...

chapters/chapter10_oop/exercises/exercise_74.py

@@ -1,22 +1,30 @@
-# Exercise 74 - Banking System [Part 1/3]
+# Exercise 74 - Banking System [Part 1/2]
 # In the next three exercises, you will implement a simple banking system.
 # Let's start first by defining our core classes (Card, Account, and Customer).
 
-# Create two dataclasses called `Card`, `Account`, and a class called `Customer`.
-# The `Card` class should have the following attributes:
-# 1. card_number
-# 2. card_holder
-# 3. expiration_date
-# 4. pin
+# Create three dataclasses called `Card`, `Account`, and `Customer`.
 
+# The `Card` class should have the following attributes:
+# 1. card_number (a string)
+# 2. card_holder (a string)
+# 3. expiration_date (a string)
+# 4. pin (a string)
 
 # The `Account` class should have the following attributes:
-# 1. account_number
-# 2. account_holder
-# 3. balance
+# 1. account_number (a string)
+# 2. account_holder (an instance of the `Customer` class)
+# 3. balance (a float)
+# 4. cards (a list of `Card` instances)
+
+# The `Customer` class should have the following attributes:
+# 1. first_name (a string)
+# 2. last_name (a string)
+# 3. accounts (a list of `Account` instances)
 # 4. cards (a list of `Card` instances)
+# 5. total_balance (a float)
 
-from dataclasses import dataclass
+from __future__ import annotations
+from dataclasses import dataclass, field
 
 
 @dataclass

chapters/chapter10_oop/exercises/exercise_75.py

@@ -1,15 +1,8 @@
-# Exercise 75 - Banking System [Part 2/3]
-# So far we've defined the `Card` and `Account` classes. Now, let's define the `Customer` class.
+# Exercise 75 - Banking System [Part 2/2]
+# So far we've defined the `Card` and `Account` classes. Now, let's define the `BankCustomer` class.
 
 
-# The `Customer` class should have the following attributes:
-# 1. first_name
-# 2. last_name
-# 3. accounts (a list of `Account` instances)
-# 4. cards (a list of `Card` instances)
-# 5. total_balance (a float)
-
-# The `Customer` class should also have the following methods:
+# The `BankCustomer` class should also have the following methods:
 # 1. add_account(self, account: Account) -> None: adds an account to the accounts list.
 # 2. remove_account(self, account_number: int) -> None: removes an account from the accounts list.
 # 3. add_card(self, card: Card) -> None: adds a card to the cards list.
@@ -20,7 +13,7 @@
 # 6. withdraw(self, account_number: int, amount: float, card_number: int, pin: int) -> None: withdraws money from an account.
 # 7. deposit(self, account_number: int, amount: float) -> None: deposits money into an account.
 
-from .exercise_74 import Account, Card
+from .exercise_74 import Account, Card, Customer
 
 
 class Customer:

chapters/chapter10_oop/exercises/exercise_77.py

@@ -1 +1,31 @@
-# Exercise 77 - Protocol
+# Exercise 77 - Content Creators
+# We have two types of Content Creators: Bloggers and Vloggers.
+# Both of them should have a method called `create_content` that calls the appropriate method to create content.
+# We want to define a protocol called `ContentCreator` that has the `create_content` method.
+
+from typing import Protocol
+
+
+class ContentCreator(Protocol):
+    def create_content(self) -> str: ...
+
+
+class Blogger:
+
+    def add_post(self, title: str):
+        return f"Creating a new post: {title}"
+
+    # TODO: Write create_content() method.
+
+
+class Vlogger:
+
+    def add_video(self, title: str) -> None:
+        return f"Creating a new video: {title} with path: /videos/{title}.mp4"
+
+    # TODO: Write create_content() method.
+
+
+def create_content(creator: ContentCreator, title: str) -> str:
+    # Your code here
+    ...

chapters/chapter10_oop/tests/test_ch10.py

@@ -1,14 +1,15 @@
+import pytest
 from ..exercises.exercise_68 import Vector3D
-from ..exercises.exercise_69 import Calculator
+from ..exercises.exercise_69 import TaxCalculator
 from ..exercises.exercise_70 import Circle, Shape, Square
 from ..exercises.exercise_71 import Author, Book, Genre
 from ..exercises.exercise_72 import BookShelf
 from ..exercises.exercise_73 import Library
-from ..exercises.exercise_74 import Account, Card
-from ..exercises.exercise_75 import Customer
+from ..exercises.exercise_74 import Account, Card, Customer
+from ..exercises.exercise_75 import BankCustomer
 from ..exercises.exercise_76 import Box
+from ..exercises.exercise_77 import create_content, Blogger, Vlogger
 
-# from ..exercises.exercise_77 import
 # from ..exercises.exercise_78 import
 
 
@@ -28,10 +29,14 @@ def test_e68():
 
 
 def test_e69():
-    assert Calculator.add(0, 0) == 0
-    assert Calculator.add(1, 2) == 3
-    assert Calculator.subtract(0, 0) == 0
-    assert Calculator.subtract(1, 2) == -1
+    tax_calculator = TaxCalculator()
+    assert tax_calculator.calculate_tax(0) == 0
+    assert tax_calculator.calculate_tax(10_000) == 0
+    assert tax_calculator.calculate_tax(10_001) == 1000.1
+    assert tax_calculator.calculate_tax(50_000) == 5000
+    assert tax_calculator.calculate_tax(50_001) == 10_000.2
+    assert tax_calculator.calculate_tax(100_000) == 20_000
+    assert tax_calculator.calculate_tax(150_000) == 45_000
 
 
 def test_e70():
@@ -59,20 +64,23 @@ def test_e72():
     book = Book("The Book", author, 2024, Genre.Fiction)
 
     shelf = BookShelf()
-    shelf.add_book(book)
     assert shelf.get_books() == []
-    assert shelf.get_books_by_genre(Genre.Fiction) == []
+    shelf.add_book(book)
     assert shelf.get_books() == [book]
+    assert shelf.get_books_by_genre(Genre.History) == []
+    assert shelf.get_books_by_genre(Genre.NonFiction) == []
     assert shelf.get_books_by_genre(Genre.Fiction) == [book]
 
     shelf.remove_book(book)
     assert shelf.get_books() == []
     assert shelf.get_books_by_genre(Genre.Fiction) == []
-    shelf.add_book(Book("Biography Book", author, 2024, Genre.Biography))
-    shelf.add_book(Book("History Book", author, 2024, Genre.History))
+    book2 = Book("Biography Book", author, 2024, Genre.Biography)
+    book3 = Book("History Book", author, 2024, Genre.History)
+    shelf.add_book(book2)
+    shelf.add_book(book3)
     assert shelf.get_books_by_genre(Genre.Fiction) == []
-    assert shelf.get_books_by_genre(Genre.Biography) == [book]
-    assert shelf.get_books_by_genre(Genre.History) == [book]
+    assert shelf.get_books_by_genre(Genre.Biography) == [book2]
+    assert shelf.get_books_by_genre(Genre.History) == [book3]
 
 
 def test_e73():
@@ -93,7 +101,8 @@ def test_e73():
     assert library.get_books() == []
     library.add_shelf(shelfA)
     library.add_shelf(shelfB)
-    assert library.get_books() == shelf_A_books + shelf_B_books
+    assert set(library.get_books()) == set(shelf_A_books + shelf_B_books)
+
     assert library.is_book_in_library(shelf_A_books[0]) is True
     assert (
         library.is_book_in_library(
@@ -102,25 +111,48 @@ def test_e73():
         is False
     )
     library.remove_shelf(shelfA)
-    assert library.get_books() == shelf_B_books
+    assert set(library.get_books()) == set(shelf_B_books)
 
 
 def test_e74():
-    # TODO
-    card = Card("1234", "User A", "2024-12-31", "1234")
+    customer = Customer("John", "Doe")
+    card = Card(
+        card_number="1234",
+        customer=customer,
+        expiry_date="2024-12-31",
+        pin="1234",
+    )
     assert isinstance(card, Card)
-    account = Account("1234", "User A", 1000, [card])
+    account = Account("1234", customer, 1000, [card])
     assert isinstance(account, Account)
+    assert account.account_number == "1234"
 
 
-# TODO
 def test_e75():
-    customer = Customer("John", "Doe")
-    assert isinstance(customer, Customer)
-    assert customer.add_account(Account("1234", "User A", 1000, [])) is None
-    assert customer.add_card(Card("1234", "User A", "2024-12-31", "1234")) is None
+    customer = BankCustomer("John", "Doe")
+    card1 = Card("1234", customer, "2024-12-31", "1234")
+    card2 = Card("5678", customer, "2024-12-31", "5678")
+    account1 = Account("acc-1234", customer, 1000, [card1])
+    account2 = Account("acc-5678", customer, 2000, [card2])
+
+    assert customer.get_total_balance() == 0.0
+    customer.add_account(account1)
     assert customer.get_total_balance() == 1000
-    assert customer.withdraw(1234, 500, 1234, 1234) is None
+    customer.add_account(account2)
+    assert customer.get_total_balance() == 3000
+    assert customer.get_card("1234") == card1
+    assert customer.get_card("5678") == card2
+    assert customer.get_account("acc-1234") == account1
+    assert customer.get_account("acc-5678") == account2
+
+    assert customer.deposit("acc-1234", 500) is None
+    assert customer.get_account("acc-1234").balance == 1500
+    assert customer.get_total_balance() == 3500
+
+    with pytest.raises(ValueError):
+        customer.withdraw("acc-1234", 1_000_000, "1234", "1234")
+    with pytest.raises(ValueError):
+        customer.withdraw("acc-1234", 1_000, "1234", "WRONG_PIN")
 
 
 def test_e76():
@@ -137,3 +169,8 @@ def test_e76():
     box3.add("Hello")
     assert isinstance(box3.get(), str)
     assert box3.get() == "Hello"
+
+
+def test_e77():
+    assert create_content(Blogger()) == "Blogger is creating content"
+    assert create_content(Vlogger()) == "Vlogger is creating content"