Sphinx Class_Astry & Rong

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):
+        super().__init__(id=id, condition=condition)
+        self.fabric = fabric
+
+    def __str__(self):
+        return f"An object of type Clothing with id {self.id}. It is made from {self.fabric} fabric."
+

swap_meet/decor.py

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

swap_meet/electronics.py

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

swap_meet/item.py

@@ -1,2 +1,35 @@
+import uuid
+
 class Item:
-    pass
+    def __init__(self,id=None, condition=0, age=0):
+        self.id = id if id is not None else uuid.uuid4().int
+        self.condition = condition
+        self.age = age
+
+    def get_category(self):
+        return self.__class__.__name__ 
+        # The method get_category() defined in the parent class already works correctly for child classes 
+        # because self.__class__.__name__ reflects the class of the instance, not the class where the method is defined.
+        # Python dynamically resolves self.__class__.__name__ at runtime, 
+        # so it always returns the correct class name for the current instance, regardless of where the method is defined.
+
+
+    def __str__(self):
+        return f"An object of type Item with id {self.id}."
+
+    def condition_description(self):
+        if self.condition == 0:
+            return "Broken"
+        elif self.condition == 1:
+            return "Poor"
+        elif self.condition == 2:
+            return "Fair"
+        elif self.condition == 3:
+            return "Good"
+        elif self.condition == 4:
+            return "Like New"
+        elif self.condition == 5:
+            return "New, In Box"
+
+
+

swap_meet/vendor.py

@@ -1,2 +1,117 @@
 class Vendor:
-    pass
+    def __init__(self, inventory=None,):
+        inventory = [] if inventory is None else inventory
+        self.inventory = inventory
+
+    def add(self, item):
+        self.inventory.append(item)
+        return item
+
+    def remove(self, item):
+        if item not in self.inventory:
+            return False
+        else:
+            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 my_item in self.inventory and their_item in other_vendor.inventory:
+            self.inventory.remove(my_item)
+            self.inventory.append(their_item)
+            other_vendor.inventory.append(my_item)
+            other_vendor.inventory.remove(their_item)
+            return True
+        else:
+            return False
+
+    def swap_first_item(self, other_vendor):
+        # original way:
+        # if not self.inventory or not other_vendor.inventory:
+        #     return False
+        # else:
+        #     other_vendor.inventory.append(self.inventory[0])
+        #     self.inventory.remove(self.inventory[0])
+        #     self.inventory.append(other_vendor.inventory[0])
+        #     other_vendor.inventory.remove(other_vendor.inventory[0])
+        #     return True
+
+        if not self.inventory or not other_vendor.inventory:
+            return False
+        else:
+            my_first_item = self.inventory[0]
+            their_first_item = other_vendor.inventory[0]
+            self.swap_items(other_vendor, my_first_item, their_first_item)
+            return True
+
+    def get_by_category(self, category):
+        category_list = []
+
+        for item in self.inventory:
+            if category == item.get_category(): 
+                category_list.append(item)
+
+        return category_list
+
+    def get_best_by_category(self, category):
+        best_item = self.inventory[0]
+
+        for item in self.inventory:
+            if category == item.get_category() and item.condition > best_item.condition:
+                best_item = item
+
+        if best_item.get_category() == category:
+            return best_item
+        else:
+            return None
+
+
+    def swap_best_by_category(self, other_vendor, my_priority, their_priority):
+        if not other_vendor.inventory or not self.inventory:
+            return False
+
+        my_item_to_swap = self.get_best_by_category(their_priority)
+        their_item_to_swap = other_vendor.get_best_by_category(my_priority)
+
+        if my_item_to_swap and their_item_to_swap:
+            self.swap_items(other_vendor, my_item_to_swap, their_item_to_swap)
+            return True
+        elif not my_item_to_swap or not their_item_to_swap:
+            return False
+
+    # Optional 
+    # get the newest item and then swap the item
+    # situation haven't consider:
+    # 1. if there're more thean one item with same age? 
+    # 2. if my inventory or their inventory is empty
+
+    def get_newest_item(self):
+        newest_item = self.inventory[0]
+
+        for item in self.inventory:
+            if item.age < newest_item.age:
+                newest_item = item
+
+        return newest_item 
+
+    def swap_by_newest(self, other_vendor):
+        my_newest_item = self.get_newest_item()
+        their_newest_item = other_vendor.get_newest_item()
+
+        return self.swap_items(other_vendor, my_newest_item, their_newest_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_swap_by_newest.py

@@ -0,0 +1,30 @@
+import pytest
+from swap_meet.item import Item
+from swap_meet.vendor import Vendor
+
+def test_swap_by_newest():
+    item_a = Item(age=2)
+    item_b = Item(age=4)
+    item_c = Item(age=3)
+    fatimah = Vendor(
+        inventory=[item_a, item_b, item_c]
+    )
+
+    item_d = Item(age=1)
+    item_e = Item(age=4)
+    jolie = Vendor(
+        inventory=[item_d, item_e]
+    )
+
+    result = fatimah.swap_by_newest(jolie)
+
+    assert len(fatimah.inventory) == 3
+    assert item_b in fatimah.inventory
+    assert item_a not in fatimah.inventory
+    assert item_c in fatimah.inventory
+    assert item_d in fatimah.inventory
+    assert len(jolie.inventory) == 2
+    assert item_d not in jolie.inventory
+    assert item_e in jolie.inventory
+    assert item_a in jolie.inventory
+    assert result

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,4 @@ 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 result == False

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()