-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2177 from reportportal/rc/5.13.4
Release 5.13.4
- Loading branch information
Showing
24 changed files
with
531 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
...main/java/com/epam/ta/reportportal/core/dashboard/impl/DashboardPreconfiguredService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* | ||
| * Copyright 2025 EPAM Systems | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.epam.ta.reportportal.core.dashboard.impl; | ||
|
|
||
| import com.epam.ta.reportportal.commons.ReportPortalUser; | ||
| import com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails; | ||
| import com.epam.ta.reportportal.core.dashboard.CreateDashboardHandler; | ||
| import com.epam.ta.reportportal.core.dashboard.UpdateDashboardHandler; | ||
| import com.epam.ta.reportportal.core.filter.UpdateUserFilterHandler; | ||
| import com.epam.ta.reportportal.core.widget.CreateWidgetHandler; | ||
| import com.epam.ta.reportportal.model.EntryCreatedRS; | ||
| import com.epam.ta.reportportal.model.dashboard.AddWidgetRq; | ||
| import com.epam.ta.reportportal.model.dashboard.DashboardPreconfiguredRq; | ||
| import com.epam.ta.reportportal.model.filter.UpdateUserFilterRQ; | ||
| import com.epam.ta.reportportal.model.filter.UserFilterResource; | ||
| import com.epam.ta.reportportal.model.widget.WidgetConfigResource; | ||
| import com.epam.ta.reportportal.model.widget.WidgetRQ; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| /** | ||
| * @author Pavel Bortnik | ||
| */ | ||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class DashboardPreconfiguredService { | ||
|
|
||
| private final CreateDashboardHandler createDashboardHandler; | ||
| private final UpdateDashboardHandler updateDashboardHandler; | ||
| private final CreateWidgetHandler createWidgetHandler; | ||
| private final UpdateUserFilterHandler userFilterHandler; | ||
|
|
||
| public EntryCreatedRS createDashboard(ProjectDetails projectDetails, | ||
| DashboardPreconfiguredRq rq, ReportPortalUser user) { | ||
| var dashboard = createDashboardHandler.createDashboard(projectDetails, rq, user); | ||
| createAndAddWidgets(dashboard.getId(), rq.getDashboardConfig().getWidgetsConfig(), | ||
| projectDetails, user); | ||
| return dashboard; | ||
| } | ||
|
|
||
| private void createAndAddWidgets(Long dashboardId, List<WidgetConfigResource> widgetsConfigs, | ||
| ProjectDetails projectDetails, ReportPortalUser user) { | ||
| var filterIdMapping = createUniqueFilters(widgetsConfigs, projectDetails, user); | ||
| widgetsConfigs.forEach(widgetConfig -> { | ||
| var widget = createWidgetByConfig(projectDetails, user, | ||
| getNewFilterIds(filterIdMapping, widgetConfig), widgetConfig); | ||
| widgetConfig.getWidgetObject().setWidgetId(widget.getId()); | ||
| updateDashboardHandler.addWidget(dashboardId, projectDetails, | ||
| new AddWidgetRq(widgetConfig.getWidgetObject()), user); | ||
| }); | ||
| } | ||
|
|
||
| private EntryCreatedRS createWidgetByConfig(ProjectDetails projectDetails, ReportPortalUser user, | ||
| List<Long> filterIds, WidgetConfigResource config) { | ||
| var widgetRQ = new WidgetRQ(); | ||
| widgetRQ.setName(config.getWidgetResource().getName()); | ||
| widgetRQ.setDescription(config.getWidgetResource().getDescription()); | ||
| widgetRQ.setWidgetType(config.getWidgetResource().getWidgetType()); | ||
| widgetRQ.setContentParameters(config.getWidgetResource().getContentParameters()); | ||
| widgetRQ.setFilterIds(filterIds); | ||
| return createWidgetHandler.createWidget(widgetRQ, projectDetails, user); | ||
| } | ||
|
|
||
| private List<Long> getNewFilterIds(HashMap<Long, Long> filterIdMapping, | ||
| WidgetConfigResource config) { | ||
| return config.getWidgetResource().getAppliedFilters().stream() | ||
| .map(it -> filterIdMapping.get(it.getFilterId())).collect( | ||
| Collectors.toList()); | ||
| } | ||
|
|
||
| private HashMap<Long, Long> createUniqueFilters(List<WidgetConfigResource> widgetsConfigs, | ||
| ProjectDetails projectDetails, ReportPortalUser user) { | ||
|
|
||
| var filtersMapping = new HashMap<Long, Long>(); | ||
|
|
||
| var uniqueFilters = widgetsConfigs.stream() | ||
| .flatMap(it -> it.getWidgetResource().getAppliedFilters().stream()) | ||
| .collect(Collectors.toMap(UserFilterResource::getFilterId, f -> f, | ||
| (existing, current) -> existing)); | ||
|
|
||
| uniqueFilters.forEach((id, filter) -> { | ||
| var updateUserFilterRQ = new UpdateUserFilterRQ(); | ||
| updateUserFilterRQ.setName(filter.getName()); | ||
| updateUserFilterRQ.setConditions(filter.getConditions()); | ||
| updateUserFilterRQ.setOrders(filter.getOrders()); | ||
| updateUserFilterRQ.setObjectType(filter.getObjectType()); | ||
| updateUserFilterRQ.setDescription(filter.getDescription()); | ||
| var createdFilter = userFilterHandler.createFilterCopyOnDuplicate(updateUserFilterRQ, | ||
| projectDetails.getProjectName(), user); | ||
| filtersMapping.put(id, createdFilter.getId()); | ||
| }); | ||
| return filtersMapping; | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.