C19 Sapphire - Linh Huynh

swap_meet/clothing.py

@@ -1,2 +1,14 @@
-class Clothing:
-    pass
+from .item import Item
+
+class Clothing(Item):
+    def __init__(self, id = None, fabric = "Unknown", condition = 0):
+        super().__init__(id, condition)
+        self.fabric = fabric
+
+    # Initially wrote get_category instance method to return "Clothing". However, the code would be cleaner
+    # if I removed this instance method altogether, referenced the __str__ method instance in the Item class,
+    # and edited the return string in __str__ to remove any redundancy.
+
+    def __str__(self):
+        return f"{super().__str__()} It is made from {self.fabric} fabric."
+

swap_meet/decor.py

@@ -1,2 +1,14 @@
-class Decor:
-    pass
+from .item import Item
+
+class Decor(Item):
+    def __init__(self, id = None, width = 0, length = 0, condition = 0):
+        super().__init__(id, condition)
+        self.width = width
+        self.length = length
+
+    # Initially wrote get_category instance method to return "Decor". However, the code would be cleaner
+    # if I removed this instance method altogether, referenced the __str__ method instance in the Item class,
+    # and edited the return string in __str__ to remove any redundancy.
+
+    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,14 @@
-class Electronics:
-    pass
+from .item import Item
+
+class Electronics(Item):
+    def __init__(self, id = None, type = "Unknown", condition = 0):
+        super().__init__(id, condition)
+        self.type = type
+
+    # Initially wrote get_category instance method to return "Electronics". However, the code would be cleaner
+    # if I removed this instance method altogether, referenced the __str__ method instance in the Item class,
+    # and edited the return string in __str__ to remove any redundancy.
+
+    def __str__(self):
+        return f"{super().__str__()} This is a {self.type} device."
+

swap_meet/item.py

@@ -1,2 +1,23 @@
+import uuid
+
 class Item:
-    pass
+    def __init__(self, id = None, condition = 0):
+        self.id = int(uuid.uuid4()) if id is None else id
+        self.condition = condition
+
+    def get_category(self):
+        return type(self).__name__
+
+    def __str__(self):
+        return f"An object of type {self.get_category()} with id {self.id}."
+
+    def condition_description(self):
+        condition_rating = {
+            0: "Terrible: Unusable, broken, contaminated, or carries the possessed spirit of its previous owner. One might question why this was even considered sellable.",
+            1: "Poor: High likelihood of abnormalities, defects, or irremovable stains you probably don't want to know about. Probably best to scavenge for parts.",
+            2: "As-Is: Acceptable but of course, that's subjective. Consider at your own discretion.",
+            3: "Good: Functional or wearable. What more could you ask for a discounted price?",
+            4: "Gently worn: Practically like new. It's basically a steal. At least it's not cursed.",
+            5: "New: Pretty much in pristine condition with the added bonus of preventing existential crises and attracting good luck."
+        }
+        return condition_rating[self.condition]

swap_meet/vendor.py

@@ -1,2 +1,60 @@
+#from .item import Item
+
 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
+        else:
+            self.inventory.remove(item)
+        return item
+
+
+    def get_by_id(self, id):
+        for item in self.inventory:
+            if id == item.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.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):
+        try:
+            return self.swap_items(other_vendor, self.inventory[0], other_vendor.inventory[0])
+        except IndexError:
+            return False
+
+
+    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_selection = self.get_by_category(category)
+        try:
+            return max(category_selection, key=lambda item: item.condition)
+        except ValueError:
+            return None
+
+
+    def swap_best_by_category(self, other_vendor, my_priority, their_priority):
+        my_best_item = self.get_best_by_category(their_priority)
+        their_best_item = other_vendor.get_best_by_category(my_priority)
+        return self.swap_items(other_vendor, my_best_item, their_best_item)

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
+
+
 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
+
+
 def test_integration_wave_04_05_06():
     camila = Vendor()
     valentina = Vendor()

tests/unit_tests/test_wave_01.py

@@ -2,12 +2,10 @@
 import pytest
 from swap_meet.vendor import Vendor
 
-@pytest.mark.skip
 def test_vendor_has_inventory():
     vendor = Vendor()
     assert len(vendor.inventory) == 0
 
-@pytest.mark.skip
 def test_vendor_takes_optional_inventory():
     inventory = ["a", "b", "c"]
     vendor = Vendor(inventory=inventory)
@@ -16,7 +14,6 @@ def test_vendor_takes_optional_inventory():
     assert "b" in vendor.inventory
     assert "c" in vendor.inventory
 
-@pytest.mark.skip
 def test_adding_to_inventory():
     vendor = Vendor()
     item = "new item"
@@ -27,7 +24,6 @@ def test_adding_to_inventory():
     assert item in vendor.inventory
     assert result == item
 
-@pytest.mark.skip
 def test_removing_from_inventory_returns_item():
     item = "item to remove"
     vendor = Vendor(
@@ -40,7 +36,6 @@ def test_removing_from_inventory_returns_item():
     assert item not in vendor.inventory
     assert result == item
 
-@pytest.mark.skip
 def test_removing_not_found_is_false():
     item = "item to remove"
     vendor = Vendor(
@@ -49,7 +44,8 @@ def test_removing_not_found_is_false():
 
     result = vendor.remove(item)
 
-    raise Exception("Complete this test according to comments below.")
+    assert result == False
+
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************

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
+
 def test_items_have_default_uuid_length_id():
     item = Item()
     assert isinstance(item.id, int)
     assert len(str(item.id)) >= 32
 
-@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
+
 def test_items_use_custom_id_if_passed():
     item = Item(id=12345)
     assert isinstance(item.id, int)
     assert item.id == 12345
 
-@pytest.mark.skip
+
 def test_item_obj_returns_text_item_for_category():
     item = Item()
     assert item.get_category() == "Item"
 
-@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
+
 def test_get_item_by_id_no_matching():
     test_id = 12345
     item_a = Item()

tests/unit_tests/test_wave_03.py

@@ -2,7 +2,6 @@
 from swap_meet.vendor import Vendor
 from swap_meet.item import Item
 
-@pytest.mark.skip
 def test_item_overrides_to_string():
     test_id = 12345
     item = Item(id=test_id)
@@ -12,7 +11,6 @@ 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
 def test_swap_items_returns_true():
     item_a = Item()
     item_b = Item()
@@ -40,7 +38,6 @@ def test_swap_items_returns_true():
     assert item_b in jolie.inventory
     assert result
 
-@pytest.mark.skip
 def test_swap_items_when_my_item_is_missing_returns_false():
     item_a = Item()
     item_b = Item()
@@ -67,7 +64,6 @@ def test_swap_items_when_my_item_is_missing_returns_false():
     assert item_e in jolie.inventory
     assert not result
 
-@pytest.mark.skip
 def test_swap_items_when_their_item_is_missing_returns_false():
     item_a = Item()
     item_b = Item()
@@ -94,7 +90,6 @@ def test_swap_items_when_their_item_is_missing_returns_false():
     assert item_e in jolie.inventory
     assert not result
 
-@pytest.mark.skip
 def test_swap_items_from_my_empty_returns_false():
     fatimah = Vendor(
         inventory=[]
@@ -114,7 +109,6 @@ def test_swap_items_from_my_empty_returns_false():
     assert len(jolie.inventory) == 2
     assert not result
 
-@pytest.mark.skip
 def test_swap_items_from_their_empty_returns_false():
     item_a = Item()
     item_b = Item()
@@ -131,7 +125,8 @@ 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.")
+    assert result == False
+
     # *********************************************************************
     # ****** Complete Assert Portion of this test **********
     # *********************************************************************

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
+
 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
+
 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
+
 def test_swap_first_item_from_their_empty_returns_false():
     item_a = Item()
     item_b = Item()