Lions- Jessica A.

swap_meet/clothing.py

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

swap_meet/decor.py

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

swap_meet/electronics.py

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

swap_meet/item.py

@@ -1,2 +1,26 @@
+
 class Item:
-    pass
+    def __init__(self, category = "", condition = None):
+        self.category = category
+        if condition is None: 
+            self.condition = 0.0 
+        else: 
+            self.condition = condition
+
+
+    def __str__(self):
+        return "Hello World!"
+
+    def condition_description(self):
+        if self.condition == 0: 
+            return "Bad condition."
+        elif self.condition == 1:
+            return "Heavly used."
+        elif self.condition == 2:
+            return "Been used"
+        elif self.condition == 3:
+            return "Lightly used."
+        elif self.condition == 4: 
+            return "Looks new."
+        elif self.condition == 5: 
+            return "Brand new."

swap_meet/vendor.py

@@ -1,2 +1,83 @@
 class Vendor:
-    pass
+    def __init__(self, inventory = None, condition = None):
+
+        if inventory == None:
+            self.inventory = []
+        else: 
+            self.inventory = inventory
+
+
+    def add(self, added_item):
+        self.inventory.append(added_item)
+        return added_item
+
+    def remove(self, removed_item):
+        if removed_item not in self.inventory:
+            return False
+        self.inventory.remove(removed_item)
+        return removed_item
+
+    def get_by_category(self,category):
+        items_in_category = []
+
+        for item in self.inventory:
+            if item.category == category:
+                items_in_category.append(item)
+
+        return items_in_category
+
+
+    def swap_items(self, another_vendor, my_item, their_item):
+        if their_item not in another_vendor.inventory or my_item not in self.inventory:
+            return False 
+        self.remove(my_item)
+
+        another_vendor.remove(their_item)
+
+        another_vendor.add(my_item)
+
+        self.add(their_item)
+
+        return True 
+
+    def swap_first_item(self, another_vendor):
+        if another_vendor.inventory == [] or self.inventory == []:
+            return False 
+
+        another_item = another_vendor.inventory[0]
+        my_item = self.inventory[0]
+
+        self.swap_items(another_vendor, my_item, another_item)
+        return True
+
+    def get_best_by_category(self, category = ""):
+        best_condition_rating = 0 
+        best_condition_item = None
+        if self.inventory == []:
+            return False 
+        for item in self.inventory:
+            if item.category == category:
+                if item.condition > best_condition_rating:
+                    best_condition_rating  = item.condition
+                    best_condition_item = item
+        return best_condition_item
+
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+
+        my_swap_item = self.get_best_by_category(their_priority)
+        other_vendor_swap_item = other.get_best_by_category(my_priority)
+
+
+        if my_swap_item is not None and other_vendor_swap_item is not None:
+            return self.swap_items(other, my_swap_item, other_vendor_swap_item)
+        return False
+
+
+
+
+
+
+
+
+

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()
@@ -28,21 +28,27 @@ def test_integration_wave_01_02_03():
     assert item1 not in vendor.inventory
     assert remove_result == item1
 
+    print(f"This is vendor inventory{vendor.inventory}")
     # get item by category, truthy
     items = vendor.get_by_category("Electronics")
+    print(f"This is vendor inventory{vendor.inventory}")
 
     assert len(items) == 1
     assert item2 in items
+    print(f"This is vendor inventory{vendor.inventory}")
 
     # get item by category, falsy
     items = vendor.get_by_category("Clothing")
+    print(f"This is vendor inventory{vendor.inventory}")
     assert len(items) == 0
 
     other_vendor = Vendor()
-
+    print(f"This is vendor inventory{vendor.inventory}")
     # swap items
     item3 = Item(category="Decor")
+    print(f"This is vendor inventory{vendor.inventory}")
     other_vendor.add(item3)
+    print(f"This is vendor inventory{vendor.inventory}")
 
     vendor.swap_items(other_vendor, item2, item3)
 

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,16 +40,14 @@ def test_removing_from_inventory_returns_item():
     assert item not in vendor.inventory
     assert result == item
 
-@pytest.mark.skip
+# @pytest.mar k.skip
 def test_removing_not_found_is_false():
+    # arrange
     item = "item to remove"
     vendor = Vendor(
         inventory=["a", "b", "c"]
     )
-
+    # act
     result = vendor.remove(item)
-
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    # assert
+    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,18 +23,20 @@ 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():
+    # Arrange
     item_a = Item(category="clothing")
     item_b = Item(category="clothing")
     item_c = Item(category="clothing")
     vendor = Vendor(
         inventory=[item_a, item_b, item_c]
     )
-
+    # act 
     items = vendor.get_by_category("electronics")
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    # Assert 
+    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")