sea-turtles, jae clayton

main.py

@@ -0,0 +1,13 @@
+from swap_meet.item import Item
+from swap_meet.vendor import Vendor 
+from swap_meet.clothing import Clothing
+from swap_meet.decor import Decor
+from swap_meet.electronics import Electronics
+
+
+
+
+
+
+
+

swap_meet/clothing.py

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

swap_meet/item.py

@@ -1,2 +1,50 @@
+# from .clothing import Clothing
+# from .decor import Decor 
+# from .electronics import Electronics 
+
 class Item:
-    pass
+    def __init__(self, category = '', condition=0.0): 
+        self.category = category
+        self.condition = condition
+
+
+    def __str__(self): 
+        return "Hello World!" 
+
+    def condition_description(self): 
+        if self.condition <= 0: 
+            return "disgusting"
+        if self.condition <= 1:
+            return "needs a wash"
+        if self.condition <= 2: 
+            return "passable"
+        if self.condition <= 3: 
+            return "a bargain"
+        if self.condition <= 4: 
+            return "gross"
+        if self.condition <= 5: 
+            return "mint!"
+
+
+    '''
+    All three classes and the Item class have an instance method 
+    named condition_description, which should describe the condition 
+    in words based on the value, assuming they all range from 0 to 5. 
+    These can be basic descriptions (eg. 'mint', 'heavily used') but 
+    feel free to have fun with these 
+    (e.g. 'You probably want a glove for this one..."). 
+    The one requirement is that the condition_description for 
+    all three classes above have the same behavior.
+    '''
+
+
+
+
+
+
+
+
+
+
+
+

swap_meet/vendor.py

@@ -1,2 +1,94 @@
+from swap_meet.item import Item 
+
 class Vendor:
-    pass
+    def __init__(self, inventory=None):
+        self.inventory = inventory if inventory is not None else []
+
+    @staticmethod
+    def check_if_in_inventory(inventory, item):  
+        if item not in inventory: 
+           return False
+        return True 
+
+    # pass in vendors as tuple, and items as tuple to iterate through them 
+    # just have one static method 
+
+    @staticmethod 
+    def combo_static_combo(vendor_1, vendor_2, item_1, item_2): 
+        if Vendor.check_if_in_inventory(vendor_1.inventory, item_1) and Vendor.check_if_in_inventory(vendor_2.inventory, item_2):
+            return True 
+        return False 
+
+
+    def add(self, item): 
+        self.inventory.append(item)
+        return item 
+
+
+    def remove(self, item):
+        if Vendor.check_if_in_inventory(self.inventory, item): 
+            self.inventory.remove(item)
+            return item 
+        return False 
+
+
+    def get_by_category(self, category = ''):
+        category_list = []
+
+        for item in self.inventory: 
+            if item.category == category: 
+                category_list.append(item)
+        return category_list 
+
+    def swap_items(self, vendor, my_item, their_item):
+        if Vendor.combo_static_combo(self, vendor, my_item, their_item):    
+
+            vendor.inventory.append(my_item)
+            self.inventory.remove(my_item)
+            self.inventory.append(their_item)
+            vendor.inventory.remove(their_item)
+            return True 
+        return False 
+
+    def swap_first_item(self, vendor):
+        if self.inventory == []  or vendor.inventory == []: 
+            return False
+
+        first_self = self.inventory[0]
+        first_vendor = vendor.inventory[0]
+
+        item_swap = self.swap_items(vendor, first_self, first_vendor)
+        return True 
+
+
+    def get_best_by_category(self, category = ''):
+        if self.inventory == []: 
+            return None 
+
+
+        item_list = self.get_by_category(category)
+        if len(item_list) == 0:
+            return None 
+
+
+        item_dict = {}
+        for item in item_list: 
+            item_dict[item] = item.condition 
+
+        # item_dict = dict.fromkeys{item_list, item.condition }
+        # item_dict = {item.condition for (item, item.condition in item_list}
+
+        best_score = max(item_dict, key=item_dict.get)
+        return(best_score)
+
+
+
+
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        my_item = self.get_best_by_category(their_priority)
+        their_item = other.get_best_by_category(my_priority)
+        result = self.swap_items(other, my_item, their_item)
+
+        return result 
+

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,9 @@ 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 **********
-    # *********************************************************************
+
+
+    # with pytest.raises(TypeError): 
+    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")
@@ -33,8 +33,18 @@ def test_get_no_matching_items_by_category():
     )
 
     items = vendor.get_by_category("electronics")
+
+    # assert len(items) == 0
+    # assert item_a in items
+    # assert item_c in items
+    # assert item_b not in items
 
-    raise Exception("Complete this test according to comments below.")
+    assert len(items) == 0
+    assert item_a != Item(category="clothing")
+    assert item_b != Item(category="clothing")
+    assert item_c != Item(category="clothing")
+
+
     # *********************************************************************
     # ****** 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")