C17 Otters Vera Sazonova

swap_meet/clothing.py

@@ -1,2 +1,9 @@
-class Clothing:
-    pass
+from .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,9 @@
-class Decor:
-    pass
+from .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,9 @@
-class Electronics:
-    pass
+from .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,38 @@
 class Item:
-    pass
+    def __init__(self, category = None, condition = 0.0):
+        if category is None:
+            category = ""
+        self.category = category
+        self.condition = condition    
+
+
+    def __repr__(self):
+        '''Return name of category in the 
+        terminal, when instance is assign'''
+
+        return self.category
+
+
+    def __str__(self):
+        '''Return string "Hello World!" if
+        category is not defined'''
+
+        return "Hello World!"
+
+
+    def condition_description(self):
+        '''Method assigning specific 
+        string-output depends of condition'''
+
+        if 0 < self.condition <= 1:
+            condition_description = "Poor"
+        elif 1 < self.condition <= 2:
+            condition_description = "Fair"
+        elif 2 < self.condition <= 3:
+            condition_description = "Good"
+        elif 3 < self.condition <= 4:
+            condition_description = "Like New"
+        elif 4 < self.condition <= 5:
+            condition_description = "New"
+        return condition_description
+

swap_meet/vendor.py

@@ -1,2 +1,95 @@
-class Vendor:
-    pass
+class Vendor():
+    def __init__(self,inventory = None):
+        if inventory is None:
+            inventory = []
+        self.inventory = inventory
+
+
+    def add(self,item):
+        '''Instance method add, which 
+        add itens in the inventory list'''
+
+        self.inventory.append(item)
+        return item
+
+
+    def remove(self,item):
+        '''Instance method remove which 
+        remove item from inventory list'''
+
+        if item in self.inventory:
+            self.inventory.remove(item)
+            return item
+        return False
+
+
+    def get_by_category(self,category):
+        '''Instance method which return 
+        a list of items in the inventory 
+        with that category'''
+
+        list_of_items = []
+        for item in self.inventory:
+            if category == item.category:
+                list_of_items.append(item)
+        return list_of_items
+
+
+    def swap_items(self, friend, my_item, friends_item):
+        '''Instance method implement swaping process between vendor and 
+        other person'''
+
+        if my_item not in self.inventory or friends_item not in friend.inventory:
+            return False
+        self.remove(my_item)
+        friend.add(my_item)
+        friend.remove(friends_item)
+        self.add(friends_item)
+        return True
+
+
+    def swap_first_item(self, friend):
+        '''Instance method implement swaping process first item'''
+
+        if len(self.inventory) == 0 or len(friend.inventory) == 0:
+            return False
+        self.swap_items(friend,self.inventory[0],friend.inventory[0])
+        return True
+
+
+    def get_best_by_category(self, consider_category):
+        '''Instance method will get the item with the best 
+        condition in a certain category'''
+
+        best_dict_category = {}
+        best_dict_category[consider_category] = 0.0
+        # creating counter to check no matches categories in vendors inventory
+        count = 0
+        # consider given represents string of category, add to dictionary 
+        # matching category is key and value is rate. Setup first element
+        # of dictionary like max and matching other rate, if higher add to dict 
+        for category_from_inv in self.inventory:
+            if consider_category == category_from_inv.category:
+                count += 1
+                if category_from_inv.condition > best_dict_category[consider_category]:
+                    best_dict_category[category_from_inv.category] = category_from_inv.condition
+                    best_category = category_from_inv
+            if count == 0:
+                return None
+        return best_category
+
+
+    def swap_best_by_category(self, other, my_priority, their_priority):
+        '''Instance method will swap the item with the best condition 
+        in a certain category'''
+
+        if len(self.inventory) and len(other.inventory) != 0:
+            best_item_for_friend = self.get_best_by_category(their_priority)
+            best_item_for_vendor = other.get_best_by_category(my_priority)
+            if best_item_for_friend is None or best_item_for_vendor is None:
+                return False
+            else:
+                self.swap_items(other,best_item_for_friend,best_item_for_vendor)
+                return True
+        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()

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,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,10 @@ 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 len(vendor.inventory) == 3
+    assert item not in vendor.inventory
+    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.")
+    # raise Exception("Complete this test according to comments below.")
+    assert len(items) == 0
+    assert items == []
+    assert item_a not in items
+    assert item_c not in items
+    assert item_b not in items
     # *********************************************************************
     # ****** 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")