API - Added mapping for API request objects.
CI / Docker Lint (push) Successful in 28s

This commit is contained in:
2024-10-01 20:43:25 +02:00
parent 986f422824
commit a495be6bb2
4 changed files with 78 additions and 105 deletions
+35 -47
View File
@@ -16,6 +16,8 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
use OpenApi\Attributes as OA;
use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
use Symfony\Component\HttpKernel\Exception\HttpException;
class SearchRoomsController extends AbstractController
{
@@ -23,7 +25,7 @@ class SearchRoomsController extends AbstractController
* Get availability for all rooms on period.
* For each room, the minimal availability will be returned.
*/
#[Route('/api/search/availability', name: 'app_search_availability', methods: ["POST"])]
#[Route('/api/search/availability', name: 'app_search_availability', methods: ["POST"], format: "json")]
#[OA\Tag(name: "Searchs")]
#[OA\Response(
response: 200,
@@ -42,26 +44,22 @@ class SearchRoomsController extends AbstractController
#[OA\RequestBody(
content: new OA\JsonContent(
type: 'object',
properties: [
new OA\Property(
property: "filter",
ref: new Model(type: SearchAvailabilityPeriodRequest::class),
),
],
ref: new Model(type: SearchAvailabilityPeriodRequest::class),
)
)]
public function getAvailabilityForPeriod(Request $request, RoomAvailabilityRepository $repoAvailability): Response
{
$payload = $request->toArray();
if (\is_null($payload)) {
throw new \Exception('Invalid Payload', 400);
public function getAvailabilityForPeriod(
Request $request,
RoomAvailabilityRepository $repoAvailability,
#[MapRequestPayload()] SearchAvailabilityPeriodRequest $searchRequest
): Response {
if (\is_null($searchRequest)) {
throw new HttpException('Invalid Payload', 400);
}
$filter = $payload["filter"];
$startDate = new \DateTime($filter["startDate"]);
$endDate = new \DateTime($filter["endDate"]);
$rs = $repoAvailability->getAvailabilityForPeriod($startDate, $endDate);
if ($searchRequest->startDate >= $searchRequest->endDate) {
throw new HttpException(400, "startDate cant be before endDate");
}
$rs = $repoAvailability->getAvailabilityForPeriod($searchRequest->startDate, $searchRequest->endDate);
return $this->json(["results" => $rs]);
}
@@ -70,20 +68,18 @@ class SearchRoomsController extends AbstractController
* Get Availability for all rooms on each day of a period.
* (Not used on Front-end APP)
*/
#[Route('/api/search/availabilityDetails', name: 'app_search_availabilityDetails', methods: ["POST"])]
#[Route('/api/search/availabilityDetails', name: 'app_search_availabilityDetails', methods: ["POST"], format: "json")]
#[OA\Tag(name: "Searchs")]
public function getAvailabilityForPeriodDetails(Request $request, RoomAvailabilityRepository $repoAvailability): Response
{
$payload = $request->toArray();
if (\is_null($payload)) {
public function getAvailabilityForPeriodDetails(
Request $request,
RoomAvailabilityRepository $repoAvailability,
#[MapRequestPayload()] SearchAvailabilityPeriodRequest $searchRequest
): Response {
if (\is_null($searchRequest)) {
throw new \Exception('Invalid Payload', 400);
}
$filter = $payload["filter"];
$startDate = new \DateTime($filter["startDate"]);
$endDate = new \DateTime($filter["endDate"]);
$rs = $repoAvailability->getAvailabilityForPeriodDetails($startDate, $endDate);
$rs = $repoAvailability->getAvailabilityForPeriodDetails($searchRequest->startDate, $searchRequest->endDate);
return $this->json(["results" => $rs]);
}
@@ -93,7 +89,7 @@ class SearchRoomsController extends AbstractController
* Returns price for a room category.
* This price is the total for all the selected days by guest number.
*/
#[Route('/api/search/fares', name: 'app_search_faresForCategory', methods: ["POST"])]
#[Route('/api/search/fares', name: 'app_search_faresForCategory', methods: ["POST"], format: "json")]
#[OA\Tag(name: "Searchs")]
#[OA\Response(
response: 200,
@@ -112,37 +108,29 @@ class SearchRoomsController extends AbstractController
#[OA\RequestBody(
content: new OA\JsonContent(
type: 'object',
properties: [
new OA\Property(
property: "filter",
ref: new Model(type: SearchFareCategoryRequest::class),
),
],
ref: new Model(type: SearchFareCategoryRequest::class),
)
)]
public function getFaresForCategoryOnPeriod(Request $request, RoomCategoryRepository $repoCat, PricesService $priceService): Response
{
$payload = $request->toArray();
if (\is_null($payload)) {
public function getFaresForCategoryOnPeriod(
Request $request,
RoomCategoryRepository $repoCat,
PricesService $priceService,
#[MapRequestPayload()] SearchFareCategoryRequest $searchRequest
): Response {
if (\is_null($searchRequest)) {
throw new \Exception('Invalid Payload', 400);
}
$filter = $payload["filter"];
$catId = $filter["roomCategory"];
$roomCategory = $repoCat->find($catId);
$roomCategory = $repoCat->find($searchRequest->roomCategory);
if ($roomCategory === null) {
throw new \Exception('Invalid Category', 400);
}
$startDate = new \DateTime($filter["startDate"]);
$endDate = new \DateTime($filter["endDate"]);
$daysDiff = $startDate->diff($endDate)->days;
if (!$daysDiff || $startDate > $endDate) {
if ($searchRequest->startDate >= $searchRequest->endDate) {
throw new \Exception('Invalid time interval', 400);
}
$fareList = $priceService->getFinalPricesForSearch($roomCategory, $startDate, $endDate);
$fareList = $priceService->getFinalPricesForSearch($roomCategory, $searchRequest->startDate, $searchRequest->endDate);
$rs = [];
foreach ($fareList as $key => $value) {
$rs[] = ["guestNumber" => $key, "price" => $value];