Ruby - Ruth M

swap_meet/clothing.py

@@ -1,2 +1,15 @@
-class Clothing:
-    pass
+
+from swap_meet.item import Item
+
+class Clothing(Item):
+    def __init__(self,id = None, fabric = "Unknown", condition = 0):
+        super().__init__(id, condition)
+        self.fabric = fabric
+
+
+
+    def get_category(self):
+        return (self.__class__.__name__)
+
+    def __str__(self):
+        return( f'An object of type {self.get_category()} with id {self.id}. It is made from {self.fabric} fabric.')

swap_meet/decor.py

@@ -1,2 +1,13 @@
-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, condition)
+        self.width = width
+        self.length = length
+
+    def __str__(self):
+        return f'An object of type {self.get_category()} with id {self.id}. 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):
+        super().__init__(id,condition)
+        self.type = type
+
+
+    def __str__(self):
+        return f'{super().__str__()} This is a {self.type} device.'
+

swap_meet/item.py

@@ -1,2 +1,32 @@
+import uuid
+
+
 class Item:
-    pass
+
+    def __init__(self, id = None, condition = 0):
+        if not id:
+            id = int(uuid.uuid4())
+        self.id = id
+        self.condition = condition
+
+    def condition_description(self):
+        if self.condition == 0:
+            return 'this is Garbage!'
+        elif 1 <= self.condition < 2:
+            return 'ITS A SCAM'
+        elif 2 <= self.condition < 3:
+            return "not bad! It's your money though"
+        elif 3 <= self.condition <= 5:
+            return "OMG GET IT!"
+
+
+
+    def get_category(self):
+        return (self.__class__.__name__)
+
+
+    def __str__(self):
+        return f'An object of type {self.get_category()} with id {self.id}.'
+
+
+

swap_meet/vendor.py

@@ -1,2 +1,83 @@
+
 class Vendor:
-    pass
+
+    def __init__(self, inventory=None):
+        if not inventory:
+            inventory = []
+        self.inventory  = inventory
+
+    def add(self,item):
+        self.inventory.append(item)
+        return item
+
+    def remove(self,item):
+        if item in self.inventory:
+            self.inventory.remove(item)
+            return item
+        return False
+
+
+    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 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)
+
+        #if vendor inventory doesnt contain my item return false
+        # if vendor doesnt contain their_item return false
+        return True
+
+    def swap_first_item(self,other_vendor):
+
+        if not self.inventory or not other_vendor.inventory:
+            return False
+
+        other_vendor.add(self.inventory[0])
+
+        self.add(other_vendor.inventory[0])
+
+        self.remove(self.inventory[0])
+
+        other_vendor.remove(other_vendor.inventory[0])
+
+        return True
+
+    def get_by_category(self,category):
+
+        self.category = category
+
+        objects = []
+
+        for stuff in self.inventory:
+            if stuff.get_category() == category:
+                objects.append(stuff)
+
+        return objects
+
+    # def get_best_by_category(self, category_condition):
+
+        self.category_condition = category_condition
+
+        best_condition = 0
+
+        for stuff in self.inventory(category_condition):
+            if stuff.condition_description() < best_condition:
+                best_condition = category_condition
+                return
+
+            return 
+
+
+
+

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/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,6 @@ 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 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,5 @@ 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 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()