Carmen Vega - C18 Cheetahs

main.py

@@ -0,0 +1,33 @@
+from swap_meet.vendor import Vendor
+from swap_meet.item import Item
+
+vendor = Vendor()
+print(vendor.inventory)
+
+# add an item
+item1 = Item(category="Clothing")
+item2 = Item(category="Electronics")
+result1 = vendor.add(item1)
+result2 = vendor.add(item2)
+
+print(vendor.inventory)
+assert item1 in vendor.inventory
+assert item2 in vendor.inventory
+assert result1 == item1
+assert result2 == item2
+
+# remove an item
+remove_result = vendor.remove(item1)
+
+assert len(vendor.inventory) == 1
+assert item1 not in vendor.inventory
+assert remove_result == item1
+
+# get item by category, truthy
+items = vendor.get_by_category("Electronics")
+
+assert len(items) == 1
+assert item2 in items
+
+# get item by category, falsy
+items = vendor.get_by_category("Clothing")

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):
+        super().__init__(self, condition)
+        self.category = "Clothing"
+        self.condition = condition
+
+    def __str__(self):
+        return f"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):
+        super().__init__(self, condition)
+        self.category = "Decor"
+        self.condition = condition
+
+    def __str__(self):
+        return f"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):
+        super().__init__(self, condition)
+        self.category = "Electronics"
+        self.condition = condition
+
+    def __str__(self):
+        return f"A gadget full of buttons and secrets."

swap_meet/item.py

@@ -1,2 +1,24 @@
 class Item:
-    pass
+    def __init__(self, category = "", condition = 0):
+        self.category = category
+        self.condition = condition 
+
+    def get_by_category(self):
+        pass
+
+    def __str__(self):
+        return f"Hello World!"
+
+    def condition_description(self):
+        if self.condition == 0:
+            return "Unusable"
+        elif self.condition == 1:
+            return "Severely worn"
+        elif self.condition == 2:
+            return "Just a small hole"
+        elif self.condition == 3:
+            return "A few scratches"
+        elif self.condition == 4:
+            return "One light scratch"
+        elif self.condition == 5:
+            return "Best condition ever"

swap_meet/vendor.py

@@ -1,2 +1,76 @@
+from operator import inv
+from swap_meet.item import Item
+
 class Vendor:
-    pass
+    def __init__(self, inventory = None):
+        if inventory is None:
+            inventory = []
+        self.inventory = inventory
+
+    def add(self, item):
+        self.inventory.append(item)
+        return item
+
+    def remove(self, item):
+        if item not in self.inventory:
+            return False
+        else:
+            self.inventory.remove(item)
+            return item
+
+    def get_by_category(self, category):
+        item_list = []
+        for item in self.inventory:
+            if item.category == category:
+                item_list.append(item) 
+        return item_list
+
+    def swap_items(self, friend_list, my_item, their_item):
+        if my_item in self.inventory:
+            if their_item in friend_list.inventory:
+                friend_list.remove(their_item)
+                friend_list.add(my_item)
+                self.add(their_item)
+                self.remove(my_item)
+                return True
+            else:
+                return False
+        else:
+            return False
+
+    def swap_first_item(self, friend_list):
+        if len(self.inventory) !=0:
+            if len(friend_list.inventory) !=0:
+                self.swap_items(friend_list,self.inventory[0], friend_list.inventory[0])
+                return True
+            else:
+                return False
+        else:
+            return False
+
+    def get_best_by_category(self, category):
+        best_item = None
+        best_condition = -1
+        for item in self.inventory:
+            if item.category == category:
+                if item.condition > best_condition:
+                    best_item = item
+                    best_condition = item.condition
+
+        return best_item
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        swap_is_happening = False
+
+        their_best_item = other.get_best_by_category(my_priority)
+        my_best_item = self.get_best_by_category(their_priority)
+
+        if their_best_item and my_best_item:
+            swap_is_happening = True
+            self.remove(my_best_item)
+            other.remove(their_best_item)
+            self.add(their_best_item)
+            other.add(my_best_item)
+
+        return swap_is_happening
+

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/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,8 @@ 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.")
+    assert result == False
     # *********************************************************************
     # ****** 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,12 @@ def test_get_no_matching_items_by_category():
 
     items = vendor.get_by_category("electronics")
 
-    raise Exception("Complete this test according to comments below.")
+    assert len(items) == 0
+    assert item_a not in items
+    assert item_c not in items
+    assert item_b not in 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")

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