Skip to content

issue fix #56

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

Merged
gipathak merged 3 commits into from
Jul 3, 2025
Merged

issue fix #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f44734f
issue fix
gipathak Jul 2, 2025
ea44238
Merge branch 'develop' into issue-fix
gipathak Jul 2, 2025
bbee861
issue fix
gipathak Jul 2, 2025
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
2 changes: 1 addition & 1 deletion rally/src/main/java/com/publicissapient/kpidashboard/rally/config/RallyProcessorConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class RallyProcessorConfig {
private String username;
private String password;
private String apiEndpoint;
private int pageSize = 100;
private int pageSize = 200;
private int maxRetries = 3;
private long retryDelay = 5000;
private String[] workspaceIds;
Expand Down
32 changes: 13 additions & 19 deletions rally/src/main/java/com/publicissapient/kpidashboard/rally/service/RallyCommonService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -79,10 +78,6 @@
@Component
public class RallyCommonService {

private static final String RALLY_URL = "https://rally1.rallydev.com/slm/webservice/v2.0";
private static final String API_KEY = "_8BogJQcTuGwVjEemJiAjV0z5SgR2UCSsSnBUu55Y5U";
private static final String PROJECT_NAME = "Core Team";
private static final int PAGE_SIZE = 200; // Number of artifacts per page
private static final String ZSESSIONID = "ZSESSIONID";
private static final String RALLY_ISSUE_REVISION_ENDPOINT = "/Revisions";
public static final String HIERARCHICALREQUIREMENT = "hierarchicalrequirement";
Expand Down Expand Up @@ -293,13 +288,13 @@ public List<HierarchicalRequirement> fetchIssuesBasedOnJql(ProjectConfFieldMappi
public RallyResponse getRqlIssues(ProjectConfFieldMapping projectConfig, String deltaDate, int pageStart) {
RallyResponse rallyResponse = null;
try {
List<HierarchicalRequirement> allArtifacts = getHierarchicalRequirements(pageStart);
List<HierarchicalRequirement> allArtifacts = getHierarchicalRequirements(pageStart,projectConfig);
// Create a RallyResponse object and populate it with the combined results
QueryResult queryResult = new QueryResult();
queryResult.setResults(allArtifacts);
queryResult.setTotalResultCount(allArtifacts.size());
queryResult.setStartIndex(pageStart);
queryResult.setPageSize(PAGE_SIZE);
queryResult.setPageSize(rallyProcessorConfig.getPageSize());

rallyResponse = new RallyResponse();
rallyResponse.setQueryResult(queryResult);
Expand Down Expand Up @@ -404,14 +399,13 @@ public void setRallyIssueHistory(HierarchicalRequirement hierarchicalRequirement
* @param pageStart starting index for pagination
* @return List of HierarchicalRequirement objects including defects
*/
public List<HierarchicalRequirement> getHierarchicalRequirements(int pageStart) {
public List<HierarchicalRequirement> getHierarchicalRequirements(int pageStart,ProjectConfFieldMapping projectConfig) {
Optional<Connection> connectionOptional = projectConfig.getJira().getConnection();
HttpHeaders headers = new HttpHeaders();
headers.set(ZSESSIONID, API_KEY);
if (connectionOptional.isPresent())
headers.set(ZSESSIONID, connectionOptional.get().getAccessToken());
HttpEntity<String> entity = new HttpEntity<>(headers);




// Fetch fields for each artifact type, including Defects for hierarchical requirements
String fetchFields = "FormattedID,Name,Owner,PlanEstimate,ScheduleState,Iteration,CreationDate,LastUpdateDate,RevisionHistory,ObjectID";
String hierarchicalRequirementFetchFields = fetchFields + ",Defects";
Expand All @@ -425,7 +419,7 @@ public List<HierarchicalRequirement> getHierarchicalRequirements(int pageStart)
boolean hasMoreResults = true;
while (hasMoreResults) {
String url = String.format("%s/%s?query=(Project.Name = \"%s\")&fetch=%s&start=%d&pagesize=%d",
RALLY_URL, "defect", PROJECT_NAME, fetchFields + ",Requirement", start, PAGE_SIZE);
connectionOptional.get().getBaseUrl(), "defect", projectConfig.getJira().getProjectKey(), fetchFields + ",Requirement", start, rallyProcessorConfig.getPageSize());
ResponseEntity<RallyResponse> response = restTemplate.exchange(url, HttpMethod.GET, entity,
RallyResponse.class);
if (response.getStatusCode() == HttpStatus.OK) {
Expand Down Expand Up @@ -453,7 +447,7 @@ public List<HierarchicalRequirement> getHierarchicalRequirements(int pageStart)
// Also add to allArtifacts as they are part of the result
allArtifacts.add(defect);
}
start += PAGE_SIZE; // Move to the next page
start += rallyProcessorConfig.getPageSize(); // Move to the next page
} else {
hasMoreResults = false;
}
Expand All @@ -475,7 +469,7 @@ public List<HierarchicalRequirement> getHierarchicalRequirements(int pageStart)

while (hasMoreResults) {
String url = String.format("%s/%s?query=(Project.Name = \"%s\")&fetch=%s&start=%d&pagesize=%d",
RALLY_URL, artifactType, PROJECT_NAME, currentFetchFields, start, PAGE_SIZE);
connectionOptional.get().getBaseUrl(), artifactType, projectConfig.getJira().getProjectKey(), currentFetchFields, start, rallyProcessorConfig.getPageSize());
ResponseEntity<RallyResponse> response = restTemplate.exchange(url, HttpMethod.GET, entity,
RallyResponse.class);
if (response.getStatusCode() == HttpStatus.OK) {
Expand Down Expand Up @@ -509,7 +503,7 @@ public List<HierarchicalRequirement> getHierarchicalRequirements(int pageStart)
processedDefects.add(fullDefect);
} else {
// If not in our map, fetch it directly
fullDefect = fetchDefectDetails(defectRef.getRef(), entity);
fullDefect = fetchDefectDetails(defectRef.getRef(), entity,connectionOptional.get().getBaseUrl());
if (fullDefect != null) {
processedDefects.add(fullDefect);
defectMap.put(fullDefect.getRef(), fullDefect);
Expand All @@ -521,7 +515,7 @@ public List<HierarchicalRequirement> getHierarchicalRequirements(int pageStart)

allArtifacts.add(artifact);
}
start += PAGE_SIZE; // Move to the next page
start += rallyProcessorConfig.getPageSize(); // Move to the next page
} else {
hasMoreResults = false;
}
Expand All @@ -544,7 +538,7 @@ public List<HierarchicalRequirement> getHierarchicalRequirements(int pageStart)
* @param entity HTTP entity with authentication headers
* @return HierarchicalRequirement object with defect details
*/
private HierarchicalRequirement fetchDefectDetails(String defectRef, HttpEntity<String> entity) {
private HierarchicalRequirement fetchDefectDetails(String defectRef, HttpEntity<String> entity, String baseUrl) {
try {
String fetchFields = "FormattedID,Name,Owner,PlanEstimate,ScheduleState,Iteration,CreationDate,LastUpdateDate,RevisionHistory,Requirement";
// Extract the defect ID from the reference URL if needed
Expand All @@ -553,7 +547,7 @@ private HierarchicalRequirement fetchDefectDetails(String defectRef, HttpEntity<
defectId = defectRef.substring(defectRef.lastIndexOf("/") + 1);
}

String url = String.format("%s/defect/%s?fetch=%s", RALLY_URL, defectId, fetchFields);
String url = String.format("%s/defect/%s?fetch=%s", baseUrl, defectId, fetchFields);
ResponseEntity<RallyResponse> response = restTemplate.exchange(url, HttpMethod.GET, entity, RallyResponse.class);

if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
Expand Down