Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

administration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c269fdac

Commit c269fdac authored 1 week ago by Felix Reichenbach

Downloads
- Plain Diff

Merge branch 'OZG-7907-new-fields' into 'main'

OZG-7907 add new fields to aggregation mapping configuration

See merge request !13

parents e8876358 cb9fe792

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java 12 additions, 0 deletions

.../java/de/ozgcloud/admin/reporting/AggregationMapping.java
src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java 11 additions, 0 deletions

...dmin/reporting/ReportingAggregationManagerSettingDto.java
src/test/java/de/ozgcloud/admin/reporting/AggregationMappingDtoTestFactory.java 8 additions, 0 deletions

...oud/admin/reporting/AggregationMappingDtoTestFactory.java
src/test/java/de/ozgcloud/admin/reporting/AggregationMappingEnvironmentSettingITCase.java 8 additions, 0 deletions

...reporting/AggregationMappingEnvironmentSettingITCase.java
src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java 10 additions, 0 deletions

...gcloud/admin/reporting/AggregationMappingTestFactory.java
src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDtoServiceTest.java 2 additions, 2 deletions

...ing/ReportingAggregationManagerSettingDtoServiceTest.java
src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDtoTestFactory.java 1 addition, 1 deletion

...ing/ReportingAggregationManagerSettingDtoTestFactory.java
src/test/java/de/ozgcloud/admin/setting/PropertiesTestFactory.java 12 additions, 0 deletions

...java/de/ozgcloud/admin/setting/PropertiesTestFactory.java
src/test/resources/jsonTemplates/settings/aggregation.json.tmpl 6 additions, 0 deletions

...st/resources/jsonTemplates/settings/aggregation.json.tmpl

with 70 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Impressum - Datenschutz - Barrierefreiheit