Sea Turtles - Esther Annorzie

main.py

@@ -0,0 +1,3 @@
+from swap_meet.item import Item
+from swap_meet.vendor import Vendor
+

swap_meet/clothing.py

@@ -1,2 +1,8 @@
-class Clothing:
-    pass
+from .item import Item
+
+class Clothing(Item):
+    def __init__(self, condition=0):
+        super().__init__("Clothing", condition)
+
+    def __str__(self):
+        return "The finest clothing you could wear."

swap_meet/decor.py

@@ -1,2 +1,8 @@
-class Decor:
-    pass
+from .item import Item
+
+class Decor(Item):
+    def __init__(self, condition=0):
+        super().__init__("Decor", condition)
+
+    def __str__(self):
+        return "Something to decorate your space."

swap_meet/electronics.py

@@ -1,2 +1,8 @@
-class Electronics:
-    pass
+from .item import Item
+
+class Electronics(Item):
+    def __init__(self, condition=0):
+        super().__init__("Electronics", condition)
+
+    def __str__(self):
+        return "A gadget full of buttons and secrets."

swap_meet/item.py

@@ -1,2 +1,19 @@
 class Item:
-    pass
+    def __init__(self, category="", condition=0):
+        self.category = category
+        self.condition = condition
+
+    def __str__(self):
+        return "Hello World!"
+
+    def condition_description(self):
+        condition_chart = {
+            0: "This item has been heavily used.",
+            1: "This item has been moderately used.",
+            2: "This item has been partially used.",
+            3: "This item is in good condition.",
+            4: "This item is in great condition.",
+            5: "This item is brand new"
+        }
+
+        return condition_chart[self.condition]

swap_meet/vendor.py

@@ -1,2 +1,127 @@
 class Vendor:
-    pass
+    def __init__(self, inventory=None):
+        self.inventory = [] if not inventory else inventory
+
+    def add(self, item):
+        """Adds an item to the instance's inventory and returns it."""
+        self.inventory.append(item)
+        return item
+
+    def remove(self, item):
+        """
+        Removes items from the instance's inventory.
+
+        Parameter: 
+        item (str): Inventory item to be removed.
+
+        Returns:
+        Instance or bool: False if item is not in inventory, returns item 
+        otherwise.
+        """
+
+        if item not in self.inventory:
+            return False
+
+        self.inventory.remove(item)
+        return item
+
+    def get_by_category(self, specific_category):
+        """
+        Collects the items in the instance's inventory that are of a specific 
+        category.
+
+        Parameters: 
+        specific_category (str): A category.
+
+        Returns:
+        category_matches (list): Items in the inventory matching the category.
+        """
+
+        return [item for item in self.inventory 
+        if item.category == specific_category]
+
+    def swap_items(self, friend, my_item, their_item):
+        """
+        Swaps items in vendor's inventory and friend's inventory.
+
+        Parameters: 
+        friend (class): Vendor instance of friend.
+        my_item (str): Category the vendor wants to receive.
+        their_item (str): Category friends wants to receive.
+
+        Returns:
+        (bool): False if swapping does not occurs, True otherwise.
+        """
+
+        if my_item not in self.inventory or their_item not in friend.inventory:
+            return False
+
+        friend.inventory.append(my_item)
+        self.inventory.remove(my_item)
+
+        self.inventory.append(their_item)
+        friend.inventory.remove(their_item)
+        return True
+
+    def swap_first_item(self, friend):
+        '''
+        Swaps the first item from a vendor's inventory and a friend's inventory.
+
+        Parameter:
+        friend (class): An instance of another Vendor.
+
+        Returns: 
+        (bool): False if an item does not exist in the Vendor 
+        or the friend's inventory, 
+        True otherwise.
+        '''
+        if not self.inventory or not friend.inventory:
+            return False
+
+        self.inventory[0], friend.inventory[0] = friend.inventory[0], self.inventory[0]
+        return True
+
+    def get_best_by_category(self, specific_category):
+        '''
+        Returns the item with the best condition in a specific category.
+
+        Parameters:
+        specific_category (str): Represents a category.
+
+        Returns: 
+        (instance or bool): Returns the vendor's instance of an item 
+        in a specfic category's best condition or None if not found.
+        '''
+        best_by_category = None
+        highest_condition = 0
+
+        for item in self.inventory:
+            if (item.category == specific_category and 
+                item.condition > highest_condition):
+                    best_by_category = item
+                    highest_condition = item.condition
+
+        return best_by_category
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        '''
+        Determines if vendor's item priority and other's item 
+        priority exists and swaps items.
+
+        Parameters: 
+        other (class): The other Vendor instance.
+        my_priority (str): The category that the Vendor wants to receive.
+        their_priority (str): The category that the other party wants to 
+        receive.
+
+        Returns: 
+        (bool): True if items are swapped, False is not.
+        '''
+
+        their_best_item = self.get_best_by_category(their_priority)
+        my_best_item = other.get_best_by_category(my_priority)
+
+        if not their_best_item or not my_best_item:
+            return False
+
+        return self.swap_items(other, their_best_item, my_best_item)

tests/integration_tests/test_wave_01_02_03.py

@@ -2,7 +2,7 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 @pytest.mark.integration_test
 def test_integration_wave_01_02_03():
     # make a vendor  
@@ -49,6 +49,4 @@ def test_integration_wave_01_02_03():
     assert len(vendor.inventory) == 1
     assert len(other_vendor.inventory) == 1
     assert item2 in other_vendor.inventory
-    assert item3 in vendor.inventory
-
-
+    assert item3 in vendor.inventory

tests/integration_tests/test_wave_04_05_06.py

@@ -4,7 +4,7 @@
 from swap_meet.decor import Decor
 from swap_meet.electronics import Electronics
 
-@pytest.mark.skip
+# @pytest.mark.skip
 @pytest.mark.integration_test
 def test_integration_wave_04_05_06():
     camila = Vendor()

tests/unit_tests/test_wave_01.py

@@ -2,12 +2,12 @@
 import pytest
 from swap_meet.vendor import Vendor
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_vendor_has_inventory():
     vendor = Vendor()
     assert len(vendor.inventory) == 0
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_vendor_takes_optional_inventory():
     inventory = ["a", "b", "c"]
     vendor = Vendor(inventory=inventory)
@@ -16,7 +16,7 @@ def test_vendor_takes_optional_inventory():
     assert "b" in vendor.inventory
     assert "c" in vendor.inventory
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_adding_to_inventory():
     vendor = Vendor()
     item = "new item"
@@ -27,7 +27,7 @@ def test_adding_to_inventory():
     assert item in vendor.inventory
     assert result == item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_removing_from_inventory_returns_item():
     item = "item to remove"
     vendor = Vendor(
@@ -40,7 +40,7 @@ def test_removing_from_inventory_returns_item():
     assert item not in vendor.inventory
     assert result == item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_removing_not_found_is_false():
     item = "item to remove"
     vendor = Vendor(
@@ -49,7 +49,10 @@ def test_removing_not_found_is_false():
 
     result = vendor.remove(item)
 
-    raise Exception("Complete this test according to comments below.")
+    # raise Exception("Complete this test according to comments below.")
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
+    assert len(vendor.inventory) == 3
+    assert item not in vendor.inventory
+    assert result == False

tests/unit_tests/test_wave_02.py

@@ -2,12 +2,12 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_items_have_blank_default_category():
     item = Item()
     assert item.category == ""
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_get_items_by_category():
     item_a = Item(category="clothing")
     item_b = Item(category="electronics")
@@ -23,7 +23,7 @@ def test_get_items_by_category():
     assert item_c in items
     assert item_b not in items
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_get_no_matching_items_by_category():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -34,7 +34,9 @@ def test_get_no_matching_items_by_category():
 
     items = vendor.get_by_category("electronics")
 
-    raise Exception("Complete this test according to comments below.")
+    # raise Exception("Complete this test according to comments below.")
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
+    assert not len(items)
+    assert items == []

tests/unit_tests/test_wave_03.py

@@ -2,15 +2,15 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_item_overrides_to_string():
     item = Item()
 
     stringified_item = str(item)
 
     assert stringified_item == "Hello World!"
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_returns_true():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -38,7 +38,7 @@ def test_swap_items_returns_true():
     assert item_b in jolie.inventory
     assert result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_when_my_item_is_missing_returns_false():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -65,7 +65,7 @@ def test_swap_items_when_my_item_is_missing_returns_false():
     assert item_e in jolie.inventory
     assert not result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_when_their_item_is_missing_returns_false():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -92,7 +92,7 @@ def test_swap_items_when_their_item_is_missing_returns_false():
     assert item_e in jolie.inventory
     assert not result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_from_my_empty_returns_false():
     fatimah = Vendor(
         inventory=[]
@@ -112,7 +112,7 @@ def test_swap_items_from_my_empty_returns_false():
     assert len(jolie.inventory) == 2
     assert not result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_from_their_empty_returns_false():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -131,4 +131,4 @@ def test_swap_items_from_their_empty_returns_false():
 
     assert len(fatimah.inventory) == 3
     assert len(jolie.inventory) == 0
-    assert not result
+    assert not result