EPMRPP-98940 merge conflicts

reportportal · Jan 27, 2025 · d56d636 · d56d636
1 parent 4c9d713
commit d56d636
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -78,9 +78,9 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         println("Using snapshot dependencies")
-        implementation 'com.github.reportportal:commons-dao:cbab1a2'
+        implementation 'com.github.reportportal:commons-dao:b46d164'
         implementation 'com.github.reportportal:commons:b5fb4f5'
-        implementation 'com.github.reportportal:plugin-api:a9b0f2c'
+        implementation 'com.github.reportportal:plugin-api:31e812d'
     }
 
     implementation 'org.springframework.boot:spring-boot-starter-aop'

diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/GetDashboardHandler.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/GetDashboardHandler.java
@@ -56,10 +56,10 @@ Iterable<DashboardResource> getDashboards(MembershipDetails membershipDetails,
    * Get Dashboard configuration including its widgets and filters if any
    *
    * @param id Dashboard id
-   * @param projectDetails Project details
+   * @param membershipDetails Project details
    * @return Dashboard configuration
    */
   DashboardConfigResource getDashboardConfig(Long id,
-      ReportPortalUser.ProjectDetails projectDetails);
+      MembershipDetails membershipDetails);
 
 }
diff --git a/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/dashboard/impl/GetDashboardHandlerImpl.java
@@ -19,15 +19,14 @@
 import com.epam.reportportal.rules.exception.ErrorType;
 import com.epam.reportportal.rules.exception.ReportPortalException;
 import com.epam.ta.reportportal.commons.ReportPortalUser;
-import com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.querygen.ProjectFilter;
 import com.epam.ta.reportportal.core.dashboard.GetDashboardHandler;
 import com.epam.ta.reportportal.core.widget.WidgetConfigurationService;
 import com.epam.ta.reportportal.dao.DashboardRepository;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
-import com.epam.ta.reportportal.model.dashboard.DashboardConfigResource;
 import com.epam.ta.reportportal.entity.organization.MembershipDetails;
+import com.epam.ta.reportportal.model.dashboard.DashboardConfigResource;
 import com.epam.ta.reportportal.model.dashboard.DashboardResource;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.DashboardConverter;
@@ -55,20 +54,20 @@ public Iterable<DashboardResource> getDashboards(MembershipDetails membershipDet
 
   @Override
   public DashboardResource getDashboard(Long id, MembershipDetails membershipDetails) {
-    var dashboard = getDashboardById(id, projectDetails);
+    var dashboard = getDashboardById(id, membershipDetails);
     return DashboardConverter.TO_RESOURCE.apply(dashboard);
   }
 
   @Override
   public DashboardConfigResource getDashboardConfig(Long id,
-      ReportPortalUser.ProjectDetails projectDetails) {
-    var dashboard = getDashboardById(id, projectDetails);
+      MembershipDetails membershipDetails) {
+    var dashboard = getDashboardById(id, membershipDetails);
     var widgetsConfiguration = widgetConfigurationService.getWidgetsConfiguration(
-        dashboard, projectDetails);
+        dashboard, membershipDetails);
     return DashboardConfigResource.builder().widgets(widgetsConfiguration).build();
   }
 
-  private Dashboard getDashboardById(Long id, ProjectDetails projectDetails) {
+  private Dashboard getDashboardById(Long id, MembershipDetails membershipDetails) {
     return dashboardRepository.findByIdAndProjectId(id, membershipDetails.getProjectId())
 				.orElseThrow(() -> new ReportPortalException(ErrorType.DASHBOARD_NOT_FOUND_IN_PROJECT,
 						id,

diff --git a/src/main/java/com/epam/ta/reportportal/core/widget/WidgetConfigurationService.java b/src/main/java/com/epam/ta/reportportal/core/widget/WidgetConfigurationService.java
@@ -17,9 +17,9 @@
 
 import com.epam.reportportal.rules.exception.ErrorType;
 import com.epam.reportportal.rules.exception.ReportPortalException;
-import com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails;
 import com.epam.ta.reportportal.dao.WidgetRepository;
 import com.epam.ta.reportportal.entity.dashboard.Dashboard;
+import com.epam.ta.reportportal.entity.organization.MembershipDetails;
 import com.epam.ta.reportportal.model.dashboard.DashboardResource.WidgetObjectModel;
 import com.epam.ta.reportportal.model.widget.WidgetConfigResource;
 import com.epam.ta.reportportal.ws.converter.converters.WidgetConverter;
@@ -38,13 +38,13 @@ public class WidgetConfigurationService {
   private final WidgetRepository widgetRepository;
 
   public List<WidgetConfigResource> getWidgetsConfiguration(Dashboard dashboard,
-      ProjectDetails projectDetails) {
+      MembershipDetails membershipDetails) {
     return dashboard.getDashboardWidgets().stream().map(WidgetConverter.TO_OBJECT_MODEL)
-        .map(widget -> getWidgetConfig(widget, projectDetails)).collect(Collectors.toList());
+        .map(widget -> getWidgetConfig(widget, membershipDetails)).collect(Collectors.toList());
   }
 
   private WidgetConfigResource getWidgetConfig(WidgetObjectModel widgetObject,
-      ProjectDetails projectDetails) {
+      MembershipDetails projectDetails) {
     var widget = widgetRepository.findByIdAndProjectId(widgetObject.getWidgetId(),
         projectDetails.getProjectId()).orElseThrow(
         () -> new ReportPortalException(ErrorType.WIDGET_NOT_FOUND_IN_PROJECT,

diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/DashboardController.java
@@ -168,9 +168,9 @@ public DashboardResource getDashboard(@PathVariable String projectKey,
   @GetMapping(value = "/copy/{dashboardId}")
   @ResponseStatus(OK)
   @Operation(summary = "Get Dashboard configuration including its widgets and filters if any")
-  public DashboardConfigResource getDashboardConfig(@PathVariable String projectName,
+  public DashboardConfigResource getDashboardConfig(@PathVariable String projectKey,
       @PathVariable Long dashboardId, @AuthenticationPrincipal ReportPortalUser user) {
     return getDashboardHandler.getDashboardConfig(
-        dashboardId, projectExtractor.extractProjectDetails(user, projectName));
+        dashboardId, projectExtractor.extractMembershipDetails(user, projectKey));
   }
 }