Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit 87ca2a8

Browse files
rprzedzikrprzedzik
authored
Merge pull request #185 from ergonode/release/v0.5.0
Release/v0.5.0
2 parents 065d3b5 + bc76e55 commit 87ca2a8

File tree

406 files changed

+15164
-2550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+15164
-2550
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## CHANGELOG FOR 0.5.0
2+
- feature [#115](https://github.com/ergonode/backend/issues/115) Product segment functionality (rprzedzik)
3+
- feature [#118](https://github.com/ergonode/backend/issues/118) Event store history (BastekBielawski)
4+
- feature [#124](https://github.com/ergonode/backend/issues/124) Register events in database (BastekBielawski)
5+
16
## CHANGELOG FOR 0.4.0
27

38
- feature [#104](https://github.com/ergonode/backend/issues/104) Multiple category trees (wiewiurdp)

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<p align="center">
99
<a href="https://ergonode.com" target="_blank">
10-
<img src="https://img.shields.io/badge/version-0.4.0-4c9aff.svg" alt="Version">
10+
<img src="https://img.shields.io/badge/version-0.5.0-4c9aff.svg" alt="Version">
1111
</a>
1212
<a href="https://ergonode.com" target="_blank">
1313
<img src="https://img.shields.io/badge/version%20code-Vegas-00bc87.svg" alt="Code Version">
@@ -96,7 +96,7 @@ On the front side we've used headless approach with Vue.js application. Thanks t
9696
#### Backend Technologies
9797

9898
- PHP 7.2
99-
- Symfony 4.2
99+
- Symfony 4.3
100100
- Postgres 9.6 (uuid-ossp, ltree)
101101
- RabbitMQ (optional)
102102
- Redis (optional)

‎composer.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
"Ergonode\\AttributeUnit\\": "module/attribute-unit/src",
100100
"Ergonode\\AttributeDate\\": "module/attribute-date/src",
101101
"Ergonode\\AttributeImage\\": "module/attribute-image/src",
102+
"Ergonode\\Condition\\": "module/condition/src",
102103
"Ergonode\\Segment\\": "module/segment/src",
103104
"Ergonode\\Grid\\": "module/grid/src",
104105
"Ergonode\\Channel\\": "module/channel/src",
@@ -136,6 +137,7 @@
136137
"Ergonode\\AttributeUnit\\Tests\\": "module/attribute-unit/tests",
137138
"Ergonode\\AttributeDate\\Tests\\": "module/attribute-date/tests",
138139
"Ergonode\\AttributeImage\\Tests\\": "module/attribute-image/tests",
140+
"Ergonode\\Condition\\Tests\\": "module/condition/tests",
139141
"Ergonode\\Segment\\Tests\\": "module/segment/tests",
140142
"Ergonode\\Grid\\Tests\\": "module/grid/tests",
141143
"Ergonode\\Channel\\Tests\\": "module/channel/tests",

‎config/bundles.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
Ergonode\Importer\ErgonodeImporterBundle::class => ['all' => true],
2626
Ergonode\Reader\ErgonodeReaderBundle::class => ['all' => true],
2727
Ergonode\Transformer\ErgonodeTransformerBundle::class => ['all' => true],
28+
Ergonode\Condition\ErgonodeConditionBundle::class => ['all' => true],
29+
Ergonode\Segment\ErgonodeSegmentBundle::class => ['all' => true],
2830
Ergonode\Category\ErgonodeCategoryBundle::class => ['all' => true],
2931
Ergonode\CategoryTree\ErgonodeCategoryTreeBundle::class => ['all' => true],
3032
Ergonode\Product\ErgonodeProductBundle::class => ['all' => true],
@@ -43,6 +45,6 @@
4345
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
4446
Vich\UploaderBundle\VichUploaderBundle::class => ['all' => true],
4547
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
46-
Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true],
4748
Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
49+
Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true],
4850
];

‎config/packages/nelmio_api_doc.yaml‎

Lines changed: 96 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,40 @@ nelmio_api_doc:
9898
type: boolean
9999
required: true
100100
example: true
101+
account_upd:
102+
type: object
103+
properties:
104+
firstName:
105+
type: string
106+
required: true
107+
description: User first name
108+
example: Jon
109+
lastName:
110+
type: string
111+
required: true
112+
description: User last name
113+
example: Dove
114+
language:
115+
type: string
116+
required: true
117+
description: User language
118+
example: EN
119+
password:
120+
type: string
121+
required: true
122+
example: 12345678
123+
passwordRepeat:
124+
type: string
125+
equired: true
126+
example: 12345678
127+
roleId:
128+
type: string
129+
required: true
130+
example: 86800536-0f2a-4920-9291-f35fdcea3839
131+
isActive:
132+
type: boolean
133+
required: true
134+
example: true
101135
status:
102136
type: object
103137
properties:
@@ -210,6 +244,15 @@ nelmio_api_doc:
210244
example:
211245
DE: Name DE
212246
EN: Name EN
247+
category_upd:
248+
type: object
249+
properties:
250+
name:
251+
type: object
252+
description: category name
253+
example:
254+
DE: Name DE
255+
EN: Name EN
213256
product:
214257
type: object
215258
properties:
@@ -228,6 +271,15 @@ nelmio_api_doc:
228271
type: string
229272
required: false
230273
description: Lista id kategorii
274+
product_upd:
275+
type: object
276+
properties:
277+
categortyIds:
278+
type: array
279+
items:
280+
type: string
281+
required: false
282+
description: Lista id kategorii
231283
template:
232284
type: object
233285
properties:
@@ -269,7 +321,7 @@ nelmio_api_doc:
269321
$ref: "#/definitions/translation"
270322
example:
271323
key: key_1
272-
translation:
324+
value:
273325
PL: Option PL 1
274326
EN: Option EN 1
275327
attribute_parameters:
@@ -281,13 +333,29 @@ nelmio_api_doc:
281333
description: Additional format information (If used by attribute)
282334
example: YYYY-MM-DDDD
283335
segment:
284-
type: object
336+
type: 'object'
285337
properties:
286-
name:
287-
type: string
338+
condition_set_id:
339+
type: 'string'
288340
required: true
289-
description: segment name
290-
example: segment name
341+
description: 'Condition set ID'
342+
code:
343+
type: 'string'
344+
required: true
345+
description: 'Segment unique code'
346+
name:
347+
$ref: "#/definitions/translation"
348+
description:
349+
$ref: "#/definitions/translation"
350+
example:
351+
condition_set_id: 'd1b9b64a-fef6-440c-9560-cf73daa4b4d6'
352+
code: 'code'
353+
name:
354+
PL: 'Nazwa'
355+
EN: 'Name'
356+
description:
357+
PL: 'Opis'
358+
EN: 'Description'
291359
languages_req:
292360
type: object
293361
properties:
@@ -416,7 +484,6 @@ nelmio_api_doc:
416484
items:
417485
type: 'string'
418486
example: 'Error message'
419-
420487
credentials:
421488
type: object
422489
properties:
@@ -451,6 +518,28 @@ nelmio_api_doc:
451518
description: List of role privileges
452519
example:
453520
[ ATTRIBUTE_CREATE, ATTRIBUTE_READ, ATTRIBUTE_UPDATE, ATTRIBUTE_DELETE]
521+
conditionset_create:
522+
type: 'object'
523+
properties:
524+
code:
525+
type: 'string'
526+
required: true
527+
description: 'Condition code'
528+
example: 'CONDITION_CODE'
529+
name:
530+
$ref: '#/definitions/translation'
531+
description:
532+
$ref: '#/definitions/translation'
533+
conditionset_update:
534+
type: 'object'
535+
properties:
536+
name:
537+
$ref: '#/definitions/translation'
538+
description:
539+
$ref: '#/definitions/translation'
540+
conditions:
541+
type: 'array'
542+
example: []
454543
authentication:
455544
type: object
456545
properties:

0 commit comments

Comments
 (0)