Skip to content

handle all status instead of one #3240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: temp/activate_traffic_jobs
Choose a base branch
from
Open

handle all status instead of one #3240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions libs/utils/src/main/java/com/akto/api_clients/JiraApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import okhttp3.Credentials;
Expand Down Expand Up @@ -199,7 +201,7 @@ private static String buildJql(String projectKey, int updatedAfter) {

// add pagination if issue size is greater than 1000
public static Map<Integer, List<String>> getTransitions(JiraIntegration jira, List<String> issueKeys,
String targetStatusName) throws Exception {
List<String> targetStatusName) throws Exception {
if (issueKeys.size() > 1000) {
throw new Exception(
"Issue keys list size cannot exceed 1000. Jira transition API supports 1000 issues at a time.");
Expand Down Expand Up @@ -230,21 +232,25 @@ public static Map<Integer, List<String>> getTransitions(JiraIntegration jira, Li
}
}

private static Map<Integer, List<String>> parseTransitions(JsonNode root, String statusNameFilter) {
private static Map<Integer, List<String>> parseTransitions(JsonNode root, List<String> jiraStatusNames) {
Set<String> statusWhitelist = jiraStatusNames.stream()
.map(String::toLowerCase)
.collect(Collectors.toSet());

Map<Integer, List<String>> transitionMap = new HashMap<>();

JsonNode availableTransitions = root.path("availableTransitions");
for (JsonNode block : availableTransitions) {
for (JsonNode block : root.path("availableTransitions")) {
List<String> issues = new ArrayList<>();
for (JsonNode issueNode : block.path("issues")) {
issues.add(issueNode.asText());
}

for (JsonNode transition : block.path("transitions")) {
String statusName = transition.path("to").path("statusName").asText();
if (statusName.equalsIgnoreCase(statusNameFilter)) {
String statusName = transition.path("to").path("statusName").asText().toLowerCase();
if (statusWhitelist.contains(statusName)) {
int transitionId = transition.path("transitionId").asInt();
transitionMap.computeIfAbsent(transitionId, k -> new ArrayList<>()).addAll(issues);
break;
}
}
}
Expand Down
15 changes: 6 additions & 9 deletions libs/utils/src/main/java/com/akto/jobs/executors/TicketSyncJobExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.Collections;
import java.util.TimeZone;
import okhttp3.Credentials;
import okhttp3.Request;
Expand Down Expand Up @@ -185,9 +186,6 @@ private void updateJiraTickets(JiraIntegration jira, List<TestingRunIssues> issu
logAndCollect(Level.DEBUG, "Found {} jira statuses mapped with akto status {}. Using the first one", jiraStatuses.size(),
aktoStatus);

// Use the first mapped status as the target
String targetJiraStatus = jiraStatuses.get(0);

// Extract issue keys for this status group
List<String> issueKeys = statusIssues.stream()
.map(TestingRunIssues::getTicketId)
Expand All @@ -201,12 +199,12 @@ private void updateJiraTickets(JiraIntegration jira, List<TestingRunIssues> issu

// Get transitions for these issues to reach the target status
try {
Map<Integer, List<String>> transitionsMap = JiraApiClient.getTransitions(jira, issueKeys, targetJiraStatus);
Map<Integer, List<String>> transitionsMap = JiraApiClient.getTransitions(jira, issueKeys, jiraStatuses);

updateJobHeartbeat(job);
if (transitionsMap.isEmpty()) {
logAndCollect(Level.INFO, "No transitions found for issues with Akto status: {} to Jira status: {}",
aktoStatus, targetJiraStatus);
aktoStatus, jiraStatuses);
continue;
}

Expand Down Expand Up @@ -241,7 +239,7 @@ private void updateJiraTickets(JiraIntegration jira, List<TestingRunIssues> issu

if (success) {
logAndCollect(Level.DEBUG, "Successfully transitioned {} Jira tickets to status: {}. ticketIds: {}",
issueKeys.size(), targetJiraStatus, issueKeys);
issueKeys.size(), jiraStatuses, issueKeys);
// Update last updated timestamp in Akto
List<WriteModel<TestingRunIssues>> writeModels = new ArrayList<>();
for (TestingRunIssues issue : statusIssues) {
Expand All @@ -256,12 +254,11 @@ private void updateJiraTickets(JiraIntegration jira, List<TestingRunIssues> issu
TestingRunIssuesDao.instance.getMCollection().bulkWrite(writeModels);
}
} else {
logAndCollect(Level.ERROR, "Failed to transition Jira tickets to status: {}. ticketIds: {}", targetJiraStatus,
issueKeys);
logger.error("Failed to transition Jira tickets. ticketIds: {}", issueKeys);
}
} catch (Exception e) {
logAndCollect(Level.ERROR, "Error getting transitions or performing bulk transition for Akto status: {} to Jira status: {}",
aktoStatus, targetJiraStatus, e);
aktoStatus, jiraStatuses, e);
}
}
} catch (Exception e) {
Expand Down
Loading