Otters - Tori Shade

swap_meet/clothing.py

@@ -1,2 +1,10 @@
-class Clothing:
-    pass
+from swap_meet.item import Item
+
+class Clothing(Item):
+    '''Clothing class is instantiated and inherits from Item class'''
+
+    def __init__(self, category = "Clothing", condition = 0, age = 0):
+        super(). __init__(category, condition, age)
+
+    def __str__(self):
+        return "The finest clothing you could wear."

swap_meet/decor.py

@@ -1,2 +1,10 @@
-class Decor:
-    pass
+from swap_meet.item import Item
+
+class Decor(Item):
+    '''Decor class is instantiated and inherits from Item class'''
+
+    def __init__(self, category = "Decor", condition = 0, age = 0):
+        super(). __init__(category, condition, age)
+
+    def __str__(self):
+        return "Something to decorate your space."

swap_meet/electronics.py

@@ -1,2 +1,10 @@
-class Electronics:
-    pass
+from swap_meet.item import Item
+
+class Electronics(Item):
+    '''Electronics class is instantiated and inherits from Item class'''
+
+    def __init__(self, category = "Electronics", condition = 0, age = 0):
+        super(). __init__(category, condition, age)
+
+    def __str__(self):
+        return "A gadget full of buttons and secrets."

swap_meet/item.py

@@ -1,2 +1,28 @@
 class Item:
-    pass
+
+    '''Item class is instantiated'''
+    def __init__(self, category=None, condition = 0, age = 0):
+        if not category:
+            category = ""
+        self.category = category
+        self.condition = condition
+        self.age = age
+
+    def __str__(self):
+        return "Hello World!"
+
+    def condition_description(self):
+        '''Function returns condition description based on quantitative value assigned to condition'''
+
+        if self.condition == 0:
+            return f"terrible"
+        if self.condition == 1:
+            return f"not great"
+        if self.condition == 2:
+            return f"kinda ok"
+        if self.condition == 3:
+            return f"you'll do"
+        if self.condition == 4:
+            return f"basic"
+        if self.condition == 5:
+            return f"vibe"

swap_meet/vendor.py

@@ -1,2 +1,107 @@
 class Vendor:
-    pass
+
+    def __init__(self, inventory = None):
+        '''Vendor class is instantiated'''
+
+        if not inventory:
+            inventory = []
+        self.inventory = inventory
+
+    def add(self, item):
+        '''Function used to add items to vendor's inventory'''
+
+        self.inventory.append(item)
+        return item
+
+    def remove(self, item):
+        '''Function used to remove items from vendor's inventory'''
+
+        if item not in self.inventory:
+            return False
+        else:
+            self.inventory.remove(item)
+            return item
+
+    def get_by_category(self, category):
+        '''Function returns items in vendor's inventory if they belong to the category passed within the parameter'''
+
+        items_in_category = []
+
+        for item in self.inventory:
+            if category == item.category:
+                items_in_category.append(item)
+        return items_in_category
+
+    def swap_items(self, other, my_item, their_item):
+        '''Function allows this vendor and another vendor to swap items from their respective inventories'''
+
+        if my_item not in self.inventory or their_item not in other.inventory:
+            return False
+        else:
+            self.remove(my_item)
+            other.add(my_item)
+
+            other.remove(their_item)
+            self.add(their_item)
+        return True
+
+    def swap_first_item(self, other):
+        '''Function allows this vendor and another vendor to swap the first item from their respective inventories'''
+
+        if not self.inventory or not other.inventory:
+            return False
+        else:
+            return self.swap_items(other, self.inventory[0], other.inventory[0])
+
+    def get_best_by_category(self, category):
+        '''Function identifies the item in the best condition within a certain category of a vendor's inventory'''
+
+        current_condition = 0
+        best_condition = None
+
+        for item in self.inventory:
+            if item.category == category:
+                if item.condition > current_condition:
+                    current_condition = item.condition
+                    best_condition = item
+
+        return best_condition
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        '''Function swaps the items in the best condition with that of other vendors if in a certain category'''
+
+        my_best_item = self.get_best_by_category(their_priority)
+        their_best_item = other.get_best_by_category(my_priority)
+
+        if not my_best_item or not their_best_item:
+            return False
+        else:
+            self.swap_items(other, my_best_item, their_best_item)
+            return True
+
+    def get_newest_by_category(self, category):
+        '''Function identifies the newest item within a certain category of a vendor's inventory'''
+
+        item_age_flag_max_30 = 30
+        newest_item = None
+
+        for item in self.inventory:
+            if item.category == category:
+                if item.age <= item_age_flag_max_30:
+                    item_age_flag_max_30 = item.age
+                    newest_item = item
+
+        return newest_item
+
+    def swap_newest_by_category(self, category, other):
+        '''Function swaps the newest item with that of other vendors newest item if in a certain category'''
+
+        my_newest_item = self.get_newest_by_category(category)
+
+        their_newest_item = other.get_newest_by_category(category)
+
+        if not my_newest_item or not their_newest_item:
+            return False
+        else:
+            self.swap_items(other, my_newest_item, their_newest_item)
+            return True

tests/integration_tests/test_wave_01_02_03.py

@@ -2,8 +2,8 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
-@pytest.mark.integration_test
+#@pytest.mark.skip
+#@pytest.mark.integration_test
 def test_integration_wave_01_02_03():
     # make a vendor  
     vendor = Vendor()

tests/integration_tests/test_wave_04_05_06.py

@@ -4,8 +4,8 @@
 from swap_meet.decor import Decor
 from swap_meet.electronics import Electronics
 
-@pytest.mark.skip
-@pytest.mark.integration_test
+#@pytest.mark.skip
+#@pytest.mark.integration_test
 def test_integration_wave_04_05_06():
     camila = Vendor()
     valentina = 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,11 @@ def test_removing_from_inventory_returns_item():
     assert item not in vendor.inventory
     assert result == item
 
-@pytest.mark.skip
+    # *********************************************************************
+    # ****** Complete Assert Portion of this test **********
+    # *********************************************************************
+
+#@pytest.mark.skip
 def test_removing_not_found_is_false():
     item = "item to remove"
     vendor = Vendor(
@@ -49,7 +53,8 @@ def test_removing_not_found_is_false():
 
     result = vendor.remove(item)
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert result == False
+    assert len(vendor.inventory) == 3
+    assert item not in vendor.inventory
+
+

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,11 @@ def test_get_items_by_category():
     assert item_c in items
     assert item_b not in items
 
-@pytest.mark.skip
+    # *********************************************************************
+    # ****** Complete Assert Portion of this test **********
+    # *********************************************************************
+
+#@pytest.mark.skip
 def test_get_no_matching_items_by_category():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -34,7 +38,7 @@ def test_get_no_matching_items_by_category():
 
     items = vendor.get_by_category("electronics")
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert len(items) == 0
+    assert item_a not in items
+    assert item_b not in items
+    assert item_c not in 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")

tests/unit_tests/test_wave_04.py

@@ -2,7 +2,7 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_swap_first_item_returns_true():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
@@ -30,7 +30,7 @@ def test_swap_first_item_returns_true():
     assert item_a in jolie.inventory
     assert result
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_swap_first_item_from_my_empty_returns_false():
     fatimah = Vendor(
         inventory=[]
@@ -48,7 +48,7 @@ def test_swap_first_item_from_my_empty_returns_false():
     assert len(jolie.inventory) == 2
     assert not result
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_swap_first_item_from_their_empty_returns_false():
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")