Skip to content

Commit 4090a85

Browse files
jsamouhjsamouh
committed
Manage Embedded Fields with NO BC Breaks in master
1 parent 3263e82 commit 4090a85

20 files changed

+1607
-506
lines changed

‎features/bootstrap/FeatureContext.php

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCar;
1919
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCarColor;
2020
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyFriend;
21+
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\EmbeddableDummy;
22+
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\EmbeddedDummy;
2123
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\FileConfigDummy;
2224
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
2325
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedToDummyFriend;
@@ -119,6 +121,25 @@ public function thereIsDummyObjects($nb)
119121
$this->manager->flush();
120122
}
121123

124+
/**
125+
* @Given there are :nb embedded dummy objects
126+
*/
127+
public function thereIsEmbeddedDummyObjects($nb)
128+
{
129+
for ($i = 1; $i <= $nb; ++$i) {
130+
$dummy = new EmbeddedDummy();
131+
$dummy->setName('Dummy #'.$i);
132+
133+
$embeddableDummy = new EmbeddableDummy();
134+
$embeddableDummy->setDummyName('Dummy #'.$i);
135+
$dummy->setEmbeddedDummy($embeddableDummy);
136+
137+
$this->manager->persist($dummy);
138+
}
139+
140+
$this->manager->flush();
141+
}
142+
122143
/**
123144
* @Given there is :nb dummy objects with relatedDummy
124145
*/
@@ -140,6 +161,25 @@ public function thereIsDummyObjectsWithRelatedDummy($nb)
140161
$this->manager->flush();
141162
}
142163

164+
/**
165+
* @Given there is :nb dummy objects with embeddedDummy
166+
*/
167+
public function thereIsDummyObjectsWithEmbeddedDummy($nb)
168+
{
169+
for ($i = 1; $i <= $nb; ++$i) {
170+
$embeddableDummy = new EmbeddableDummy();
171+
$embeddableDummy->setDummyName('EmbeddedDummy #'.$i);
172+
173+
$dummy = new EmbeddedDummy();
174+
$dummy->setName('Dummy #'.$i);
175+
$dummy->setEmbeddedDummy($embeddableDummy);
176+
177+
$this->manager->persist($dummy);
178+
}
179+
180+
$this->manager->flush();
181+
}
182+
143183
/**
144184
* @Given there is :nb dummy objects having each :nbrelated relatedDummies
145185
*/
@@ -254,6 +294,32 @@ public function thereIsDummyObjectsWithDummyDateAndRelatedDummy($nb)
254294
$this->manager->flush();
255295
}
256296

297+
/**
298+
* @Given there is :nb embedded dummy objects with dummyDate and embeddedDummy
299+
*/
300+
public function thereIsDummyObjectsWithDummyDateAndEmbeddedDummy($nb)
301+
{
302+
for ($i = 1; $i <= $nb; ++$i) {
303+
$date = new \DateTime(sprintf('2015-04-%d', $i), new \DateTimeZone('UTC'));
304+
305+
$embeddableDummy = new EmbeddableDummy();
306+
$embeddableDummy->setDummyName('Embeddable #'.$i);
307+
$embeddableDummy->setDummyDate($date);
308+
309+
$dummy = new EmbeddedDummy();
310+
$dummy->setName('Dummy #'.$i);
311+
$dummy->setEmbeddedDummy($embeddableDummy);
312+
// Last Dummy has a null date
313+
if ($nb !== $i) {
314+
$dummy->setDummyDate($date);
315+
}
316+
317+
$this->manager->persist($dummy);
318+
}
319+
320+
$this->manager->flush();
321+
}
322+
257323
/**
258324
* @Given there is :nb dummy objects with dummyPrice
259325
*/
@@ -303,6 +369,66 @@ public function thereIsDummyObjectsWithDummyBoolean($nb, $bool)
303369
$this->manager->flush();
304370
}
305371

372+
/**
373+
* @Given there is :nb embedded dummy objects with embeddedDummy.dummyBoolean :bool
374+
*/
375+
public function thereIsDummyObjectsWithEmbeddedDummyBoolean($nb, $bool)
376+
{
377+
if (in_array($bool, ['true', '1', 1], true)) {
378+
$bool = true;
379+
} elseif (in_array($bool, ['false', '0', 0], true)) {
380+
$bool = false;
381+
} else {
382+
$expected = ['true', 'false', '1', '0'];
383+
throw new InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
384+
}
385+
386+
for ($i = 1; $i <= $nb; ++$i) {
387+
$dummy = new EmbeddedDummy();
388+
$dummy->setName('Embedded Dummy #'.$i);
389+
$embeddableDummy = new EmbeddableDummy();
390+
$embeddableDummy->setDummyName('Embedded Dummy #'.$i);
391+
$embeddableDummy->setDummyBoolean($bool);
392+
$dummy->setEmbeddedDummy($embeddableDummy);
393+
$this->manager->persist($dummy);
394+
}
395+
396+
$this->manager->flush();
397+
}
398+
399+
/**
400+
* @Given there is :nb embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean :bool
401+
*/
402+
public function thereIsDummyObjectsWithRelationEmbeddedDummyBoolean($nb, $bool)
403+
{
404+
if (in_array($bool, ['true', '1', 1], true)) {
405+
$bool = true;
406+
} elseif (in_array($bool, ['false', '0', 0], true)) {
407+
$bool = false;
408+
} else {
409+
$expected = ['true', 'false', '1', '0'];
410+
throw new InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
411+
}
412+
413+
for ($i = 1; $i <= $nb; ++$i) {
414+
$dummy = new EmbeddedDummy();
415+
$dummy->setName('Embedded Dummy #'.$i);
416+
$embeddableDummy = new EmbeddableDummy();
417+
$embeddableDummy->setDummyName('Embedded Dummy #'.$i);
418+
$embeddableDummy->setDummyBoolean($bool);
419+
420+
$relationDummy = new RelatedDummy();
421+
$relationDummy->setEmbeddedDummy($embeddableDummy);
422+
423+
$dummy->setRelatedDummy($relationDummy);
424+
425+
$this->manager->persist($relationDummy);
426+
$this->manager->persist($dummy);
427+
}
428+
429+
$this->manager->flush();
430+
}
431+
306432
/**
307433
* @Given there is a RelationEmbedder object
308434
*/

‎features/doctrine/boolean_filter.feature

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,210 @@ Feature: Boolean filter on collections
166166
"""
167167
And the JSON node "hydra:totalItems" should be equal to 10
168168

169+
Scenario: Get collection by embeddedDummy.dummyBoolean true
170+
Given there is "15" embedded dummy objects with embeddedDummy.dummyBoolean true
171+
And there is "10" embedded dummy objects with embeddedDummy.dummyBoolean false
172+
When I send a "GET" request to "/embedded_dummies?embeddedDummy.dummyBoolean=true"
173+
Then the response status code should be 200
174+
And the response should be in JSON
175+
And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
176+
And the JSON should be valid according to this schema:
177+
"""
178+
{
179+
"type": "object",
180+
"properties": {
181+
"@context": {"pattern": "^/contexts/EmbeddedDummy$"},
182+
"@id": {"pattern": "^/embedded_dummies$"},
183+
"@type": {"pattern": "^hydra:Collection$"},
184+
"hydra:member": {
185+
"type": "array",
186+
"items": {
187+
"type": "object",
188+
"properties": {
189+
"@id": {
190+
"oneOf": [
191+
{"pattern": "^/embedded_dummies/1$"},
192+
{"pattern": "^/embedded_dummies/2$"},
193+
{"pattern": "^/embedded_dummies/3$"}
194+
]
195+
}
196+
}
197+
}
198+
},
199+
"hydra:view": {
200+
"type": "object",
201+
"properties": {
202+
"@id": {"pattern": "^/embedded_dummies\\?embeddedDummy\\.dummyBoolean=true"},
203+
"@type": {"pattern": "^hydra:PartialCollectionView$"}
204+
}
205+
}
206+
}
207+
}
208+
"""
209+
And the JSON node "hydra:totalItems" should be equal to 15
210+
211+
Scenario: Get collection by embeddedDummy.dummyBoolean true
212+
When I send a "GET" request to "/embedded_dummies?embeddedDummy.dummyBoolean=1"
213+
Then the response status code should be 200
214+
And the response should be in JSON
215+
And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
216+
And the JSON should be valid according to this schema:
217+
"""
218+
{
219+
"type": "object",
220+
"properties": {
221+
"@context": {"pattern": "^/contexts/EmbeddedDummy$"},
222+
"@id": {"pattern": "^/embedded_dummies$"},
223+
"@type": {"pattern": "^hydra:Collection$"},
224+
"hydra:member": {
225+
"type": "array",
226+
"items": {
227+
"type": "object",
228+
"properties": {
229+
"@id": {
230+
"oneOf": [
231+
{"pattern": "^/embedded_dummies/1$"},
232+
{"pattern": "^/embedded_dummies/2$"},
233+
{"pattern": "^/embedded_dummies/3$"}
234+
]
235+
}
236+
}
237+
}
238+
},
239+
"hydra:view": {
240+
"type": "object",
241+
"properties": {
242+
"@id": {"pattern": "^/embedded_dummies\\?embeddedDummy\\.dummyBoolean=1"},
243+
"@type": {"pattern": "^hydra:PartialCollectionView$"}
244+
}
245+
}
246+
}
247+
}
248+
"""
249+
And the JSON node "hydra:totalItems" should be equal to 15
250+
251+
Scenario: Get collection by embeddedDummy.dummyBoolean false
252+
When I send a "GET" request to "/embedded_dummies?embeddedDummy.dummyBoolean=false"
253+
Then the response status code should be 200
254+
And the response should be in JSON
255+
And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
256+
And the JSON should be valid according to this schema:
257+
"""
258+
{
259+
"type": "object",
260+
"properties": {
261+
"@context": {"pattern": "^/contexts/EmbeddedDummy$"},
262+
"@id": {"pattern": "^/embedded_dummies$"},
263+
"@type": {"pattern": "^hydra:Collection$"},
264+
"hydra:member": {
265+
"type": "array",
266+
"items": {
267+
"type": "object",
268+
"properties": {
269+
"@id": {
270+
"oneOf": [
271+
{"pattern": "^/embedded_dummies/16$"},
272+
{"pattern": "^/embedded_dummies/17$"},
273+
{"pattern": "^/embedded_dummies/18$"}
274+
]
275+
}
276+
}
277+
}
278+
},
279+
"hydra:view": {
280+
"type": "object",
281+
"properties": {
282+
"@id": {"pattern": "^/embedded_dummies\\?embeddedDummy\\.dummyBoolean=false"},
283+
"@type": {"pattern": "^hydra:PartialCollectionView$"}
284+
}
285+
}
286+
}
287+
}
288+
"""
289+
And the JSON node "hydra:totalItems" should be equal to 10
290+
291+
Scenario: Get collection by embeddedDummy.dummyBoolean false
292+
When I send a "GET" request to "/embedded_dummies?embeddedDummy.dummyBoolean=0"
293+
Then the response status code should be 200
294+
And the response should be in JSON
295+
And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
296+
And the JSON should be valid according to this schema:
297+
"""
298+
{
299+
"type": "object",
300+
"properties": {
301+
"@context": {"pattern": "^/contexts/EmbeddedDummy$"},
302+
"@id": {"pattern": "^/embedded_dummies$"},
303+
"@type": {"pattern": "^hydra:Collection$"},
304+
"hydra:member": {
305+
"type": "array",
306+
"items": {
307+
"type": "object",
308+
"properties": {
309+
"@id": {
310+
"oneOf": [
311+
{"pattern": "^/embedded_dummies/16$"},
312+
{"pattern": "^/embedded_dummies/17$"},
313+
{"pattern": "^/embedded_dummies/18$"}
314+
]
315+
}
316+
}
317+
}
318+
},
319+
"hydra:view": {
320+
"type": "object",
321+
"properties": {
322+
"@id": {"pattern": "^/embedded_dummies\\?embeddedDummy\\.dummyBoolean=0"},
323+
"@type": {"pattern": "^hydra:PartialCollectionView$"}
324+
}
325+
}
326+
}
327+
}
328+
"""
329+
And the JSON node "hydra:totalItems" should be equal to 10
330+
331+
Scenario: Get collection by association with embed relatedDummy.embeddedDummy.dummyBoolean true
332+
Given there is "15" embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean true
333+
And there is "10" embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean false
334+
When I send a "GET" request to "/embedded_dummies?relatedDummy.embeddedDummy.dummyBoolean=true"
335+
Then the response status code should be 200
336+
And the response should be in JSON
337+
And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
338+
And the JSON should be valid according to this schema:
339+
"""
340+
{
341+
"type": "object",
342+
"properties": {
343+
"@context": {"pattern": "^/contexts/EmbeddedDummy$"},
344+
"@id": {"pattern": "^/embedded_dummies$"},
345+
"@type": {"pattern": "^hydra:Collection$"},
346+
"hydra:member": {
347+
"type": "array",
348+
"items": {
349+
"type": "object",
350+
"properties": {
351+
"@id": {
352+
"oneOf": [
353+
{"pattern": "^/embedded_dummies/26$"},
354+
{"pattern": "^/embedded_dummies/27$"},
355+
{"pattern": "^/embedded_dummies/28$"}
356+
]
357+
}
358+
}
359+
}
360+
},
361+
"hydra:view": {
362+
"type": "object",
363+
"properties": {
364+
"@id": {"pattern": "^/embedded_dummies\\?relatedDummy.embeddedDummy\\.dummyBoolean=true"},
365+
"@type": {"pattern": "^hydra:PartialCollectionView$"}
366+
}
367+
}
368+
}
369+
}
370+
"""
371+
And the JSON node "hydra:totalItems" should be equal to 15
372+
169373
@dropSchema
170374
Scenario: Get collection ordered by a non valid properties
171375
When I send a "GET" request to "/dummies?unknown=0"

0 commit comments

Comments
 (0)