Replaced get_item_by_id with get_item_by_mpn

Author: JaviCerveraIngram

connect/models/asset.py

@@ -16,10 +16,16 @@
 
 class Asset(BaseModel):
     def get_param_by_id(self, identity):
-        return self._get_by_id(self.params, identity)
-
-    def get_item_by_id(self, identity):
-        return self._get_by_id(self.items, identity)
+        try:
+            return list(filter(lambda param: param.id == identity, self.params))[0]
+        except IndexError:
+            return None
+
+    def get_item_by_mpn(self, mpn):
+        try:
+            return list(filter(lambda item: item.mpn == mpn, self.items))[0]
+        except IndexError:
+            return None
 
 
 class AssetSchema(BaseSchema):

connect/models/base.py

@@ -15,13 +15,6 @@ def __init__(self, *args, **kwargs):
             for attr, val in kwargs.items():
                 setattr(self, attr, val)
 
-    @staticmethod
-    def _get_by_id(objects, identity):
-        try:
-            return list(filter(lambda obj: obj.id == identity, objects))[0]
-        except IndexError:
-            return None
-
 
 class BaseSchema(Schema):
     id = fields.Str()

tests/test_models.py

@@ -128,6 +128,6 @@ def test_asset_methods():
     assert not asset.get_param_by_id('invalid-id')
 
     # Get item by id
-    assert isinstance(asset.get_item_by_id('TEAM_ST3L2T1Y'), Item)
-    assert asset.get_item_by_id('TEAM_ST3L2T1Y').id == 'TEAM_ST3L2T1Y'
-    assert not asset.get_item_by_id('invalid-id')
+    assert isinstance(asset.get_item_by_mpn('TEAM-ST3L2T1Y'), Item)
+    assert asset.get_item_by_mpn('TEAM-ST3L2T1Y').mpn == 'TEAM-ST3L2T1Y'
+    assert not asset.get_item_by_mpn('invalid-mpn')