C22 - Lorraine Shi and Charday Neal

swap_meet/clothing.py

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

swap_meet/decor.py

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

swap_meet/electronics.py

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

swap_meet/item.py

@@ -1,2 +1,25 @@
+from uuid import uuid4
+
 class Item:
-    pass
+    def __init__(self, id=None,condition=0,age=0):
+        self.id = uuid4().int if id is None else id
+        self.condition = condition
+        self.age = age
+
+    def get_category(self):
+        return self.__class__.__name__
+
+    def __str__(self):
+        return f"An object of type {self.get_category()} with id {self.id}."
+
+    def condition_description(self):
+        condition = self.condition
+        match condition:
+            case condition if 0.0 <= condition < 2.0:
+                return 'This is poor condition'
+            case condition if 2.0 <= condition < 4.0:
+                return 'It is gently used.'
+            case condition if 4.0 < condition:
+                return 'Fantastic condition'
+            case _:
+                return "Hmm...something's not right."

swap_meet/vendor.py

@@ -1,2 +1,73 @@
 class Vendor:
-    pass
+    def __init__(self, inventory=None):
+        self.inventory = [] if inventory is None else inventory
+
+    def add(self, item):
+        self.inventory.append(item)
+        return item
+
+    def remove(self, item):
+        if item not in self.inventory:
+            return False
+        self.inventory.remove(item)
+        return item
+
+    def get_by_id(self, id):
+        for item in self.inventory:
+            if item.id == id:
+                return item     
+        return None
+
+    def swap_items(self, other_vendor, my_item, their_item):
+        if self.get_by_id(my_item.id) and other_vendor.get_by_id(their_item.id):
+            self.remove(my_item)
+            self.add(their_item)
+            other_vendor.remove(their_item)
+            other_vendor.add(my_item)
+            return True
+
+        return False
+
+    def swap_first_item(self, other_vendor):
+        if not self.inventory or not other_vendor.inventory:
+            return False
+
+        my_first_item = self.inventory[0]
+        other_first_item = other_vendor.inventory[0]
+        self.swap_items(other_vendor, my_first_item, other_first_item)
+        return True
+
+    def get_by_category(self, category):
+        return [item for item in self.inventory if item.get_category() == category]
+
+    def get_best_by_category(self, category):
+        category_items = self.get_by_category(category)
+        if not category_items:
+            return None
+
+        best_condition_item = category_items[0]
+        best_condition = category_items[0].condition
+
+        for item in category_items:
+            if item.condition > best_condition:
+                best_condition = item.condition
+                best_condition_item = item
+
+        return best_condition_item
+        # return max(category_items, key=lambda item : item.condition)
+
+    def swap_best_by_category(self, other_vendor, my_priority, their_priority):
+        my_swap_item = self.get_best_by_category(their_priority)
+        their_swap_item = other_vendor.get_best_by_category(my_priority)
+
+        if not my_swap_item or not their_swap_item:
+            return False
+        return self.swap_items(other_vendor, my_swap_item, their_swap_item)
+
+    def get_newest(self):
+        return min(self.inventory, key=lambda item:item.age)
+
+    def swap_by_newest(self, other_vendor):
+        my_swap_item = self.get_newest()
+        their_swap_item = other_vendor.get_newest()
+        return self.swap_items(other_vendor, my_swap_item, their_swap_item)

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,8 @@ 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 **********
-    # *********************************************************************
+    assert "a" in vendor.inventory
+    assert "b" in vendor.inventory
+    assert "c" in vendor.inventory
+    assert item not in vendor.inventory
+    assert not result

tests/unit_tests/test_wave_02.py

@@ -2,30 +2,30 @@
 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)
@@ -36,7 +36,7 @@ def test_get_item_by_id():
     result_item = vendor.get_by_id(test_id)
     assert result_item is item_custom_id
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_get_item_by_id_no_matching():
     test_id = 12345
     item_a = Item()

tests/unit_tests/test_wave_03.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_item_overrides_to_string():
     test_id = 12345
     item = Item(id=test_id)
@@ -12,7 +12,7 @@ def test_item_overrides_to_string():
     expected_result = f"An object of type Item with id {test_id}."
     assert item_as_string == expected_result
 
-@pytest.mark.skip
+# @pytest.mark.skip
 def test_swap_items_returns_true():
     item_a = Item()
     item_b = Item()
@@ -40,7 +40,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()
     item_b = Item()
@@ -67,7 +67,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()
     item_b = Item()
@@ -94,7 +94,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=[]
@@ -114,7 +114,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()
     item_b = Item()
@@ -131,7 +131,10 @@ def test_swap_items_from_their_empty_returns_false():
 
     result = fatimah.swap_items(jolie, item_b, nobodys_item)
 
-    raise Exception("Complete this test according to comments below.")
-    # *********************************************************************
-    # ****** Complete Assert Portion of this test **********
-    # *********************************************************************
+    assert len(fatimah.inventory) == 3
+    assert len(jolie.inventory) == 0
+
+    assert fatimah.inventory == [item_a, item_b, item_c]
+    assert jolie.inventory == []
+
+    assert not result

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()
     item_b = Item()
@@ -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()
     item_b = Item()