Ada AC2 - Supriya Chavan

swap_meet/clothing.py

@@ -1,2 +1,11 @@
-class Clothing:
-    pass
+# Wave 5
+import uuid
+from swap_meet.item import Item
+class Clothing(Item):
+    def __init__(self, id = None, category = "", condition = 0, fabric = "Unknown"):
+        super().__init__(id, category, condition)
+        self.fabric = fabric
+
+    def __str__(self):
+        item_message = super().__str__()
+        return f"{item_message}. It is made from {self.fabric} fabric."

swap_meet/decor.py

@@ -1,2 +1,12 @@
-class Decor:
-    pass
+# Wave 5
+import uuid
+from swap_meet.item import Item
+class Decor(Item):
+    def __init__(self, id = None, category = "", condition = 0, width = 0, length = 0):
+        super().__init__(id, category, condition)
+        self.width = width
+        self.length = length
+
+    def __str__(self):
+        item_message = super().__str__()
+        return f"{item_message}. It takes up a {self.width} by {self.length} sized space."

swap_meet/electronics.py

@@ -1,2 +1,12 @@
-class Electronics:
-    pass
+# Wave 5
+import uuid
+from swap_meet.item import Item
+class Electronics(Item):
+    def __init__(self, id = None, category = "", condition = 0, type = "Unknown"):
+        super().__init__(id, category, condition)
+        self.type = type
+
+    def __str__(self):
+        item_message = super().__str__()
+        return f"{item_message}. This is a {self.type} device."
+

swap_meet/item.py

@@ -1,2 +1,28 @@
+#Wave 2 , 5
+from math import floor
+import uuid
+#from swap_meet.vendor import Vendor
 class Item:
-    pass
+    def __init__(self, id = None, category = "", condition = 0):
+
+        if id is not None and not isinstance(id,int):
+            raise ValueError("ID must be an integer")
+        self.id = id if id else uuid.uuid4().int
+        self.condition = condition 
+        self.category = category
+
+    def get_category(self):
+        return self.__class__.__name__#type(self).__name__ I would like to know which is best practice in these two
+
+
+# Wave 3
+    def __str__(self):
+        return f"An object of type {self.get_category()} with id {self.id}"
+
+# Wave 5
+    def condition_description(self):
+        description_of_condition = ["Mint","Heavily Used","Like New","Gently Used","Best Used","New"]
+
+        return description_of_condition[round(self.condition)]
+
+

swap_meet/vendor.py

@@ -1,2 +1,121 @@
+#Wave 1
+
 class Vendor:
-    pass
+    def __init__(self, inventory = None):
+        if inventory is not None:
+            self.inventory = inventory
+        else:
+            self.inventory = []
+
+    def add(self, new_item):
+        self.inventory.append(new_item)
+        return new_item
+
+    def remove(self, item_to_remove):
+        if item_to_remove in self.inventory:
+            self.inventory.remove(item_to_remove)
+            return item_to_remove        
+        return None
+
+    def get_by_id(self, id):
+        if id is None:
+            return None
+        for item in self.inventory:
+            if item.id == id:
+                return item
+        return None
+
+# Wave 3
+    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
+
+# Wave 4
+    def swap_first_item(self, other_vendor):
+        if not self.inventory or not other_vendor.inventory:
+            return False
+        self.swap_items(other_vendor,self.inventory[0],other_vendor.inventory[0])
+        return True
+
+# Wave 6
+    def get_by_category(self, category):
+        if not self.inventory:
+            return []
+        list_items_by_category = []
+
+        for item in self.inventory:
+            if item.get_category() == category:
+                list_items_by_category.append(item)
+        return list_items_by_category
+
+    def get_best_by_category(self, category):
+        list_of_items_in_category = self.get_by_category(category)
+        if not list_of_items_in_category:
+            return None
+        best_item = max(list_of_items_in_category,key = lambda item: item.condition) 
+        return best_item
+
+    def swap_best_by_category(self, other_vendor, my_priority, their_priority):    
+        best_item_from_my_inventory = self.get_best_by_category(their_priority)
+        best_item_from_their_inventory = other_vendor.get_best_by_category(my_priority)
+        if not best_item_from_my_inventory or not best_item_from_their_inventory:
+            return False
+        self.swap_items(other_vendor,best_item_from_my_inventory,best_item_from_their_inventory)
+        return True
+
+#Wave 7 
+    def display_inventory(self, category = ""):
+        if self.inventory == []: 
+            print("No inventory to display.")
+            return 
+        display_items = self.get_by_category(category) if category else self.inventory
+
+        if not display_items:
+            print("No inventory to display.") 
+            return 
+        else:
+            for index, item in enumerate(display_items, start=1): 
+                print(f"{index}. {item}")
+            return
+
+    def swap_by_id(self, other_vendor, my_item_id = None, their_item_id = None):
+        my_item = self.get_by_id(my_item_id)
+        vendor_item = other_vendor.get_by_id(their_item_id)
+        if not my_item or not vendor_item:
+            return False
+        result = self.swap_items(other_vendor, my_item, vendor_item)
+        return result
+
+    def choose_and_swap_items(self, other_vendor, category = ""):
+        if not category:
+            self.display_inventory()
+            other_vendor.display_inventory()
+        else:
+            self.display_inventory(category)
+            other_vendor.display_inventory(category)
+        my_item_id = int(input("Enter Id of the item you want to swap"))
+        vendor_item_id = int(input("Enter Id of your friend vendor's item you want to swap with"))
+        if not self.get_by_id(my_item_id) or not other_vendor.get_by_id(vendor_item_id):
+            return False
+        self.swap_by_id(other_vendor,my_item_id,vendor_item_id)
+        return True
+'''
+            for index in range(len(display_items)):
+                print(f"{index +1}. {display_items[index]}")
+                return 
+
+        if category:
+            inventory_items_by_category = self.get_by_category(category)
+            if inventory_items_by_category:
+                for index in range(len(inventory_items_by_category)):
+                    print(f"{index +1}. {inventory_items_by_category[index]}")
+            else:
+                print("No inventory to display.")
+        else:
+            for index in range(len(self.inventory)):
+                    print(f"{index +1}. {self.inventory[index]}")'''

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_07.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(capfd):
     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,23 @@ 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_returns_none():
     item = "item to remove"
     vendor = Vendor(
         inventory=["a", "b", "c"]
     )
 
     result = vendor.remove(item)
-
-    raise Exception("Complete this test according to comments below.")
+    #assert 
+    assert result == None
+    assert item not in vendor.inventory
+    assert len(vendor.inventory) == 3
+    assert "a" in vendor.inventory
+    assert "b" in vendor.inventory
+    assert "c" in vendor.inventory
+
+    #raise Exception("Complete this test according to comments below.")
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************

tests/unit_tests/test_wave_02.py

@@ -2,30 +2,31 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_items_have_default_uuid_length_id():
     item = Item()
     assert isinstance(item.id, int)
     assert len(str(item.id)) >= 32
 
-@pytest.mark.skip
+
+#@pytest.mark.skip
 def test_item_instances_have_different_default_ids():
     item_a = Item()
     item_b = Item()
     assert item_a.id != item_b.id
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_items_use_custom_id_if_passed():
     item = Item(id=12345)
     assert isinstance(item.id, int)
     assert item.id == 12345
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_item_obj_returns_text_item_for_category():
     item = Item()
     assert item.get_category() == "Item"
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_get_item_by_id():
     test_id = 12345
     item_custom_id = Item(id=test_id)
@@ -35,8 +36,21 @@ def test_get_item_by_id():
 
     result_item = vendor.get_by_id(test_id)
     assert result_item is item_custom_id
+######### New Test for Code coverage
+#@pytest.mark.skip
+def test_get_by_id_for_none_id():
+    #Arrange
+
+    item_with_no_id = Item()
+    vendor = Vendor(
+        inventory=[Item(),Item(),item_with_no_id]
+    )
+    result_item = vendor.get_by_id(None)
+    #Assert 
+    assert result_item == None
+
 
-@pytest.mark.skip
+#@pytest.mark.skip
 def test_get_item_by_id_no_matching():
     test_id = 12345
     item_a = Item()
@@ -47,6 +61,7 @@ def test_get_item_by_id_no_matching():
     )
 
     result_item = vendor.get_by_id(test_id)
+
     assert result_item is None
 
     items = vendor.inventory