Merge pull request #4073 from nextcloud/fix/enhance-booking (09428f52) · Commits · e / infra / ecloud / nextcloud-apps / calendar

lib/Controller/BookingController.php

+20 −10

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ use OCP\AppFramework\Services\IInitialState;
		use OCP\AppFramework\Utility\ITimeFactory;
		use OCP\DB\Exception;
		use OCP\IRequest;
		use OCP\Mail\IMailer;
		use Psr\Log\LoggerInterface;

		class BookingController extends Controller {
		@@ -65,6 +66,9 @@ class BookingController extends Controller {
		/** @var LoggerInterface */
		private $logger;

		/** @var IMailer */
		private $mailer;

		public function __construct(string $appName,
		IRequest $request,
		ITimeFactory $timeFactory,
		@@ -72,7 +76,8 @@ class BookingController extends Controller {
		BookingService $bookingService,
		AppointmentConfigService $appointmentConfigService,
		URLGenerator $urlGenerator,
		LoggerInterface $logger) {
		LoggerInterface $logger,
		IMailer $mailer) {
		parent::__construct($appName, $request);

		$this->bookingService = $bookingService;
		@@ -81,6 +86,7 @@ class BookingController extends Controller {
		$this->initialState = $initialState;
		$this->urlGenerator = $urlGenerator;
		$this->logger = $logger;
		$this->mailer = $mailer;
		}

		/**
		@@ -161,6 +167,10 @@ class BookingController extends Controller {
		string $email,
		string $description,
		string $timeZone): JsonResponse {
		if (!$this->mailer->validateMailAddress($email)) {
		return JsonResponse::fail('Invalid email address', Http::STATUS_UNPROCESSABLE_ENTITY);
		}

		if ($start > $end) {
		return JsonResponse::fail('Invalid time range', Http::STATUS_UNPROCESSABLE_ENTITY);
		}

tests/php/unit/Controller/BookingControllerTest.php

+119 −1

Original line number	Diff line number	Diff line
		@@ -27,8 +27,12 @@ namespace OCA\Calendar\Controller;
		use ChristophWurst\Nextcloud\Testing\TestCase;
		use DateTimeZone;
		use Exception;
		use InvalidArgumentException;
		use OC\URLGenerator;
		use OCA\Calendar\Db\AppointmentConfig;
		use OCA\Calendar\Db\Booking;
		use OCA\Calendar\Exception\NoSlotFoundException;
		use OCA\Calendar\Exception\ServiceException;
		use OCA\Calendar\Service\Appointments\AppointmentConfigService;
		use OCA\Calendar\Service\Appointments\BookingService;
		use OCP\AppFramework\Services\IInitialState;
		@@ -38,6 +42,7 @@ use OCP\Contacts\IManager;
		use OCP\IInitialStateService;
		use OCP\IRequest;
		use OCP\IUser;
		use OCP\Mail\IMailer;
		use PHPUnit\Framework\MockObject\MockObject;
		use Psr\Log\LoggerInterface;
		use Safe\DateTimeImmutable;
		@@ -80,6 +85,9 @@ class BookingControllerTest extends TestCase {
		/** @var mixed\|MockObject\|LoggerInterface */
		private $logger;

		/** @var IMailer\|MockObject */
		private $mailer;

		protected function setUp():void {
		parent::setUp();

		@@ -95,6 +103,7 @@ class BookingControllerTest extends TestCase {
		$this->apptService = $this->createMock(AppointmentConfigService::class);
		$this->urlGenerator = $this->createMock(URLGenerator::class);
		$this->logger = $this->createMock(LoggerInterface::class);
		$this->mailer = $this->createMock(IMailer::class);
		$this->controller = new BookingController(
		$this->appName,
		$this->request,
		@@ -103,7 +112,8 @@ class BookingControllerTest extends TestCase {
		$this->bookingService,
		$this->apptService,
		$this->urlGenerator,
		$this->logger
		$this->logger,
		$this->mailer
		);
		}

		@@ -171,4 +181,112 @@ class BookingControllerTest extends TestCase {

		$this->controller->getBookableSlots($apptConfg->getId(), $start,'Europe/Berlin');
		}

		public function testBook(): void {
		$email = 'penny@stardewvalley.edu';
		$config = new AppointmentConfig();

		$this->mailer->expects(self::once())
		->method('validateMailAddress')
		->with($email)
		->willReturn(true);
		$this->apptService->expects(self::once())
		->method('findById')
		->willReturn($config);
		$this->bookingService->expects(self::once())
		->method('book')
		->with($config, 1, 1, 'Hook/Neverland', 'Test', $email, 'Test')
		->willReturn(new Booking());

		$this->controller->bookSlot(1, 1, 1, 'Test', $email, 'Test', 'Hook/Neverland');
		}


		public function testBookInvalidTimeZone(): void {
		$email = 'penny@stardewvalley.edu';
		$config = new AppointmentConfig();

		$this->mailer->expects(self::once())
		->method('validateMailAddress')
		->with($email)
		->willReturn(true);
		$this->apptService->expects(self::once())
		->method('findById')
		->willReturn($config);
		$this->bookingService->expects(self::once())
		->method('book')
		->with($config, 1, 1, 'Hook/Neverland', 'Test', $email, 'Test')
		->willThrowException(new InvalidArgumentException());

		$this->controller->bookSlot(1, 1, 1, 'Test', $email, 'Test', 'Hook/Neverland');
		}

		public function testBookInvalidSlot(): void {
		$email = 'penny@stardewvalley.edu';
		$config = new AppointmentConfig();

		$this->mailer->expects(self::once())
		->method('validateMailAddress')
		->with($email)
		->willReturn(true);
		$this->apptService->expects(self::once())
		->method('findById')
		->willReturn($config);
		$this->bookingService->expects(self::once())
		->method('book')
		->with($config, 1, 1, 'Europe/Berlin', 'Test', $email, 'Test')
		->willThrowException(new NoSlotFoundException());

		$this->controller->bookSlot(1, 1, 1, 'Test', $email, 'Test', 'Europe/Berlin');
		}

		public function testBookInvalidBooking(): void {
		$email = 'penny@stardewvalley.edu';
		$config = new AppointmentConfig();

		$this->mailer->expects(self::once())
		->method('validateMailAddress')
		->with($email)
		->willReturn(true);
		$this->apptService->expects(self::once())
		->method('findById')
		->willReturn($config);
		$this->bookingService->expects(self::once())
		->method('book')
		->with($config, 1, 1, 'Europe/Berlin', 'Test', $email, 'Test')
		->willThrowException(new ServiceException());

		$this->controller->bookSlot(1, 1, 1, 'Test', $email, 'Test', 'Europe/Berlin');
		}

		public function testBookInvalidId(): void {
		$email = 'penny@stardewvalley.edu';
		$this->mailer->expects(self::once())
		->method('validateMailAddress')
		->with($email)
		->willReturn(true);
		$this->apptService->expects(self::once())
		->method('findById')
		->willThrowException(new ServiceException());
		$this->bookingService->expects(self::never())
		->method('book');

		$this->controller->bookSlot(1, 1, 1, 'Test', $email, 'Test', 'Europe/Berlin');
		}


		public function testBookInvalidEmail(): void {
		$email = 'testing-abcdef';

		$this->mailer->expects(self::once())
		->method('validateMailAddress')
		->with($email)
		->willReturn(false);
		$this->apptService->expects(self::never())
		->method('findById');
		$this->bookingService->expects(self::never())
		->method('book');

		$this->controller->bookSlot(1, 1, 1, 'Test', $email, 'Test', 'Europe/Berlin');
		}
		}