Tigers - Masha & Soleil

play_tester.py

@@ -0,0 +1,33 @@
+
+from swap_meet.vendor import Vendor
+from swap_meet.clothing import Clothing
+from swap_meet.decor import Decor
+from swap_meet.electronics import Electronics
+
+#def test_swap_best_by_category():
+# Arrange
+# me
+item_a = Decor(condition=2.0)
+item_b = Electronics(condition=4.0)
+item_c = Decor(condition=4.0)
+tai = Vendor(
+    inventory=[item_a, item_b, item_c]
+)
+
+# them
+item_d = Clothing(condition=2.0)
+item_e = Decor(condition=4.0)
+item_f = Clothing(condition=4.0)
+jesse = Vendor(
+    inventory=[item_d, item_e, item_f]
+)
+
+# Act
+result = tai.swap_best_by_category(
+other=jesse,
+    my_priority="Clothing",
+    their_priority="Decor"
+)
+# print(tai.inventory)
+# print(jesse.inventory)
+#print(result)

swap_meet/clothing.py

@@ -1,2 +1,10 @@
-class Clothing:
-    pass
+from swap_meet.item import Item
+
+class Clothing(Item):
+    def __init__(self, condition = 0, age = 0):
+        super().__init__(category = "Clothing", condition = condition, age = 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):
+    def __init__(self, condition = 0, age = 0):
+        super().__init__(category = "Decor", condition = condition, age = 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):
+    def __init__(self, condition = 0, age = 0):
+        super().__init__(category = "Electronics", condition = condition, age = age)
+
+
+    def __str__(self):
+        return "A gadget full of buttons and secrets."
+

swap_meet/item.py

@@ -1,2 +1,24 @@
+# from swap_meet.vendor import Vendor
+
 class Item:
-    pass
+
+    def __init__(self, category = None, condition = 0, age = 0):
+        self.category = category if category is not None else ""
+        self.condition = condition
+        self.age = age
+
+    def __str__(self):
+        return "Hello World!"
+
+    def condition_description(self):
+        self.condition = round(self.condition)
+        condition_dict = {
+            0 : "garbage",
+            1 : "bad",
+            2 : "used",
+            3 : "lightly used",
+            4 : "like new",
+            5 : "new"
+        }
+        return condition_dict[self.condition]
+

swap_meet/vendor.py

@@ -1,2 +1,107 @@
+from swap_meet.item import Item
+
 class Vendor:
-    pass
+    def __init__(self, inventory=None):
+        self.inventory = inventory if inventory is not None else []
+
+    def add(self, item):
+        self.inventory.append(item)
+        return item
+
+    def remove(self, item):
+        if item in self.inventory:
+            self.inventory.remove(item)
+            return item
+
+        return False
+
+    def get_by_category(self, category):
+        list_of_items = []
+        for item in self.inventory:       
+            if item.category == category:
+                list_of_items.append(item)
+
+        return list_of_items
+
+    def swap_items(self, other_vendor, my_item, their_item):
+        if my_item not in self.inventory or their_item not in other_vendor.inventory:
+            return False
+
+        other_vendor.remove(their_item)
+        self.add(their_item)
+        self.remove(my_item)
+        other_vendor.add(my_item)
+        return True
+
+    def swap_first_item(self, other_vendor):
+        if not self.inventory or not other_vendor.inventory: 
+            return False
+
+        my_item = self.inventory[0]
+        their_item = other_vendor.inventory[0]
+        self.swap_items(other_vendor, my_item, their_item)
+        return True
+
+    def get_best_by_category(self, category):
+        items_with_category = self.get_by_category(category)
+        if not items_with_category:
+            return None
+
+        max_item_condition = max(items_with_category, key=lambda item: item.condition)
+        return max_item_condition
+
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        my_best_by_category = self.get_best_by_category(their_priority)
+        their_best_by_category = other.get_best_by_category(my_priority)
+
+        if not my_best_by_category or not their_best_by_category:
+            return False
+
+        result = self.swap_items(other, my_best_by_category, their_best_by_category)
+        return result
+
+    def get_newest(self, any_list=None):
+        # any_list = self.inventory if self.inventory is not None else []
+        # other version #
+        if any_list is None:
+            any_list = self.inventory
+
+        if not self.inventory or not any_list:
+            return None
+
+        return min(any_list, key=lambda item: item.age)
+
+
+    def get_newest_by_category(self, category):
+        newest_items_with_category = self.get_by_category(category)
+        if not newest_items_with_category:
+            return None
+
+        newest_item = self.get_newest(newest_items_with_category)
+        return newest_item
+
+
+    def swap_newest(self, other):
+        my_newest_item = self.get_newest()
+        other_newest_item = other.get_newest()
+        if not my_newest_item or not other_newest_item:
+            return False
+
+        self.swap_items(other, my_newest_item, other_newest_item)
+        return True
+
+
+
+    def swap_newest_by_category(self, other, my_priority=None, their_priority=None):
+        my_newest_by_category = self.get_newest_by_category(their_priority)
+        their_newest_by_category = other.get_newest_by_category(my_priority)
+        if not my_newest_by_category or not their_newest_by_category:
+            return False
+
+        self.swap_items(other, my_newest_by_category, their_newest_by_category)
+        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,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,9 @@ def test_removing_not_found_is_false():
 
     result = vendor.remove(item)
 
-    raise Exception("Complete this test according to comments below.")
+    assert result == False
+
+    #raise Exception("Complete this test according to comments below.")
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************

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.")
+    assert items == []
+
+    #raise Exception("Complete this test according to comments below.")
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************

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