Skip to content

Commit a218d78

Browse files
augustjohnsonaugustjohnson
authored
Merge pull request open5e#603 from calumbell/bugfix/v2-missing-serializers-on-CreatureSerializer
Bugfix (API V2): Added missing Serializers to `CreatureSerializer`
2 parents c267db2 + 183b6e5 commit a218d78

5 files changed

+624
-62
lines changed

‎api_v2/serializers/creature.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
from .abstracts import GameContentSerializer
1010
from .document import DocumentSerializer
11+
from .language import LanguageSerializer
12+
from .environment import EnvironmentSerializer
1113
from .size import SizeSerializer
1214
from drf_spectacular.utils import extend_schema_field, inline_serializer
1315
from drf_spectacular.types import OpenApiTypes
@@ -63,6 +65,8 @@ class CreatureSerializer(GameContentSerializer):
6365
document = DocumentSerializer()
6466
type = CreatureTypeSerializer()
6567
size = SizeSerializer()
68+
languages = LanguageSerializer(many=True)
69+
environments = EnvironmentSerializer(many=True)
6670

6771
class Meta:
6872
'''Serializer meta options.'''

‎api_v2/tests/responses/TestObjects.test_creature_ancient_example.approved.json‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,52 @@
133133
"darkvision_range": 120.0,
134134
"document": "http://localhost:8000/v2/documents/srd/",
135135
"environments": [
136-
"http://localhost:8000/v2/environments/hills/",
137-
"http://localhost:8000/v2/environments/mountain/"
136+
{
137+
"aquatic": false,
138+
"desc": "[None Provided]",
139+
"document": "http://localhost:8000/v2/documents/open5e-e/",
140+
"interior": false,
141+
"key": "hills",
142+
"name": "Hills",
143+
"planar": false,
144+
"url": "http://localhost:8000/v2/environments/hills/"
145+
},
146+
{
147+
"aquatic": false,
148+
"desc": "[None provided]",
149+
"document": "http://localhost:8000/v2/documents/open5e-e/",
150+
"interior": false,
151+
"key": "mountain",
152+
"name": "Mountain",
153+
"planar": false,
154+
"url": "http://localhost:8000/v2/environments/mountain/"
155+
}
138156
],
139157
"experience_points": 62000,
140158
"hit_dice": "28d20+252",
141159
"hit_points": 546,
142160
"key": "srd_ancient-red-dragon",
143161
"languages": [
144-
"http://localhost:8000/v2/languages/common/",
145-
"http://localhost:8000/v2/languages/draconic/"
162+
{
163+
"desc": "Typical speakers are Humans.",
164+
"document": "http://localhost:8000/v2/documents/srd/",
165+
"is_exotic": false,
166+
"is_secret": false,
167+
"key": "common",
168+
"name": "Common",
169+
"script_language": "http://localhost:8000/v2/languages/common/",
170+
"url": "http://localhost:8000/v2/languages/common/"
171+
},
172+
{
173+
"desc": "Typical speakers include dragons and dragonborn.",
174+
"document": "http://localhost:8000/v2/documents/srd/",
175+
"is_exotic": true,
176+
"is_secret": false,
177+
"key": "draconic",
178+
"name": "Draconic",
179+
"script_language": "http://localhost:8000/v2/languages/draconic/",
180+
"url": "http://localhost:8000/v2/languages/draconic/"
181+
}
146182
],
147183
"modifiers": {
148184
"charisma": 6,

‎api_v2/tests/responses/TestObjects.test_creature_goblin_example.approved.json‎

Lines changed: 150 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,162 @@
4747
"darkvision_range": 60.0,
4848
"document": "http://localhost:8000/v2/documents/srd/",
4949
"environments": [
50-
"http://localhost:8000/v2/environments/arctic/",
51-
"http://localhost:8000/v2/environments/caves/",
52-
"http://localhost:8000/v2/environments/desert/",
53-
"http://localhost:8000/v2/environments/forest/",
54-
"http://localhost:8000/v2/environments/grassland/",
55-
"http://localhost:8000/v2/environments/hills/",
56-
"http://localhost:8000/v2/environments/mountain/",
57-
"http://localhost:8000/v2/environments/ruins/",
58-
"http://localhost:8000/v2/environments/sewer/",
59-
"http://localhost:8000/v2/environments/srd_feywild/",
60-
"http://localhost:8000/v2/environments/swamp/",
61-
"http://localhost:8000/v2/environments/underworld/",
62-
"http://localhost:8000/v2/environments/urban/"
50+
{
51+
"aquatic": false,
52+
"desc": "[None provided]",
53+
"document": "http://localhost:8000/v2/documents/open5e-e/",
54+
"interior": false,
55+
"key": "arctic",
56+
"name": "Arctic or Tundra",
57+
"planar": false,
58+
"url": "http://localhost:8000/v2/environments/arctic/"
59+
},
60+
{
61+
"aquatic": false,
62+
"desc": "Caves and caverns",
63+
"document": "http://localhost:8000/v2/documents/open5e-e/",
64+
"interior": true,
65+
"key": "caves",
66+
"name": "Caves",
67+
"planar": false,
68+
"url": "http://localhost:8000/v2/environments/caves/"
69+
},
70+
{
71+
"aquatic": false,
72+
"desc": "[None provided]",
73+
"document": "http://localhost:8000/v2/documents/open5e-e/",
74+
"interior": false,
75+
"key": "desert",
76+
"name": "Desert",
77+
"planar": false,
78+
"url": "http://localhost:8000/v2/environments/desert/"
79+
},
80+
{
81+
"aquatic": false,
82+
"desc": "[None provided]",
83+
"document": "http://localhost:8000/v2/documents/open5e-e/",
84+
"interior": false,
85+
"key": "forest",
86+
"name": "Forest or Jungle",
87+
"planar": false,
88+
"url": "http://localhost:8000/v2/environments/forest/"
89+
},
90+
{
91+
"aquatic": false,
92+
"desc": "[None provided]",
93+
"document": "http://localhost:8000/v2/documents/open5e-e/",
94+
"interior": false,
95+
"key": "grassland",
96+
"name": "Grassland or Plains",
97+
"planar": false,
98+
"url": "http://localhost:8000/v2/environments/grassland/"
99+
},
100+
{
101+
"aquatic": false,
102+
"desc": "[None Provided]",
103+
"document": "http://localhost:8000/v2/documents/open5e-e/",
104+
"interior": false,
105+
"key": "hills",
106+
"name": "Hills",
107+
"planar": false,
108+
"url": "http://localhost:8000/v2/environments/hills/"
109+
},
110+
{
111+
"aquatic": false,
112+
"desc": "[None provided]",
113+
"document": "http://localhost:8000/v2/documents/open5e-e/",
114+
"interior": false,
115+
"key": "mountain",
116+
"name": "Mountain",
117+
"planar": false,
118+
"url": "http://localhost:8000/v2/environments/mountain/"
119+
},
120+
{
121+
"aquatic": false,
122+
"desc": "[None provided]",
123+
"document": "http://localhost:8000/v2/documents/open5e-e/",
124+
"interior": true,
125+
"key": "ruins",
126+
"name": "Ruins",
127+
"planar": false,
128+
"url": "http://localhost:8000/v2/environments/ruins/"
129+
},
130+
{
131+
"aquatic": false,
132+
"desc": "[None provided]",
133+
"document": "http://localhost:8000/v2/documents/open5e-e/",
134+
"interior": true,
135+
"key": "sewer",
136+
"name": "Sewer",
137+
"planar": false,
138+
"url": "http://localhost:8000/v2/environments/sewer/"
139+
},
140+
{
141+
"aquatic": false,
142+
"desc": "[None provided]",
143+
"document": "http://localhost:8000/v2/documents/open5e-e/",
144+
"interior": false,
145+
"key": "srd_feywild",
146+
"name": "Feywild",
147+
"planar": false,
148+
"url": "http://localhost:8000/v2/environments/srd_feywild/"
149+
},
150+
{
151+
"aquatic": false,
152+
"desc": "[None provided]",
153+
"document": "http://localhost:8000/v2/documents/open5e-e/",
154+
"interior": false,
155+
"key": "swamp",
156+
"name": "Swamp or Marsh",
157+
"planar": false,
158+
"url": "http://localhost:8000/v2/environments/swamp/"
159+
},
160+
{
161+
"aquatic": false,
162+
"desc": "[None Provided]",
163+
"document": "http://localhost:8000/v2/documents/open5e-e/",
164+
"interior": false,
165+
"key": "underworld",
166+
"name": "Underworld",
167+
"planar": false,
168+
"url": "http://localhost:8000/v2/environments/underworld/"
169+
},
170+
{
171+
"aquatic": false,
172+
"desc": "[None provided]",
173+
"document": "http://localhost:8000/v2/documents/open5e-e/",
174+
"interior": false,
175+
"key": "urban",
176+
"name": "Urban",
177+
"planar": false,
178+
"url": "http://localhost:8000/v2/environments/urban/"
179+
}
63180
],
64181
"experience_points": 50,
65182
"hit_dice": "2d6",
66183
"hit_points": 7,
67184
"key": "srd_goblin",
68185
"languages": [
69-
"http://localhost:8000/v2/languages/common/",
70-
"http://localhost:8000/v2/languages/goblin/"
186+
{
187+
"desc": "Typical speakers are Humans.",
188+
"document": "http://localhost:8000/v2/documents/srd/",
189+
"is_exotic": false,
190+
"is_secret": false,
191+
"key": "common",
192+
"name": "Common",
193+
"script_language": "http://localhost:8000/v2/languages/common/",
194+
"url": "http://localhost:8000/v2/languages/common/"
195+
},
196+
{
197+
"desc": "Typical speakers are goblinoids.",
198+
"document": "http://localhost:8000/v2/documents/srd/",
199+
"is_exotic": false,
200+
"is_secret": false,
201+
"key": "goblin",
202+
"name": "Goblin",
203+
"script_language": "http://localhost:8000/v2/languages/dwarvish/",
204+
"url": "http://localhost:8000/v2/languages/goblin/"
205+
}
71206
],
72207
"modifiers": {
73208
"charisma": -1,

0 commit comments

Comments
 (0)