TSK-299 added WorkbasketQuery

This commit is contained in:
Lars Leo Grätz 2018-02-15 17:44:03 +01:00 committed by Holger Hagen
parent 468d2668ff
commit bee1af35a5
2 changed files with 21 additions and 16 deletions

View File

@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import pro.taskana.Workbasket;
import pro.taskana.WorkbasketQuery;
import pro.taskana.WorkbasketService;
import pro.taskana.WorkbasketSummary;
import pro.taskana.exceptions.NotAuthorizedException;
@ -32,12 +33,14 @@ public class WorkbasketDefinitionController {
@GetMapping
public ResponseEntity<List<WorkbasketDefinition>> exportWorkbaskets(@RequestParam(required = false) String domain) {
try {
WorkbasketQuery workbasketQuery = workbasketService.createWorkbasketQuery();
List<WorkbasketSummary> workbasketSummaryList = domain != null
? workbasketQuery.domainIn(domain).list()
: workbasketQuery.list();
List<WorkbasketDefinition> basketExports = new ArrayList<>();
for (WorkbasketSummary summary : workbasketService.getWorkbaskets()) {
if (domain == null || summary.getDomain().equals(domain)) {
Workbasket workbasket = workbasketService.getWorkbasket(summary.getId());
basketExports.add(workbasketDefinitionMapper.toResource(workbasket));
}
for (WorkbasketSummary summary : workbasketSummaryList) {
Workbasket workbasket = workbasketService.getWorkbasket(summary.getId());
basketExports.add(workbasketDefinitionMapper.toResource(workbasket));
}
return new ResponseEntity<>(basketExports, HttpStatus.OK);
} catch (WorkbasketNotFoundException e) {

View File

@ -10,13 +10,15 @@ import java.util.Set;
* this class represents a workbasket including its distro targets and authorisations.
*/
public class WorkbasketDefinition {
private final Workbasket workbasket;
private final Set<String> distroTargets;
private final Set<String> distributionTargets;
private final List<WorkbasketAccessItem> authorizations;
public WorkbasketDefinition(Workbasket workbasket, Set<String> distroTargets, List<WorkbasketAccessItem> authorizations) {
public WorkbasketDefinition(Workbasket workbasket, Set<String> distributionTargets,
List<WorkbasketAccessItem> authorizations) {
this.workbasket = workbasket;
this.distroTargets = distroTargets;
this.distributionTargets = distributionTargets;
this.authorizations = authorizations;
}
@ -24,19 +26,19 @@ public class WorkbasketDefinition {
return workbasket;
}
public Set<String> getDistroTargets() {
return distroTargets;
public Set<String> getdistributionTargets() {
return distributionTargets;
}
public List<WorkbasketAccessItem> getAuthorizations() {
return authorizations;
}
@Override
public String toString() {
return "WorkbasketDefinition{"
+ "workbasket=" + workbasket.toString()
+ ", authorizations=" + authorizations.toString()
+ '}';
@Override public String toString() {
return "WorkbasketDefinition{" +
"workbasket=" + workbasket +
", distributionTargets=" + distributionTargets +
", authorizations=" + authorizations +
'}';
}
}