Otters - Nikki Torab

swap_meet/clothing.py

@@ -1,2 +1,15 @@
-class Clothing:
-    pass
+from swap_meet.item import Item
+
+
+class Clothing(Item):
+
+
+    def __init__(self, condition = 0, age = None):
+        self.category = "Clothing"
+        self.condition = condition
+        self.age = age
+
+
+    #override str() for Clothing, returns "The finest clothing you could wear."
+    def __str__(self):
+        return "The finest clothing you could wear."

swap_meet/decor.py

@@ -1,2 +1,14 @@
-class Decor:
-    pass
+from swap_meet.item import Item
+
+
+class Decor(Item):
+
+
+    def __init__(self, condition = 0, age = None):
+        self.category = "Decor"
+        self.condition = condition
+        self.age = age
+
+    #override str() for Decor, returns "Something to decorate your space."
+    def __str__(self):
+        return "Something to decorate your space."

swap_meet/electronics.py

@@ -1,2 +1,13 @@
-class Electronics:
-    pass
+from swap_meet.item import Item
+
+
+class Electronics(Item):
+
+    def __init__(self, condition = 0, age = None):
+        self.category = "Electronics"
+        self.condition = condition
+        self.age = age
+
+    #override str() for Electronics, returns "A gadget full of buttons and secrets."
+    def __str__(self):
+        return "A gadget full of buttons and secrets."

swap_meet/item.py

@@ -1,2 +1,36 @@
+
+
 class Item:
-    pass
+
+    def __init__(self, category = "", condition = 0, age = None):
+        self.category = category
+        self.condition = condition
+        self.age = age
+
+    #override str() for Item, returns "Hello World!" instead
+    def __str__(self):
+        return "Hello World!"
+
+
+    #describes condition based on the value, range from 0 to 5
+    def condition_description(self):
+
+        if self.condition == 0:
+            return "Terrible condition"
+
+        if self.condition == 1:
+            return "Bad condition"
+
+        if self.condition == 2:
+            return "Slightly bad condition"
+
+        if self.condition == 3:
+            return "Acceptable condition"
+
+        if self.condition == 4:
+            return "Good condition"
+
+        if self.condition == 5:
+            return "Mint conditon"
+
+

swap_meet/vendor.py

@@ -1,2 +1,140 @@
+from swap_meet.item import Item
+
 class Vendor:
-    pass
+    def __init__(self, inventory = None):
+        #code on lines 6-7 from https://docs.python-guide.org/writing/gotchas/
+        if inventory == None:
+            inventory = []
+        self.inventory = inventory
+
+    # Adds the item to the inventory
+    def add(self, item):
+        self.inventory.append(item)
+        return item
+
+
+    # Removes the matching item from the inventory
+    def remove(self, item):
+        if item not in self.inventory:
+            return False
+        else:
+            self.inventory.remove(item)
+            return item
+
+
+    # Takes one argument: a string, representing a category
+    # Returns a list of Items in the inventory with that category
+    def get_by_category(self, category):
+        #self.item = Item(category)
+        item_list = []
+        for item in self.inventory:
+            if item.category == category:
+                item_list.append(item)
+
+
+        return item_list
+
+
+    # removes my_item from this Vendor's inventory
+    # adds my_item to the other Vendor's inventory
+    # removes their_item from other Vendor's inventory
+    # adds their_item to the this Vendor's inventory
+    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
+
+        self.remove(my_item)
+        other_vendor.add(my_item)
+
+        other_vendor.remove(their_item)
+        self.add(their_item)
+
+
+        return True
+
+
+    #removes first item from this Vendor's inventory
+    # adds the other Vendor's first item
+    # removes first item from other Vendor's inventory
+    # adds this Vendor's first item
+    def swap_first_item(self, other_vendor):
+        if len(self.inventory) == 0 or len(other_vendor.inventory) == 0:
+            return False
+
+        self.swap_items(other_vendor, self.inventory[0], other_vendor.inventory[0])
+
+        return True
+
+
+    #gets the item with the best condition in a certain category
+    def get_best_by_category(self, category):
+
+        category_inventory = self.get_by_category(category)
+
+        if len(category_inventory) == 0:
+            return None
+
+        highest_rated = category_inventory[0]
+
+        for item in category_inventory:
+
+            if (item.condition) > (highest_rated.condition):
+                highest_rated = item
+
+        return highest_rated
+
+
+    #swap the best item of certain categories with another Vendor 
+    def swap_best_by_category(self, other, my_priority, their_priority):
+
+        #find best item in my inventory that matches their_priority
+        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
+
+
+
+    def swap_by_newest(self, other):
+        my_newest = self.inventory[0]
+        for item in self.inventory:
+            if not item.age is None:
+                my_newest = item
+                break
+        if my_newest.age is None:
+            return False
+
+        for item in self.inventory:
+            if not item.age is None:
+                if item.age < my_newest.age:
+                    my_newest = item
+
+        their_newest = other.inventory[0]
+        for item in other.inventory:
+            if not item.age is None:
+                their_newest = item
+                break
+        if their_newest.age is None:
+            return False
+
+        for item in other.inventory:
+            if not item.age is None:
+                if item.age < their_newest.age:
+                    their_newest = item
+
+        self.swap_items(other, my_newest, their_newest)
+        return True
+
+
+
+
+
+
+

tests/integration_tests/test_wave_01_02_03.py

@@ -2,11 +2,13 @@
 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  
     vendor = Vendor()
+
+
     assert len(vendor.inventory) == 0
 
     # add an item
@@ -49,6 +51,4 @@ def test_integration_wave_01_02_03():
     assert len(vendor.inventory) == 1
     assert len(other_vendor.inventory) == 1
     assert item2 in other_vendor.inventory
-    assert item3 in vendor.inventory
-
-
+    assert item3 in vendor.inventory

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,16 +40,18 @@ 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(
         inventory=["a", "b", "c"]
     )
 
     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,10 @@ 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 item_a not in items
+    assert item_b not in items
+    assert item_c not in items