Skip to content
This repository was archived by the owner on Feb 26, 2021. It is now read-only.
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -256,16 +256,14 @@ public String getFilename() {
}
/**
* When DefectDojo >= 1.5.4 is used, testType can be given. Add testName in case DefectDojo >= 1.5.4 is used
* Using testName for each branch leads to multiple issues in DefectDojo, so it is not recommended
*/
private Optional<Long> getTestIdByEngagementName(long engagementId, String testName, long offset) {
UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(defectDojoUrl + "/api/v2/tests")
.queryParam("engagement", Long.toString(engagementId))
.queryParam("limit", Long.toString(50L))
.queryParam("offset", Long.toString(offset));
if(testName == null) {
LOG.warn("TestName must be set unique, e.g. with time");
return Optional.empty();
} else {
if(testName != null && !testName.isEmpty()) {
builder.queryParam("testType", testName);
}

Expand All @@ -275,20 +273,25 @@ private Optional<Long> getTestIdByEngagementName(long engagementId, String testN
ResponseEntity<DefectDojoResponse<TestResponse>> response = restTemplate.exchange(builder.toUriString(), HttpMethod.GET, engagementRequest, new ParameterizedTypeReference<DefectDojoResponse<TestResponse>>(){});

Optional<Long> testResponseId = null;
for(TestResponse test : response.getBody().getResults()){
if(testName == null || test.getTitle().equals(testName)){
Optional<Long> latestTestResponseId = Optional.empty();
for(TestResponse test : response.getBody().getResults()) {
if(testName == null || (test.getTitle() != null && test.getTitle().equals(testName))) {
testResponseId = Optional.of(test.getId());
}
if(!latestTestResponseId.isPresent() || latestTestResponseId.get() < test.getId()) {
latestTestResponseId = Optional.of(test.getId());
}

}
if(testResponseId != null) {
return testResponseId;
}

if(response.getBody().getNext() != null){
if(response.getBody().getNext() != null) {
return getTestIdByEngagementName(engagementId, testName, offset + 1);
}
LOG.warn("Test with name '{}' not found.", testName);
return Optional.empty();
LOG.info("Test with name '{}' not found, using latest.", testName);
return latestTestResponseId;
}
/*
* Be aware that using latest might results in "conflicting" "latest" in case a new test is added while requesting latest
Expand Down