Исправлены избранные стримы

This commit is contained in:
serega6531
2019-05-19 00:21:03 +03:00
parent 90c113731c
commit abf5273adf
3 changed files with 80 additions and 19 deletions

View File

@@ -27,14 +27,22 @@ public class StreamController {
@PostMapping("/all")
public List<Stream> getStreams(@RequestBody Pagination pagination) {
return streamService.findAll(pagination);
if (pagination.isFavorites()) {
return streamService.findFavorites(pagination);
} else {
return streamService.findAll(pagination);
}
}
@PostMapping("/{port}")
public List<Stream> getStreams(@PathVariable int port, @RequestBody Pagination pagination) {
final Optional<CtfService> serviceOptional = servicesService.findByPort(port);
if(serviceOptional.isPresent()) {
return streamService.findAllByService(pagination, serviceOptional.get());
if (serviceOptional.isPresent()) {
if (pagination.isFavorites()) {
return streamService.findFavoritesByService(pagination, serviceOptional.get());
} else {
return streamService.findAllByService(pagination, serviceOptional.get());
}
} else {
return Collections.emptyList();
}