Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ dependencies {
implementation 'com.epam.reportportal:service-api'
annotationProcessor 'com.epam.reportportal:service-api'
} else {
implementation 'com.github.reportportal:service-api:0141b9e'
annotationProcessor 'com.github.reportportal:service-api:0141b9e'
implementation 'com.github.reportportal:service-api:17bff83'
annotationProcessor 'com.github.reportportal:service-api:17bff83'
}
implementation 'jakarta.el:jakarta.el-api:6.0.1'
implementation 'org.glassfish:jakarta.el:4.0.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.epam.reportportal.extension.IntegrationGroupEnum;
import com.epam.reportportal.extension.PluginCommand;
import com.epam.reportportal.extension.ReportPortalExtensionPoint;
import com.epam.reportportal.extension.bugtracking.BtsActivityPublisher;
import com.epam.reportportal.extension.command.ExtensionCommand;
import com.epam.reportportal.extension.common.IntegrationTypeProperties;
import com.epam.reportportal.extension.jira.command.GetIssueCommand;
Expand Down Expand Up @@ -135,6 +136,9 @@ public class CloudJiraExtension implements ReportPortalExtensionPoint, Disposabl
@Qualifier("attachmentDataStoreService")
private DataStoreService dataStoreService;

@Autowired
private BtsActivityPublisher btsActivityPublisher;

public CloudJiraExtension(Map<String, Object> initParams) {
resourcesDir = IntegrationTypeProperties.RESOURCES_DIRECTORY.getValue(initParams).map(String::valueOf)
.orElse("");
Expand Down Expand Up @@ -239,7 +243,8 @@ public Map<String, ExtensionCommand<?>> getIntegrationExtensionCommands() {
dataStoreService,
organizationUserRepository,
organizationRepository,
projectUserRepository
projectUserRepository,
btsActivityPublisher
));
return commands.stream().collect(Collectors.toMap(ExtensionCommand::getName, it -> it));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import com.epam.reportportal.base.infrastructure.persistence.entity.project.ProjectRole;
import com.epam.reportportal.base.infrastructure.persistence.entity.user.UserRole;
import com.epam.reportportal.base.infrastructure.rules.exception.ReportPortalException;
import com.epam.reportportal.extension.bugtracking.BtsActivityPublisher;
import com.epam.reportportal.extension.command.AbstractExtensionCommand;
import com.epam.reportportal.extension.jira.api.model.CreatedIssue;
import com.epam.reportportal.extension.jira.api.model.IssueBean;
Expand Down Expand Up @@ -96,6 +97,8 @@ public class PostTicketCommand extends AbstractExtensionCommand<Ticket> {

private final DataStoreService dataStoreService;

private final BtsActivityPublisher btsActivityPublisher;

private static final String LINKED_ISSUE_TYPE = "Relates";

public PostTicketCommand(ProjectRepository projectRepository,
Expand All @@ -104,12 +107,14 @@ public PostTicketCommand(ProjectRepository projectRepository,
JIRATicketDescriptionService descriptionService, DataStoreService dataStoreService,
OrganizationUserRepository organizationUserRepository,
OrganizationRepository organizationRepository,
ProjectUserRepository projectUserRepository) {
ProjectUserRepository projectUserRepository,
BtsActivityPublisher btsActivityPublisher) {
super(projectRepository, organizationUserRepository, organizationRepository, projectUserRepository);
this.requestEntityConverter = requestEntityConverter;
this.cloudJiraClientProvider = cloudJiraClientProvider;
this.descriptionService = descriptionService;
this.dataStoreService = dataStoreService;
this.btsActivityPublisher = btsActivityPublisher;

// Set required permission levels
this.minProjectRole = ProjectRole.EDITOR;
Expand Down Expand Up @@ -201,10 +206,12 @@ protected Ticket invokeCommand(Integration integration, PluginCommandRQ pluginCo
linkIssues(client, issue, linkedIssue);
}

return JIRATicketUtils.toTicket(issue,
Ticket ticket = JIRATicketUtils.toTicket(issue,
CloudJiraProperties.URL.getParam(integration.getParams())
.orElseThrow(() -> new ReportPortalException(UNABLE_INTERACT_WITH_INTEGRATION,
"Url is not specified.")));
btsActivityPublisher.publishTicketPostedEvent(ticket, ticketRQ, pluginCommandRq.getContext(), integration);
return ticket;

} catch (ReportPortalException e) {
throw e;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import static org.mockito.Mockito.when;

import com.epam.reportportal.api.model.PluginCommandRQ;
import com.epam.reportportal.extension.bugtracking.BtsActivityPublisher;
import com.epam.reportportal.extension.jira.command.utils.JIRATicketDescriptionService;
import com.epam.reportportal.extension.jira.utils.SampleData.WorkType;
import com.epam.reportportal.extension.util.RequestEntityConverter;
Expand Down Expand Up @@ -62,6 +63,8 @@ class PostTicketCommandTest extends BaseCommandTest {
TestItemRepository itemRepository;
@Mock
LogRepository logRepository;
@Mock
BtsActivityPublisher btsActivityPublisher;

@ParameterizedTest
@EnumSource(WorkType.class)
Expand Down Expand Up @@ -91,7 +94,7 @@ void postTicketCommand(WorkType issueType) throws JsonProcessingException {

var command = new PostTicketCommand(projectRepository, requestEntityConverter, cloudJiraClientProvider,
new JIRATicketDescriptionService(logRepository, itemRepository), dataStoreService,
organizationUserRepository, organizationRepository, projectUserRepository);
organizationUserRepository, organizationRepository, projectUserRepository, btsActivityPublisher);
Ticket ticket = command.invokeCommand(INTEGRATION, new PluginCommandRQ().arguments(params));

assertNotNull(ticket);
Expand Down
Loading