Feature mpdzbs 887 zmscitizenapi post reserve appointment and refactor

zmscitizenapi/bootstrap.php

@@ -22,6 +22,8 @@
 // Set option for environment, routing, logging and templating
 \BO\Slim\Bootstrap::init();
 
+\App::$slim->addBodyParsingMiddleware();
+
 \App::$http = new \BO\Zmsclient\Http(\App::ZMS_API_URL);
 //\BO\Zmsclient\Psr7\Client::$curlopt = \App::$http_curl_config;
 

zmscitizenapi/routing.php

@@ -24,7 +24,7 @@
  */
 \App::$slim->get(
     '/services/',
-    '\BO\Zmscitizenapi\Controllers\ServicesList'
+    '\BO\Zmscitizenapi\ServicesList'
 )
     ->setName("ServicesList");
 
@@ -48,7 +48,7 @@
  */
 \App::$slim->get(
     '/scopes/',
-    '\BO\Zmscitizenapi\Controllers\ScopesList'
+    '\BO\Zmscitizenapi\ScopesList'
 )
     ->setName("ScopesList");
 
@@ -72,7 +72,7 @@
  */
 \App::$slim->get(
     '/offices/',
-    '\BO\Zmscitizenapi\Controllers\OfficesList'
+    '\BO\Zmscitizenapi\OfficesList'
 )
     ->setName("OfficesList");
 
@@ -96,7 +96,7 @@
  */
 \App::$slim->get(
     '/offices-and-services/',
-    '\BO\Zmscitizenapi\Controllers\OfficesServicesRelations'
+    '\BO\Zmscitizenapi\OfficesServicesRelations'
 )
     ->setName("OfficesServicesRelations");
 
@@ -128,7 +128,7 @@
  */
 \App::$slim->get(
     '/scope-by-id/',
-    '\BO\Zmscitizenapi\Controllers\ScopeByIdGet'
+    '\BO\Zmscitizenapi\ScopeByIdGet'
 )
     ->setName("ScopeByIdGet");
 
@@ -158,7 +158,7 @@
  */
 \App::$slim->get(
     '/services-by-office/',
-    '\BO\Zmscitizenapi\Controllers\ServicesByOfficeList'
+    '\BO\Zmscitizenapi\ServicesByOfficeList'
 )
     ->setName("ServicesByOfficeList");
 
@@ -188,7 +188,7 @@
  */
 \App::$slim->get(
     '/offices-by-service/',
-    '\BO\Zmscitizenapi\Controllers\OfficesByServiceList'
+    '\BO\Zmscitizenapi\OfficesByServiceList'
 )
     ->setName("OfficesByServiceList");
 
@@ -223,7 +223,7 @@
  */
 \App::$slim->get(
     '/available-days/',
-    '\BO\Zmscitizenapi\Controllers\AvailableDaysList'
+    '\BO\Zmscitizenapi\AvailableDaysList'
 )
     ->setName("AvailableDaysList");
 
@@ -263,7 +263,7 @@
  */
 \App::$slim->get(
     '/available-appointments/',
-    '\BO\Zmscitizenapi\Controllers\AvailableAppointmentsList'
+    '\BO\Zmscitizenapi\AvailableAppointmentsList'
 )
     ->setName("AvailableAppointmentsList");
 
@@ -318,7 +318,7 @@
  */
 \App::$slim->get(
     '/appointment/',
-    '\BO\Zmscitizenapi\Controllers\AppointmentGet'
+    '\BO\Zmscitizenapi\AppointmentGet'
 )
     ->setName("AppointmentGet");
 
@@ -342,7 +342,7 @@
  */
 \App::$slim->get(
     '/captcha-details/',
-    '\BO\Zmscitizenapi\Controllers\CaptchaGet'
+    '\BO\Zmscitizenapi\CaptchaGet'
 )
     ->setName("CaptchaGet");
 
@@ -393,7 +393,7 @@
  */
 \App::$slim->post(
     '/reserve-appointment/',
-    '\BO\Zmscitizenapi\Controllers\AppointmentReserve'
+    '\BO\Zmscitizenapi\AppointmentReserve'
 )
     ->setName("AppointmentReserve");
 
@@ -444,7 +444,7 @@
  */
 \App::$slim->post(
     '/update-appointment/',
-    '\BO\Zmscitizenapi\Controllers\AppointmentUpdate'
+    '\BO\Zmscitizenapi\AppointmentUpdate'
 )
     ->setName("AppointmentUpdate");
 
@@ -495,7 +495,7 @@
  */
 \App::$slim->post(
     '/confirm-appointment/',
-    '\BO\Zmscitizenapi\Controllers\AppointmentConfirm'
+    '\BO\Zmscitizenapi\AppointmentConfirm'
 )
     ->setName("AppointmentConfirm");
 
@@ -546,7 +546,7 @@
  */
 \App::$slim->post(
     '/preconfirm-appointment/',
-    '\BO\Zmscitizenapi\Controllers\AppointmentPreconfirm'
+    '\BO\Zmscitizenapi\AppointmentPreconfirm'
 )
     ->setName("AppointmentPreconfirm");
 
@@ -597,6 +597,6 @@
  */
 \App::$slim->post(
     '/cancel-appointment/',
-    '\BO\Zmscitizenapi\Controllers\AppointmentCancel'
+    '\BO\Zmscitizenapi\AppointmentCancel'
 )
     ->setName("AppointmentCancel");

zmscitizenapi/src/Zmscitizenapi/Controllers/AppointmentCancel.php → zmscitizenapi/src/Zmscitizenapi/AppointmentCancel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BO\Zmscitizenapi\Controllers;
+namespace BO\Zmscitizenapi;
 
 use BO\Zmscitizenapi\BaseController;
 use BO\Slim\Render;

zmscitizenapi/src/Zmscitizenapi/Controllers/AppointmentConfirm.php → zmscitizenapi/src/Zmscitizenapi/AppointmentConfirm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BO\Zmscitizenapi\Controllers;
+namespace BO\Zmscitizenapi;
 
 use BO\Zmscitizenapi\BaseController;
 use BO\Slim\Render;

zmscitizenapi/src/Zmscitizenapi/Controllers/AppointmentGet.php → zmscitizenapi/src/Zmscitizenapi/AppointmentGet.php

@@ -1,30 +1,21 @@
 <?php
 
-namespace BO\Zmscitizenapi\Controllers;
+namespace BO\Zmscitizenapi;
 
 use BO\Zmscitizenapi\BaseController;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use BO\Zmscitizenapi\Services\AppointmentService;
-use BO\Zmscitizenapi\Services\ProcessService;
+use BO\Zmscitizenapi\Services\ZmsApiFacadeService;
 
 class AppointmentGet extends BaseController
 {
-    protected $appointmentService;
-
-    public function __construct()
-    {
-        $processService = new ProcessService(\App::$http);
-        $this->appointmentService = new AppointmentService($processService);
-    }
-
     public function readResponse(RequestInterface $request, ResponseInterface $response, array $args)
     {
         $queryParams = $request->getQueryParams();
         $processId = $queryParams['processId'] ?? null;
         $authKey = $queryParams['authKey'] ?? null;
 
-        $result = $this->appointmentService->getAppointmentById($processId, $authKey);
+        $result = ZmsApiFacadeService::getProcessById($processId, $authKey);
 
         return $this->createJsonResponse($response, $result['data'] ?? $result, $result['status']);
     }

zmscitizenapi/src/Zmscitizenapi/Controllers/AppointmentPreconfirm.php → zmscitizenapi/src/Zmscitizenapi/AppointmentPreconfirm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BO\Zmscitizenapi\Controllers;
+namespace BO\Zmscitizenapi;
 
 use BO\Zmscitizenapi\BaseController;
 use BO\Slim\Render;

zmscitizenapi/src/Zmscitizenapi/AppointmentReserve.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace BO\Zmscitizenapi;
+
+use BO\Zmscitizenapi\Application;
+use BO\Zmscitizenapi\BaseController;
+use BO\Zmscitizenapi\Helper\UtilityHelper;
+use BO\Zmscitizenapi\Services\CaptchaService;
+use BO\Zmscitizenapi\Services\MapperService;
+use BO\Zmscitizenapi\Services\ValidationService;
+use BO\Zmscitizenapi\Services\ZmsApiFacadeService;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class AppointmentReserve extends BaseController
+{
+
+
+    public function readResponse(RequestInterface $request, ResponseInterface $response, array $args)
+    {
+        $request = $request instanceof ServerRequestInterface ? $request : null;
+
+        $body = $request->getParsedBody();
+
+        $officeId = $body['officeId'] ?? null;
+        $serviceIds = $body['serviceId'] ?? [];
+        $serviceCounts = $body['serviceCount'] ?? [1];
+        $captchaSolution = $body['captchaSolution'] ?? null;
+        $timestamp = $body['timestamp'] ?? null;
+
+
+        $errors = ValidationService::validatePostAppointmentReserve($officeId, $serviceIds, $serviceCounts, $captchaSolution, $timestamp);
+        if (!empty($errors['errors'])) {
+            return $this->createJsonResponse($response, 
+            $errors, 400);
+        }
+
+        try {
+            $providerScope = ZmsApiFacadeService::getScopeByOfficeId($officeId);
+            $captchaRequired = Application::$CAPTCHA_ENABLED === "1" && $providerScope['captchaActivatedRequired'] === "1";
+
+            if ($captchaRequired) {
+                $captchaVerificationResult = CaptchaService::verifyCaptcha($captchaSolution);
+                if (!$captchaVerificationResult['success']) {
+                    return $this->createJsonResponse($response, [
+                        'errorCode' => 'captchaVerificationFailed',
+                        'errorMessage' => 'Captcha verification failed'
+                    ], 400);
+                }
+            }
+
+            $serviceValidationResult = ValidationService::validateServiceLocationCombination($officeId, $serviceIds);
+            if ($serviceValidationResult['status'] !== 200) {
+                return $this->createJsonResponse($response, $serviceValidationResult, 400);
+            }
+
+            $freeAppointments = ZmsApiFacadeService::getFreeAppointments([
+                'officeId' => $officeId,
+                'serviceIds' => $serviceIds,
+                'serviceCounts' => $serviceCounts,
+                'date' => UtilityHelper::getInternalDateFromTimestamp($timestamp)
+            ]);
+
+            $selectedProcess = array_filter($freeAppointments, function ($process) use ($timestamp) {
+                if (!isset($process['appointments']) || !is_array($process['appointments'])) {
+                    return false;
+                }
+                return in_array($timestamp, array_column($process['appointments'], 'date'));
+            });
+
+            $errors = ValidationService::validateGetProcessNotFound($selectedProcess);
+            if (!empty($errors['errors'])) {
+                return $this->createJsonResponse($response, 
+                $errors, 404);
+            }
+
+            $selectedProcess = array_values($selectedProcess)[0];
+            $selectedProcess['clients'] = [
+                [
+                    'email' => 'test@muenchen.de'
+                ]
+            ];
+
+            $reservedProcess = ZmsApiFacadeService::reserveTimeslot($selectedProcess, $serviceIds, $serviceCounts);
+
+            if ($reservedProcess && $reservedProcess->scope && $reservedProcess->scope->id) {
+                $scopeIds = [$reservedProcess->scope->id];
+                $scopesData = ZmsApiFacadeService::getScopeByIds($scopeIds);
+
+                if ($scopesData['status'] === 200 && isset($scopesData['scopes']['scopes']) && !empty($scopesData['scopes']['scopes'])) {
+                    $reservedProcess->scope = MapperService::mapScope($scopesData['scopes']['scopes'][0]);
+                }
+            }
+
+            $thinnedProcessData = UtilityHelper::getThinnedProcessData($reservedProcess);
+            $thinnedProcessData = array_merge($thinnedProcessData, ['officeId' => $officeId]);
+
+            return $this->createJsonResponse($response, $thinnedProcessData, 200);
+
+        } catch (\Exception $e) {
+            return [
+                'errorCode' => 'unexpectedError',
+                'errorMessage' => 'Unexpected error: ' . $e->getMessage(),
+                'status' => 500,
+            ];
+        }
+    }
+
+}

zmscitizenapi/src/Zmscitizenapi/Controllers/AppointmentUpdate.php → zmscitizenapi/src/Zmscitizenapi/AppointmentUpdate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BO\Zmscitizenapi\Controllers;
+namespace BO\Zmscitizenapi;
 
 use BO\Zmscitizenapi\BaseController;
 use BO\Slim\Render;

zmscitizenapi/src/Zmscitizenapi/AvailableAppointmentsList.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace BO\Zmscitizenapi;
+
+use BO\Zmscitizenapi\BaseController;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use BO\Zmscitizenapi\Services\ZmsApiFacadeService;
+
+class AvailableAppointmentsList extends BaseController
+{
+    public function readResponse(RequestInterface $request, ResponseInterface $response, array $args)
+    {
+        $queryParams = $request->getQueryParams();
+
+        $result = ZmsApiFacadeService::getAvailableAppointments($queryParams);
+
+        return $this->createJsonResponse($response, $result, statusCode: $result['status']);
+    }
+
+}

zmscitizenapi/src/Zmscitizenapi/Controllers/AvailableDaysList.php → zmscitizenapi/src/Zmscitizenapi/AvailableDaysList.php

@@ -1,26 +1,20 @@
 <?php
 
-namespace BO\Zmscitizenapi\Controllers;
+namespace BO\Zmscitizenapi;
 
 use BO\Zmscitizenapi\BaseController;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use BO\Zmscitizenapi\Services\AvailableDaysService;
+use BO\Zmscitizenapi\Services\ZmsApiFacadeService;
 
 class AvailableDaysList extends BaseController
 {
-    protected $availableDaysService;
-
-    public function __construct()
-    {
-        $this->availableDaysService = new AvailableDaysService();
-    }
 
     public function readResponse(RequestInterface $request, ResponseInterface $response, array $args)
     {
         $queryParams = $request->getQueryParams();
 
-        $result = $this->availableDaysService->getAvailableDays($queryParams);
+        $result = ZmsApiFacadeService::getBookableFreeDays($queryParams);
 
         return $this->createJsonResponse($response, $result, $result['status']);
     }