Move dto transformation into services
This commit is contained in:
@@ -1,14 +1,16 @@
|
||||
package ru.serega6531.packmate.controller;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.serega6531.packmate.model.Packet;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import ru.serega6531.packmate.model.pojo.PacketDto;
|
||||
import ru.serega6531.packmate.model.pojo.PacketPagination;
|
||||
import ru.serega6531.packmate.service.StreamService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/packet/")
|
||||
@@ -23,10 +25,7 @@ public class PacketController {
|
||||
|
||||
@PostMapping("/{streamId}")
|
||||
public List<PacketDto> getPacketsForStream(@PathVariable long streamId, @RequestBody PacketPagination pagination) {
|
||||
List<Packet> packets = streamService.getPackets(streamId, pagination.getStartingFrom(), pagination.getPageSize());
|
||||
return packets.stream()
|
||||
.map(streamService::packetToDto)
|
||||
.collect(Collectors.toList());
|
||||
return streamService.getPackets(streamId, pagination.getStartingFrom(), pagination.getPageSize());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -26,16 +26,12 @@ public class StreamController {
|
||||
|
||||
@PostMapping("/all")
|
||||
public List<StreamDto> getStreams(@RequestBody StreamPagination pagination) {
|
||||
return service.findAll(pagination, Optional.empty(), pagination.isFavorites()).stream()
|
||||
.map(service::streamToDto)
|
||||
.toList();
|
||||
return service.findAll(pagination, Optional.empty(), pagination.isFavorites());
|
||||
}
|
||||
|
||||
@PostMapping("/{port}")
|
||||
public List<StreamDto> getStreams(@PathVariable int port, @RequestBody StreamPagination pagination) {
|
||||
return service.findAll(pagination, Optional.of(port), pagination.isFavorites()).stream()
|
||||
.map(service::streamToDto)
|
||||
.toList();
|
||||
return service.findAll(pagination, Optional.of(port), pagination.isFavorites());
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/favorite")
|
||||
|
||||
Reference in New Issue
Block a user