EPMRPP-97488 merge conflicts

reportportal · Dec 9, 2024 · 61826ea · 61826ea
1 parent 4bdfcbe
commit 61826ea
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/LaunchController.java
@@ -269,7 +269,7 @@ public LaunchResource getLaunchByUuid(@PathVariable String projectKey,
   public LaunchResourceOld getLaunchByUuidOldTimestamp(@PathVariable String projectName,
       @PathVariable String launchId, @AuthenticationPrincipal ReportPortalUser user) {
     LaunchResource launch = getLaunchMessageHandler.getLaunch(launchId,
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName))
+        projectExtractor.extractMembershipDetails(user, normalizeId(projectName))
     );
     return launchConverter.TO_RESOURCE_OLD.apply(launch);
   }
@@ -416,7 +416,7 @@ public LaunchResource mergeLaunches(@PathVariable String projectKey,
 
   @Transactional
   @PostMapping(value = "/merge")
-  @PreAuthorize(ALLOWED_TO_REPORT)
+  @PreAuthorize(ALLOWED_TO_EDIT_PROJECT)
   @ResponseStatus(OK)
   @Operation(summary = "Merge set of specified launches in common one", description =
       "This operation merges a set of launches into a common one. "
@@ -433,7 +433,7 @@ public LaunchResourceOld mergeLaunchesOldUuid(@PathVariable String projectName,
       @Parameter(description = "Merge launches request body", required = true) @RequestBody
       @Validated MergeLaunchesRQ mergeLaunchesRQ, @AuthenticationPrincipal ReportPortalUser user) {
     var launchResource = mergeLaunchesHandler.mergeLaunches(
-        projectExtractor.extractProjectDetails(user, normalizeId(projectName)), user,
+        projectExtractor.extractMembershipDetails(user, normalizeId(projectName)), user,
         mergeLaunchesRQ
     );
     return launchConverter.TO_RESOURCE_OLD.apply(launchResource);