Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to Aggregation vocabulary for CS03 #178

Merged
merged 25 commits into from
Oct 18, 2023
Merged

Changes to Aggregation vocabulary for CS03 #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
48f3980
Collect pull requests for Aggregation vocabulary CS03
HeikoTheissen Dec 17, 2021
ed8e4be
ODATA-1218 - Enhance hierarchy processing (#121)
GeraldKrause Jan 13, 2022
a9549ef
ODATA-1142 - resolved - Clarify MaxDistance is an optional parameter …
GeraldKrause Jan 13, 2022
1291fb0
ODATA-1136 - resolved - Allow hierarchy filter functions for ancestor…
GeraldKrause Jan 14, 2022
b16671d
Merge branch 'main' into aggregation-cs03-release-candidate
ralfhandl Feb 10, 2022
d7a1671
ODATA-1384 - Clarify usage of annotation qualifiers as references to …
GeraldKrause Mar 3, 2022
14f59ce
Digital/Physical -> Food/NonFood (#186)
HeikoTheissen Apr 28, 2022
c0dce3d
Merge branch 'main' into aggregation-cs03-release-candidate
HeikoTheissen May 6, 2022
4a1f364
Merge branch 'main' into aggregation-cs03-release-candidate
HeikoTheissen Jun 24, 2022
79e1618
Aggregation voc - update descriptions: remove rollupall, add rollupre…
GeraldKrause Jul 28, 2022
4ca9406
Merge branch 'main' into aggregation-cs03-release-candidate
HeikoTheissen Aug 5, 2022
13de8f2
Merge remote-tracking branch 'origin/main' into aggregation-cs03-rele…
HeikoTheissen Sep 7, 2022
480cf81
Merge remote-tracking branch 'origin/main' into aggregation-cs03-rele…
HeikoTheissen Dec 8, 2022
1244604
Merge remote-tracking branch 'origin/main' into
HeikoTheissen Dec 20, 2022
c09e357
Merge remote-tracking branch 'origin/main' into
HeikoTheissen Jan 10, 2023
0f3b9c2
Merge branch 'main' into aggregation-cs03-release-candidate
ralfhandl Mar 21, 2023
6594601
Preview on new transformations (#218)
HeikoTheissen Mar 27, 2023
e231b77
Merge remote-tracking branch 'origin/main' into aggregation-cs03-rele…
HeikoTheissen Apr 28, 2023
fc8c776
Changes resulting from OData-Aggr walkthrough (#191)
HeikoTheissen Jun 28, 2023
15e0dc3
remove commented-out Cycle term (#221)
HeikoTheissen Jun 30, 2023
3e7fe3e
Merge branch 'main' into aggregation-cs03-release-candidate
ralfhandl Jul 4, 2023
5c60368
Merge branch 'main' into aggregation-cs03-release-candidate
ralfhandl Sep 6, 2023
d734321
Merge branch 'main' into aggregation-cs03-release-candidate
HeikoTheissen Sep 20, 2023
b96cf2d
Only Node 20
HeikoTheissen Sep 20, 2023
c684873
Merge branch 'main' into aggregation-cs03-release-candidate
HeikoTheissen Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [18.x,20.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down
310 changes: 310 additions & 0 deletions examples/Org.OData.Aggregation.V1.SalesModel-sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,310 @@
{
"$Version": "4.0",
"$Reference": {
"https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.json": {
"$Include": [
{
"$Namespace": "Org.OData.Core.V1",
"$Alias": "Core"
}
]
},
"https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Aggregation.V1.json": {
"$Include": [
{
"$Namespace": "Org.OData.Aggregation.V1",
"$Alias": "Aggregation"
}
]
}
},
"org.example.odata.salesservice": {
"$Alias": "SalesModel",
"Currency": {
"$Kind": "EntityType",
"$Key": [
"Code"
],
"Code": {
"$Nullable": true
},
"Name": {
"$Nullable": true,
"@Core.IsLanguageDependent": true
}
},
"Time": {
"$Kind": "EntityType",
"$Key": [
"Date"
],
"Date": {
"$Type": "Edm.Date"
},
"Month": {},
"Quarter": {},
"Year": {
"$Type": "Edm.Int16"
},
"@Aggregation.LeveledHierarchy#TimeHierarchy": [
"Year",
"Quarter",
"Month"
]
},
"Category": {
"$Kind": "EntityType",
"$Key": [
"ID"
],
"ID": {},
"Name": {
"$Nullable": true
},
"Products": {
"$Kind": "NavigationProperty",
"$Collection": true,
"$Type": "SalesModel.Product",
"$Partner": "Category"
}
},
"SalesOrganization": {
"$Kind": "EntityType",
"$Key": [
"ID"
],
"ID": {},
"Name": {
"$Nullable": true
},
"Superordinate": {
"$Kind": "NavigationProperty",
"$Type": "SalesModel.SalesOrganization",
"$Nullable": true
},
"Sales": {
"$Kind": "NavigationProperty",
"$Collection": true,
"$Type": "SalesModel.Sale",
"$Partner": "SalesOrganization"
},
"@Aggregation.RecursiveHierarchy#SalesOrgHierarchy": {
"NodeProperty": "ID",
"ParentNavigationProperty": "Superordinate"
}
},
"Customer": {
"$Kind": "EntityType",
"$Key": [
"ID"
],
"ID": {},
"Name": {
"$Nullable": true
},
"Country": {
"$Nullable": true
},
"Sales": {
"$Kind": "NavigationProperty",
"$Collection": true,
"$Type": "SalesModel.Sale",
"$Partner": "Customer"
}
},
"Product": {
"$Kind": "EntityType",
"$Abstract": true,
"$Key": [
"ID"
],
"ID": {},
"Name": {
"$Nullable": true
},
"Color": {
"$Nullable": true
},
"TaxRate": {
"$Type": "Edm.Decimal",
"$Nullable": true,
"$Scale": 2
},
"Category": {
"$Kind": "NavigationProperty",
"$Type": "SalesModel.Category",
"$Partner": "Products"
},
"Sales": {
"$Kind": "NavigationProperty",
"$Collection": true,
"$Type": "SalesModel.Sale",
"$Partner": "Product"
},
"@Aggregation.LeveledHierarchy#ProductHierarchy": [
"Category/Name",
"Name"
]
},
"FoodProduct": {
"$Kind": "EntityType",
"$BaseType": "SalesModel.Product",
"Rating": {
"$Type": "Edm.Byte",
"$Nullable": true
}
},
"NonFoodProduct": {
"$Kind": "EntityType",
"$BaseType": "SalesModel.Product",
"RatingClass": {
"$Nullable": true
}
},
"Sale": {
"$Kind": "EntityType",
"$Key": [
"ID"
],
"ID": {},
"Amount": {
"$Type": "Edm.Decimal",
"$Nullable": true,
"$Scale": 2,
"@Aggregation.ContextDefiningProperties": [
"Currency/Code"
]
},
"Currency": {
"$Kind": "NavigationProperty",
"$Type": "SalesModel.Currency"
},
"SalesOrganization": {
"$Kind": "NavigationProperty",
"$Type": "SalesModel.SalesOrganization",
"$Nullable": true,
"$Partner": "Sales"
},
"Product": {
"$Kind": "NavigationProperty",
"$Type": "SalesModel.Product",
"$Nullable": true,
"$Partner": "Sales"
},
"Customer": {
"$Kind": "NavigationProperty",
"$Type": "SalesModel.Customer",
"$Nullable": true,
"$Partner": "Sales"
},
"Time": {
"$Kind": "NavigationProperty",
"$Type": "SalesModel.Time",
"$Nullable": true
}
},
"SalesData": {
"$Kind": "EntityContainer",
"Time": {
"$Collection": true,
"$Type": "SalesModel.Time"
},
"Categories": {
"$Collection": true,
"$Type": "SalesModel.Category",
"$NavigationPropertyBinding": {
"Products": "Products"
}
},
"SalesOrganizations": {
"$Collection": true,
"$Type": "SalesModel.SalesOrganization",
"$NavigationPropertyBinding": {
"Superordinate": "SalesOrganizations",
"Sales": "Sales"
}
},
"Customers": {
"$Collection": true,
"$Type": "SalesModel.Customer",
"$NavigationPropertyBinding": {
"Sales": "Sales"
}
},
"Products": {
"$Collection": true,
"$Type": "SalesModel.Product",
"$NavigationPropertyBinding": {
"Category": "Categories",
"Sales": "Sales"
}
},
"Sales": {
"$Collection": true,
"$Type": "SalesModel.Sale",
"$NavigationPropertyBinding": {
"SalesOrganization": "SalesOrganizations",
"Customer": "Customers",
"Product": "Products",
"Time": "Time"
}
}
},
"$Annotations": {
"SalesModel.SalesData/Sales": {
"@Aggregation.ApplySupported": {
"Rollup": "MultipleHierarchies",
"GroupableProperties": [
"Amount",
"Product/ID",
"Product/Name",
"Product/Category/ID",
"Product/Category/Name",
"Customer",
"Customer/ID",
"Customer/Name",
"Customer/Country",
"Time",
"Time/Month",
"Time/Year"
],
"AggregatableProperties": [
{
"Property": "Amount",
"SupportedAggregationMethods": [
"sum",
"min",
"max"
],
"RecommendedAggregationMethod": "sum"
}
]
},
"@Aggregation.CustomAggregate#[email protected]": [
"Currency/Code"
],
"@Aggregation.CustomAggregate#Forecast": "Edm.Decimal"
},
"SalesModel.SalesData/Customers": {
"@Aggregation.ApplySupported": {
"Rollup": "None",
"GroupableProperties": [
"Name",
"Country"
]
}
},
"SalesModel.SalesData/Products": {
"@Aggregation.ApplySupported": {
"Rollup": "None",
"GroupableProperties": [
"Name",
"SalesModel.FoodProduct/Rating",
"SalesModel.NonFoodProduct/RatingClass"
]
}
}
}
},
"$EntityContainer": "org.example.odata.salesservice.SalesData"
}
Loading