Sharks/C17/Huma Hameed

swap_meet/clothing.py

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

swap_meet/decor.py

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

swap_meet/electronics.py

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

swap_meet/item.py

@@ -1,2 +1,30 @@
+
 class Item:
-    pass
+
+
+    def __init__(self, category = "", condition = 0.0):
+        """
+        def __init__ creates attribute of empty string category and condition with default value
+        """
+        self.category = category
+        self.condition = condition
+
+    def __str__(self):
+        string_item = "Hello World!"
+        return string_item
+
+    def condition_description(self):
+        """
+        def condition_description() creates key/values of level of \
+        condition which will be used in other files
+        """
+        CONDITION_DICT = {0: "Brand-spanking new!", 
+                        1: "New-but really not",
+                        2: "Just okay",
+                        3: "Not so okay",
+                        4: "Don't know what to tell ya",
+                        5: "Wouldn't touch with a 10ft pole"}
+        condition_value = CONDITION_DICT[self.condition]
+        return condition_value
+
+

swap_meet/vendor.py

@@ -1,2 +1,104 @@
+from swap_meet.item import Item
+
 class Vendor:
-    pass
+
+
+    def __init__(self, inventory = None):
+        """
+        def __init__ creates attribute of empty inventory to hold items
+        """
+        if inventory == None:
+            inventory = []
+        self.inventory = inventory
+
+
+    def add(self, item):
+        """
+        def add() adds items to inventory and returns the item that was added 
+        """
+        self.inventory.append(item)
+        return item
+
+
+    def remove(self, item):
+        """
+        def remove() removes  matching item from inventory \
+        and returns the item that was removed
+        """
+        if item in self.inventory:
+            self.inventory.remove(item)
+            return item
+        else:
+            return False
+
+
+    def get_by_category(self, input_category):
+        """
+        def get_by_category() takes in a category string \
+        and returns a list of items in the inventory with that category
+        """
+        item_list = []
+        for item in self.inventory:
+            if item.category == input_category:
+                item_list.append(item)
+        return item_list
+
+
+    def swap_items(self, other_vendor, my_item, their_item):
+        """
+        def swap_items() returns false if self doesn't contain my_item \
+        or other_vendor doesn't contain their_item\
+        It swaps my_item from self with their_item from other_vendor \
+        and returns trues
+        """
+        if my_item not in self.inventory or their_item not in other_vendor.inventory:
+            return False
+        self.add(their_item)
+        self.remove(my_item)
+        other_vendor.add(my_item)
+        other_vendor.remove(their_item)
+        return True
+
+
+    def swap_first_item(self, other_vendor):
+        """
+        def swap_first_item() returns false if self or other_vendor have an empty list\
+        It swaps first item from self and other_vendor and swaps those items\
+        and returns true
+        """
+        if len(self.inventory) ==0 or len(other_vendor.inventory) ==0:
+            return False
+        my_first_item = self.inventory[0]
+        friend_first_item = other_vendor.inventory[0]
+        return self.swap_items(other_vendor, my_first_item, friend_first_item)
+
+    def get_best_by_category(self, category):
+        """
+        def get_best_by_category() returns false if self or other_vendor have an empty list\
+        It swaps first item from self and other_vendor and swaps those items\
+        and returns true
+        """
+        cat_item_list = self.get_by_category(category)
+        best_condition = 0
+        best_item = None
+        for item in cat_item_list:
+            item_condition = item.condition
+            if best_condition < item_condition:
+                best_condition = item_condition
+                best_item = item
+        return best_item 
+
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        """
+        def swap_best_by_category() uses get_best_by_category to return a list of items in matching priority category\
+        if items don't match priority returns false\
+        otherwise swaps items and returns true
+        """ 
+        my_best = self.get_best_by_category(their_priority)
+        their_best = other.get_best_by_category(my_priority)
+
+        if my_best == None or their_best == None:
+            return False
+        self.swap_items(other, my_best, their_best)
+        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,8 +4,9 @@
 from swap_meet.decor import Decor
 from swap_meet.electronics import Electronics
 
-@pytest.mark.skip
+# @pytest.mark.skip
 @pytest.mark.integration_test
+# @pytest.mark.skip
 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.")
+    # raise Exception("Complete this test according to comments below.")
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************
+
+    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,12 @@ def test_get_no_matching_items_by_category():
 
     items = vendor.get_by_category("electronics")
 
-    raise Exception("Complete this test according to comments below.")
+    # 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")