Vivian Zhu, C18 Cheetahs

swap_meet/clothing.py

@@ -1,2 +1,11 @@
-class Clothing:
-    pass
+from swap_meet.item import Item
+
+class Clothing(Item):
+
+# Wave 5 
+    def __init__(self, condition = 0.0):
+        self.category = "Clothing"
+        self.condition = condition
+
+    def __str__ (self):
+        return "The finest clothing you could wear."

swap_meet/decor.py

@@ -1,2 +1,13 @@
-class Decor:
-    pass
+from swap_meet.item import Item
+
+class Decor(Item):
+
+# Wave 5    
+    def __init__(self, condition = 0.0):
+        self.category = "Decor"
+        self.condition = condition
+
+        #super().__init__("Decor", condition, age)
+
+    def __str__(self):
+        return "Something to decorate your space."

swap_meet/electronics.py

@@ -1,2 +1,11 @@
-class Electronics:
-    pass
+from swap_meet.item import Item
+
+class Electronics(Item):
+
+# Wave 5   
+    def __init__(self, condition = 0.0):
+        self.category = "Electronics"
+        self.condition = condition
+
+    def __str__(self):
+        return "A gadget full of buttons and secrets."

swap_meet/item.py

@@ -1,2 +1,32 @@
 class Item:
-    pass
+
+# Wave 2 & 5
+    def __init__(self, category = None, condition = 0.0):  
+        # category & condition are the properties of Item     
+        if category is None:
+            category = ""
+        self.category = category 
+        self.condition = condition 
+
+
+ # Wave 3
+    def __str__(self):        
+        return "Hello World!"
+
+
+# Wave 5
+    def condition_description(self, condition = 0.0):
+        '''
+        Describe the condition in words based on the value.
+        '''
+        if self.condition <= 1:
+            return "Uhhh"
+        elif self.condition <= 2 and self.condition >= 1:
+            return "Bad Enough"
+        elif self.condition <= 3 and self.condition >= 2:
+            return "So so"
+        elif self.condition <= 4 and self.condition >= 5:
+            return "Nice Enough"
+        elif self.condition <= 5:
+            return "Sparkling"
+

swap_meet/vendor.py

@@ -1,2 +1,94 @@
+#from swap_meet.item import Item
+
 class Vendor:
-    pass
+    # def __init__(self, inventory = []):
+    # default value None is IMMUTABLE. MUTABLE type should not be used in DEFAULT argument.
+
+# Wave 1    
+    def __init__(self, inventory = None):    
+        if inventory is None:
+            inventory = []
+        self.inventory = inventory
+
+    def add(self, add_item):
+        '''
+        Returns the item that was added
+        '''
+        self.inventory.append(add_item)
+        return add_item
+
+    def remove(self, remove_item):
+        '''
+        Returns the item that was removed
+        '''
+        if remove_item in self.inventory:
+            self.inventory.remove(remove_item)
+            return remove_item
+        else:
+            return False
+
+# Wave 2
+    def get_by_category(self, category_str):
+        '''
+        Returns a list of Strings (items) in the inventory with given category.
+        '''
+        same_category_list = []
+        for item in self.inventory:
+            # does not need import at this point
+            # cause of "dynamic type" does not care about ".category" until it sees Item class
+            # varies in different languages
+            if item.category == category_str:
+                same_category_list.append(item)
+        return same_category_list
+
+
+# Wave 3
+    def swap_items(self, swap_vendor, my_item, their_item): 
+        '''
+        Returns True if swap items action is successful.
+        Otherwise, returns False.
+        '''
+        if their_item in swap_vendor.inventory and my_item in self.inventory:
+            # Mistake made; using swap_vendor.inventory
+            # Class methods must be called on a class objects, not a list 
+            swap_vendor.remove(their_item)
+            self.add(their_item)
+            self.remove(my_item)
+            swap_vendor.add(my_item)
+            return True
+        # okay to delete, clear to leave it?
+        return False 
+
+
+# Wave 4      
+    def swap_first_item(self, swap_vendor):
+        '''
+        Returns True if swap first avaiable item action is successful.
+        Otherwise, returns False.
+        '''
+        if len(self.inventory) >= 1 and len(swap_vendor.inventory) >= 1:
+            return self.swap_items(swap_vendor, self.inventory[0], swap_vendor.inventory[0])
+
+
+# Wave 6
+    def get_best_by_category(self, given_category):
+        '''
+        Returns the item with the best condition in a certain category.
+        '''
+        items = self.get_by_category(given_category)
+        if len(items) > 0:
+            best_item = max(items, key=lambda i:i.condition)
+            return best_item
+        return None         
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        '''
+        Returns True if swap the best item (category) action is successful.
+        Otherwise, returns False.
+        '''
+        # watch out for self.func or other.func
+        my_best_item = self.get_best_by_category(their_priority)
+        their_best_item = other.get_best_by_category(my_priority)
+        if my_best_item is not None and their_best_item is not None:           
+            self.swap_items(other, my_best_item, their_best_item)
+            return True

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  

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,7 @@ 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 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,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")