Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions linode_api4/objects/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,15 @@ def dict(self):
result[k] = v.dict
elif isinstance(v, list):
result[k] = [
item.dict if isinstance(item, cls) else item for item in v
(
item.dict
if isinstance(item, cls)
else item._raw_json if isinstance(item, Base) else item
)
for item in v
]

elif isinstance(v, Base):
result[k] = v._raw_json
return result


Expand Down
3 changes: 3 additions & 0 deletions test/fixtures/testmappedobj1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"bar": "bar"
}
29 changes: 26 additions & 3 deletions test/unit/objects/mapped_object_test.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from unittest import TestCase
from test.unit.base import ClientBaseCase

from linode_api4 import MappedObject
from linode_api4.objects import Base, MappedObject, Property


class MappedObjectCase(TestCase):
class MappedObjectCase(ClientBaseCase):
def test_mapped_object_dict(self):
test_dict = {
"key1": 1,
Expand All @@ -19,3 +19,26 @@ def test_mapped_object_dict(self):

mapped_obj = MappedObject(**test_dict)
self.assertEqual(mapped_obj.dict, test_dict)

def test_mapped_object_dict(self):
test_property_name = "bar"
test_property_value = "bar"

class Foo(Base):
api_endpoint = "/testmappedobj1"
id_attribute = test_property_name
properties = {
test_property_name: Property(mutable=True),
}

foo = Foo(self.client, test_property_value)
foo._api_get()

expected_dict = {
"foo": {
test_property_name: test_property_value,
}
}

mapped_obj = MappedObject(foo=foo)
self.assertEqual(mapped_obj.dict, expected_dict)