Skip to content

Commit 7f5a2d7

Browse files
jsamouhjsamouh
committed
Manage Embedded Fields with NO BC Breaks in master
1 parent 38d6a6d commit 7f5a2d7

20 files changed

+1611
-510
lines changed

‎features/bootstrap/FeatureContext.php

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCar;
1717
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCarColor;
1818
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyFriend;
19+
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\EmbeddableDummy;
20+
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\EmbeddedDummy;
1921
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\FileConfigDummy;
2022
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
2123
use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedToDummyFriend;
@@ -117,6 +119,25 @@ public function thereIsDummyObjects($nb)
117119
$this->manager->flush();
118120
}
119121

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

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

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

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

‎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)