Skip to content

Commit e5ed736

Browse files
committed
TASK: Updating RAML types, Postman and OAS definition
1 parent 1951693 commit e5ed736

13 files changed

+81
-81
lines changed

oas/api/openapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76900,7 +76900,7 @@ components:
7690076900
fieldType:
7690176901
$ref: '#/components/schemas/SearchFieldType'
7690276902
filter:
76903-
$ref: '#/components/schemas/SearchQueryExpression'
76903+
$ref: '#/components/schemas/SearchQuery'
7690476904
SearchTimeRangeExpression:
7690576905
allOf:
7690676906
- $ref: '#/components/schemas/SearchQueryExpression'

uml/api/SearchFieldType.puml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ interface SearchSorting [[SearchSorting.svg]] {
5454
order: [[SearchSortOrder.svg SearchSortOrder]]
5555
mode: [[SearchSortMode.svg SearchSortMode]]
5656
fieldType: [[SearchFieldType.svg SearchFieldType]]
57-
filter: [[SearchQueryExpression.svg SearchQueryExpression]]
57+
filter: [[SearchQuery.svg SearchQuery]]
5858
}
5959
SearchFieldType --> ProductSearchFacetDistinctValue #green;text:green : "fieldType"
6060
SearchFieldType --> ProductSearchFacetRangesValue #green;text:green : "fieldType"

uml/api/SearchQuery.puml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,14 @@ interface ProductSearchFacetRangesValue [[ProductSearchFacetRangesValue.svg]] {
121121
language: String
122122
fieldType: [[SearchFieldType.svg SearchFieldType]]
123123
}
124+
interface SearchSorting [[SearchSorting.svg]] {
125+
field: String
126+
language: String
127+
order: [[SearchSortOrder.svg SearchSortOrder]]
128+
mode: [[SearchSortMode.svg SearchSortMode]]
129+
fieldType: [[SearchFieldType.svg SearchFieldType]]
130+
filter: [[SearchQuery.svg SearchQuery]]
131+
}
124132

125133
SearchQuery --> SearchAndExpression #green;text:green : "and"
126134
SearchQuery --> SearchAndExpression #green;text:green : "and"
@@ -135,4 +143,5 @@ SearchQuery --> ProductSearchRequest #green;text:green : "postFilter"
135143
SearchQuery --> ProductSearchFacetCountValue #green;text:green : "filter"
136144
SearchQuery --> ProductSearchFacetDistinctValue #green;text:green : "filter"
137145
SearchQuery --> ProductSearchFacetRangesValue #green;text:green : "filter"
146+
SearchQuery --> SearchSorting #green;text:green : "filter"
138147
@enduml

uml/api/SearchQueryExpression.puml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,7 @@ interface SearchWildCardExpression [[SearchWildCardExpression.svg]] extends Sear
4949
interface SearchFilterExpression [[SearchFilterExpression.svg]] {
5050
filter: [[SearchQueryExpression.svg List<SearchQueryExpression>]]
5151
}
52-
interface SearchSorting [[SearchSorting.svg]] {
53-
field: String
54-
language: String
55-
order: [[SearchSortOrder.svg SearchSortOrder]]
56-
mode: [[SearchSortMode.svg SearchSortMode]]
57-
fieldType: [[SearchFieldType.svg SearchFieldType]]
58-
filter: [[SearchQueryExpression.svg SearchQueryExpression]]
59-
}
6052

6153
SearchQueryExpression --> SearchFilterExpression #green;text:green : "filter"
6254
SearchQueryExpression --> SearchFilterExpression #green;text:green : "filter"
63-
SearchQueryExpression --> SearchSorting #green;text:green : "filter"
6455
@enduml

uml/api/SearchSortMode.puml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interface SearchSorting [[SearchSorting.svg]] {
1313
order: [[SearchSortOrder.svg SearchSortOrder]]
1414
mode: [[SearchSortMode.svg SearchSortMode]]
1515
fieldType: [[SearchFieldType.svg SearchFieldType]]
16-
filter: [[SearchQueryExpression.svg SearchQueryExpression]]
16+
filter: [[SearchQuery.svg SearchQuery]]
1717
}
1818
SearchSortMode --> SearchSorting #green;text:green : "mode"
1919
@enduml

uml/api/SearchSortOrder.puml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface SearchSorting [[SearchSorting.svg]] {
1515
order: [[SearchSortOrder.svg SearchSortOrder]]
1616
mode: [[SearchSortMode.svg SearchSortMode]]
1717
fieldType: [[SearchFieldType.svg SearchFieldType]]
18-
filter: [[SearchQueryExpression.svg SearchQueryExpression]]
18+
filter: [[SearchQuery.svg SearchQuery]]
1919
}
2020
SearchSortOrder --> ProductSearchFacetDistinctBucketSortExpression #green;text:green : "order"
2121
SearchSortOrder --> SearchSorting #green;text:green : "order"

uml/api/SearchSorting.puml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ interface SearchSorting [[SearchSorting.svg]] {
1414
order: [[SearchSortOrder.svg SearchSortOrder]]
1515
mode: [[SearchSortMode.svg SearchSortMode]]
1616
fieldType: [[SearchFieldType.svg SearchFieldType]]
17-
filter: [[SearchQueryExpression.svg SearchQueryExpression]]
17+
filter: [[SearchQuery.svg SearchQuery]]
1818
}
1919

2020

uml/api/svg/SearchFieldType.svg

Lines changed: 6 additions & 6 deletions
Loading

uml/api/svg/SearchQuery.svg

Lines changed: 35 additions & 25 deletions
Loading

uml/api/svg/SearchQueryExpression.svg

Lines changed: 15 additions & 25 deletions
Loading

0 commit comments

Comments
 (0)