Somnia/SomniaRooms
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel-Garmig
2024-10-01 20:43:25 +02:00
parent 986f422824
commit a495be6bb2
4 changed files with 78 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Controller/BookingController.php
+40 -55
View File
@@ -20,13 +20,14 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Attribute\Route;
use OpenApi\Attributes as OA; use OpenApi\Attributes as OA;
use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
class BookingController extends AbstractController class BookingController extends AbstractController
{ {
/** /**
* Get booking details * Get booking details
*/ */
#[Route('/api/booking/details', name: 'app_booking_details', methods: ["POST"])] #[Route('/api/booking/details', name: 'app_booking_details', methods: ["POST"], format: "json")]
#[OA\Tag(name: "Booking")] #[OA\Tag(name: "Booking")]
#[OA\Response( #[OA\Response(
response: 200, response: 200,
@@ -42,23 +43,22 @@ class BookingController extends AbstractController
ref: new Model(type: BookingDetailsRequest::class), ref: new Model(type: BookingDetailsRequest::class),
) )
)] )]
public function getBookingDetails(Request $request, BookingRepository $repoBooking): JsonResponse public function getBookingDetails(
{ BookingRepository $repoBooking,
$payload = $request->toArray(); #[MapRequestPayload()] BookingDetailsRequest $detailsRequest
if (\is_null($payload)) { ): JsonResponse {
if (\is_null($detailsRequest)) {
throw new \Exception('Invalid Payload', 400); throw new \Exception('Invalid Payload', 400);
} }
$refNumber = $payload["refNumber"]; $bookingList = $repoBooking->findBy(["refNumber" => $detailsRequest->refNumber]);
$customerEmail = $payload["email"];
$bookingList = $repoBooking->findBy(["refNumber" => $refNumber]);
if (\is_null($bookingList) || \count($bookingList) == 0) { if (\is_null($bookingList) || \count($bookingList) == 0) {
throw new HttpException(404, 'Invalid Booking'); throw new HttpException(404, 'Invalid Booking');
} }
$customerBooking = $bookingList[0]; $customerBooking = $bookingList[0];
if ($customerBooking->getBookingCustomer()->getEmail() != $customerEmail) { if ($customerBooking->getBookingCustomer()->getEmail() != $detailsRequest->email) {
throw new HttpException(404, 'Invalid Booking'); throw new HttpException(404, 'Invalid Booking');
} }
@@ -68,7 +68,7 @@ class BookingController extends AbstractController
/** /**
* Create a new Booking. * Create a new Booking.
*/ */
#[Route('/api/booking/create', name: 'app_booking_create', methods: ["POST"])] #[Route('/api/booking/create', name: 'app_booking_create', methods: ["POST"], format: "json")]
#[OA\Tag(name: "Booking")] #[OA\Tag(name: "Booking")]
#[OA\Response( #[OA\Response(
response: 200, response: 200,
@@ -84,25 +84,21 @@ class BookingController extends AbstractController
ref: new Model(type: BookingCreateRequest::class), ref: new Model(type: BookingCreateRequest::class),
) )
)] )]
public function newBooking(Request $request, BookingRepository $repoBooking, EntityManagerInterface $entityManager, public function newBooking(
RoomCategoryRepository $repoCat, RoomAvailabilityRepository $repoAvailability, Request $request,
PricesService $priceSrv): JsonResponse EntityManagerInterface $entityManager,
{ RoomCategoryRepository $repoCat,
$payload = $request->toArray(); RoomAvailabilityRepository $repoAvailability,
if (\is_null($payload)) { PricesService $priceSrv,
#[MapRequestPayload()] BookingCreateRequest $createRequest
): JsonResponse {
if (\is_null($createRequest)) {
throw new HttpException('Invalid Payload', 400); throw new HttpException('Invalid Payload', 400);
} }
$booking = new Booking(); $booking = new Booking();
try { try {
$reqArrivalDate = $payload["arrivalDate"]; if ($createRequest->arrivalDate >= $createRequest->departureDate) {
$reqDepartureDate = $payload["departureDate"];
$arrivalDate = new \DateTime($reqArrivalDate);
$departureDate = new \DateTime($reqDepartureDate);
if ($arrivalDate >= $departureDate) {
throw new HttpException(400, "Arrival cant be before departure"); throw new HttpException(400, "Arrival cant be before departure");
} }
@@ -112,52 +108,42 @@ class BookingController extends AbstractController
// Create booking from request data. // Create booking from request data.
$booking->setBookingTime($currentTime); $booking->setBookingTime($currentTime);
$booking->setArrivalDate($arrivalDate); $booking->setArrivalDate($createRequest->arrivalDate);
$booking->setDepartureDate($departureDate); $booking->setDepartureDate($createRequest->departureDate);
$booking->setBookingCustomer($createRequest->customerDetails);
//TODOME: Improve refNumber generation.
$highest_id = $entityManager->createQueryBuilder() $highest_id = $entityManager->createQueryBuilder()
->select('MAX(e.id)') ->select('MAX(e.id)')
->from('App\Entity\Booking', 'e') ->from('App\Entity\Booking', 'e')
->getQuery() ->getQuery()
->getSingleScalarResult(); ->getSingleScalarResult();
$booking->setRefNumber($currentTime->format("Y") . $highest_id + 1); $booking->setRefNumber($currentTime->format("Y") . $highest_id + 1);
$entityManager->persist($booking); $entityManager->persist($booking);
// Create booking customer. if (\count($createRequest->rooms) == 0) {
$reqCustomer = $payload["customerDetails"];
$bookingCustomer = new BookingCustomer();
$bookingCustomer->setName($reqCustomer["name"]);
$bookingCustomer->setSurname($reqCustomer["surname"]);
$bookingCustomer->setEmail($reqCustomer["email"]);
$bookingCustomer->setPhoneNumber($reqCustomer["phoneNumber"]);
$bookingCustomer->setBooking($booking);
$entityManager->persist($bookingCustomer);
$reqRoomList = $payload["rooms"];
if (\count($reqRoomList) == 0) {
throw new HttpException(400, "Se debe indicar al menos una habitación"); throw new HttpException(400, "Se debe indicar al menos una habitación");
} }
// Create each room. // Create each room.
foreach ($reqRoomList as $roomItem) { foreach ($createRequest->rooms as $roomItem) {
$room = new BookingRoom(); $room = new BookingRoom();
$room->setBooking($booking); $room->setBooking($booking);
//Get Room category. //Get Room category.
$roomCategory = $repoCat->find($roomItem["roomCategory"]); $roomCategory = $repoCat->find($roomItem->roomCategory);
if ($roomCategory == null) { if ($roomCategory == null) {
throw new HttpException(400, "La RoomCategory no es válida."); throw new HttpException(400, "La RoomCategory no es válida.");
} }
//Check room availability. //Check room availability.
$amountAvailable = $repoAvailability->getAvailabilityForCategoryInPeriod($roomCategory, $arrivalDate, $departureDate); $amountAvailable = $repoAvailability->getAvailabilityForCategoryInPeriod($roomCategory, $createRequest->arrivalDate, $createRequest->departureDate);
$selectedAmount = $roomItem['amount']; $selectedAmount = $roomItem->amount;
$selectedGuestAmount = $roomItem["guestNumber"]; $selectedGuestAmount = $roomItem->guestNumber;
if($amountAvailable == null || $selectedAmount > $amountAvailable) { if ($amountAvailable == null || $selectedAmount > $amountAvailable) {
throw new HttpException(400, "No se pueden reservar más habitaciones de las disponibles."); throw new HttpException(400, "No se pueden reservar más habitaciones de las disponibles.");
} }
@@ -166,17 +152,17 @@ class BookingController extends AbstractController
$room->setAmount($selectedAmount); $room->setAmount($selectedAmount);
//Get Price for period. //Get Price for period.
$priceList = $priceSrv->getFinalPricesForSearch($roomCategory, $arrivalDate, $departureDate); $priceList = $priceSrv->getFinalPricesForSearch($roomCategory, $createRequest->arrivalDate, $createRequest->departureDate);
$priceFound = false; $priceFound = false;
foreach ($priceList as $key => $value) { foreach ($priceList as $key => $value) {
if($key == $selectedGuestAmount) { if ($key == $selectedGuestAmount) {
$room->setRoomPrice($value); $room->setRoomPrice($value);
$priceFound = true; $priceFound = true;
break; break;
} }
} }
if(!$priceFound) { if (!$priceFound) {
throw new HttpException( throw new HttpException(
500, 500,
"No se puedo obtener el precio para la categoría: " . $roomCategory->getId() . " , guests: " . $selectedGuestAmount "No se puedo obtener el precio para la categoría: " . $roomCategory->getId() . " , guests: " . $selectedGuestAmount
@@ -186,12 +172,11 @@ class BookingController extends AbstractController
$entityManager->persist($room); $entityManager->persist($room);
//If booking is nice, let's update current availability. //If booking is nice, let's update current availability.
$repoAvailability->updateAvailabilityForRoomCategoryOnPeriod($roomCategory, $arrivalDate, $departureDate, $selectedAmount, true); //Update using "diff" mode. $repoAvailability->updateAvailabilityForRoomCategoryOnPeriod($roomCategory, $createRequest->arrivalDate, $createRequest->departureDate, $selectedAmount, true); //Update using "diff" mode.
} }
$entityManager->commit(); $entityManager->commit();
$entityManager->flush(); $entityManager->flush();
} catch (\Throwable $th) { } catch (\Throwable $th) {
$entityManager->rollback(); $entityManager->rollback();
throw $th; throw $th;
src/Controller/SearchRoomsController.php
+35 -47
View File
@@ -16,6 +16,8 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Attribute\Route;
use OpenApi\Attributes as OA; use OpenApi\Attributes as OA;
use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
use Symfony\Component\HttpKernel\Exception\HttpException;
class SearchRoomsController extends AbstractController class SearchRoomsController extends AbstractController
{ {
@@ -23,7 +25,7 @@ class SearchRoomsController extends AbstractController
* Get availability for all rooms on period. * Get availability for all rooms on period.
* For each room, the minimal availability will be returned. * 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\Tag(name: "Searchs")]
#[OA\Response( #[OA\Response(
response: 200, response: 200,
@@ -42,26 +44,22 @@ class SearchRoomsController extends AbstractController
#[OA\RequestBody( #[OA\RequestBody(
content: new OA\JsonContent( content: new OA\JsonContent(
type: 'object', type: 'object',
properties: [ ref: new Model(type: SearchAvailabilityPeriodRequest::class),
new OA\Property(
property: "filter",
ref: new Model(type: SearchAvailabilityPeriodRequest::class),
),
],
) )
)] )]
public function getAvailabilityForPeriod(Request $request, RoomAvailabilityRepository $repoAvailability): Response public function getAvailabilityForPeriod(
{ Request $request,
$payload = $request->toArray(); RoomAvailabilityRepository $repoAvailability,
if (\is_null($payload)) { #[MapRequestPayload()] SearchAvailabilityPeriodRequest $searchRequest
throw new \Exception('Invalid Payload', 400); ): Response {
if (\is_null($searchRequest)) {
throw new HttpException('Invalid Payload', 400);
} }
$filter = $payload["filter"];
$startDate = new \DateTime($filter["startDate"]); if ($searchRequest->startDate >= $searchRequest->endDate) {
$endDate = new \DateTime($filter["endDate"]); throw new HttpException(400, "startDate cant be before endDate");
}
$rs = $repoAvailability->getAvailabilityForPeriod($startDate, $endDate); $rs = $repoAvailability->getAvailabilityForPeriod($searchRequest->startDate, $searchRequest->endDate);
return $this->json(["results" => $rs]); return $this->json(["results" => $rs]);
} }
@@ -70,20 +68,18 @@ class SearchRoomsController extends AbstractController
* Get Availability for all rooms on each day of a period. * Get Availability for all rooms on each day of a period.
* (Not used on Front-end APP) * (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")] #[OA\Tag(name: "Searchs")]
public function getAvailabilityForPeriodDetails(Request $request, RoomAvailabilityRepository $repoAvailability): Response public function getAvailabilityForPeriodDetails(
{ Request $request,
$payload = $request->toArray(); RoomAvailabilityRepository $repoAvailability,
if (\is_null($payload)) { #[MapRequestPayload()] SearchAvailabilityPeriodRequest $searchRequest
): Response {
if (\is_null($searchRequest)) {
throw new \Exception('Invalid Payload', 400); throw new \Exception('Invalid Payload', 400);
} }
$filter = $payload["filter"];
$startDate = new \DateTime($filter["startDate"]); $rs = $repoAvailability->getAvailabilityForPeriodDetails($searchRequest->startDate, $searchRequest->endDate);
$endDate = new \DateTime($filter["endDate"]);
$rs = $repoAvailability->getAvailabilityForPeriodDetails($startDate, $endDate);
return $this->json(["results" => $rs]); return $this->json(["results" => $rs]);
} }
@@ -93,7 +89,7 @@ class SearchRoomsController extends AbstractController
* Returns price for a room category. * Returns price for a room category.
* This price is the total for all the selected days by guest number. * 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\Tag(name: "Searchs")]
#[OA\Response( #[OA\Response(
response: 200, response: 200,
@@ -112,37 +108,29 @@ class SearchRoomsController extends AbstractController
#[OA\RequestBody( #[OA\RequestBody(
content: new OA\JsonContent( content: new OA\JsonContent(
type: 'object', type: 'object',
properties: [ ref: new Model(type: SearchFareCategoryRequest::class),
new OA\Property(
property: "filter",
ref: new Model(type: SearchFareCategoryRequest::class),
),
],
) )
)] )]
public function getFaresForCategoryOnPeriod(Request $request, RoomCategoryRepository $repoCat, PricesService $priceService): Response public function getFaresForCategoryOnPeriod(
{ Request $request,
$payload = $request->toArray(); RoomCategoryRepository $repoCat,
if (\is_null($payload)) { PricesService $priceService,
#[MapRequestPayload()] SearchFareCategoryRequest $searchRequest
): Response {
if (\is_null($searchRequest)) {
throw new \Exception('Invalid Payload', 400); throw new \Exception('Invalid Payload', 400);
} }
$filter = $payload["filter"];
$catId = $filter["roomCategory"]; $roomCategory = $repoCat->find($searchRequest->roomCategory);
$roomCategory = $repoCat->find($catId);
if ($roomCategory === null) { if ($roomCategory === null) {
throw new \Exception('Invalid Category', 400); throw new \Exception('Invalid Category', 400);
} }
$startDate = new \DateTime($filter["startDate"]); if ($searchRequest->startDate >= $searchRequest->endDate) {
$endDate = new \DateTime($filter["endDate"]);
$daysDiff = $startDate->diff($endDate)->days;
if (!$daysDiff || $startDate > $endDate) {
throw new \Exception('Invalid time interval', 400); throw new \Exception('Invalid time interval', 400);
} }
$fareList = $priceService->getFinalPricesForSearch($roomCategory, $startDate, $endDate); $fareList = $priceService->getFinalPricesForSearch($roomCategory, $searchRequest->startDate, $searchRequest->endDate);
$rs = []; $rs = [];
foreach ($fareList as $key => $value) { foreach ($fareList as $key => $value) {
$rs[] = ["guestNumber" => $key, "price" => $value]; $rs[] = ["guestNumber" => $key, "price" => $value];
src/Request/BookingCreateRequest.php
+1 -1
View File
@@ -19,7 +19,7 @@ class BookingCreateRequest
public BookingCustomer $customerDetails; public BookingCustomer $customerDetails;
/** /**
* @var array<BookingCreateRoomItem> * @var BookingCreateRoomItem[]
*/ */
#[OA\Property( #[OA\Property(
description: 'Rooms to book', description: 'Rooms to book',
src/Request/BookingCreateRoomItem.php
+1 -1
View File
@@ -7,7 +7,7 @@ use OpenApi\Attributes as OA;
class BookingCreateRoomItem class BookingCreateRoomItem
{ {
#[OA\Property(description: 'Room category ID')] #[OA\Property(description: 'Room category ID')]
public string $roomCategory; public int $roomCategory;
#[OA\Property(description: 'Guest number for the room')] #[OA\Property(description: 'Guest number for the room')]
public int $guestNumber; public int $guestNumber;