fix(ZMSKVR-125): cancel email not sending to client in zmscitizenapi (#…

…880) * clean(ZMSKVR): cleanup zmsclient Http request class * feat(ZMSKVR): refactor citizenapi LoggerService to use zmsslim monolog * fix(ZMSKVR-125): sending cancel appointment email sender address * clean(ZMSKVR-125): remove error_logs * fix(ZMSKVR-125): formatting * clean(ZMSKVR-125): tpying and duplicate code line --------- Co-authored-by: Thomas Fink <[email protected]>
it-at-m · Feb 17, 2025 · 972ed05 · 972ed05
1 parent 4f6155a
commit 972ed05
Show file tree

Hide file tree

Showing 56 changed files with 403 additions and 396 deletions.
diff --git a/README.md b/README.md
@@ -122,6 +122,7 @@ To run Checks locally in your local docker container:
 
 0. Run all at once:
 - `ddev exec "./cli modules loop 'vendor/bin/phpcs --standard=psr12 src/'"`
+- `ddev exec "./cli modules loop 'vendor/bin/phpcbf --standard=psr12 src/'"`
 
 1. **Enter the container** (if using DDEV or Docker):
 - `ddev ssh`

diff --git a/mellon/src/Mellon/Collection.php b/mellon/src/Mellon/Collection.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Condition.php b/mellon/src/Mellon/Condition.php
@@ -7,7 +7,6 @@
  */
 class Condition
 {
-
     protected $collection = [];
 
     public function __construct(Valid ...$validList)

diff --git a/mellon/src/Mellon/Exception.php b/mellon/src/Mellon/Exception.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Failure/Exception.php b/mellon/src/Mellon/Failure/Exception.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Failure/Message.php b/mellon/src/Mellon/Failure/Message.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Failure/MessageList.php b/mellon/src/Mellon/Failure/MessageList.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Parameter.php b/mellon/src/Mellon/Parameter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
@@ -12,7 +13,6 @@
   */
 abstract class Parameter
 {
-
     /**
       * value of parameter
       *

diff --git a/mellon/src/Mellon/Unvalidated.php b/mellon/src/Mellon/Unvalidated.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Valid.php b/mellon/src/Mellon/Valid.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
@@ -13,7 +14,6 @@
   */
 class Valid extends \BO\Mellon\Parameter
 {
-
     /**
       * validation errors
       *

diff --git a/mellon/src/Mellon/ValidArray.php b/mellon/src/Mellon/ValidArray.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
@@ -11,7 +12,6 @@
   */
 class ValidArray extends \BO\Mellon\Valid
 {
-
     /**
      * Allow native arrays anc class replacements
      *
@@ -21,7 +21,8 @@ class ValidArray extends \BO\Mellon\Valid
      */
     public function isArray($message = 'no valid array')
     {
-        if (is_array($this->value)
+        if (
+            is_array($this->value)
             || (
                 $this->value instanceof \Traversable
                 && $this->value instanceof \Countable

diff --git a/mellon/src/Mellon/ValidBool.php b/mellon/src/Mellon/ValidBool.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
@@ -11,7 +12,6 @@
   */
 class ValidBool extends Valid
 {
-
     /**
      * Allow only boolean values like
      * Allowed values are:

diff --git a/mellon/src/Mellon/ValidDate.php b/mellon/src/Mellon/ValidDate.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/ValidDatetime.php b/mellon/src/Mellon/ValidDatetime.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
 
 namespace BO\Mellon;
 
-use \DateTimeImmutable;
-use \DateTime;
+use DateTimeImmutable;
+use DateTime;
 
 class ValidDatetime extends Valid
 {

diff --git a/mellon/src/Mellon/ValidFile.php b/mellon/src/Mellon/ValidFile.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
@@ -44,7 +45,8 @@ public function isFile($name = 'fileupload', $message = 'No valid file found.')
     public function hasType($type = 'jpeg', $message = 'Invalid file type.')
     {
         if (isset($_FILES[$this->fileName])) {
-            if ((! empty($_FILES[$this->fileName]["type"])) &&
+            if (
+                (! empty($_FILES[$this->fileName]["type"])) &&
                 ($_FILES[$this->fileName]['type'] != $this->acceptableTypes[$type])
             ) {
                 $this->setFailure($message);

diff --git a/mellon/src/Mellon/ValidJson.php b/mellon/src/Mellon/ValidJson.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
@@ -14,7 +15,6 @@
   */
 class ValidJson extends Valid
 {
-
     protected $originalJsonString = null;
     protected $defaultJsonString = '{}';
 

diff --git a/mellon/src/Mellon/ValidMail.php b/mellon/src/Mellon/ValidMail.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/ValidNumber.php b/mellon/src/Mellon/ValidNumber.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
@@ -11,7 +12,6 @@
   */
 class ValidNumber extends Valid
 {
-
     /**
      * Allow only integer numbers
      *

diff --git a/mellon/src/Mellon/ValidPath.php b/mellon/src/Mellon/ValidPath.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/

diff --git a/mellon/src/Mellon/ValidString.php b/mellon/src/Mellon/ValidString.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG
  **/
@@ -11,7 +12,6 @@
   */
 class ValidString extends Valid
 {
-
     /**
      * Allow strings smaller than 64kb and do htmlspecialchars()
      *

diff --git a/mellon/src/Mellon/ValidUrl.php b/mellon/src/Mellon/ValidUrl.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/ValidationException.php b/mellon/src/Mellon/ValidationException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/mellon/src/Mellon/Validator.php b/mellon/src/Mellon/Validator.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package Mellon
  * @copyright BerlinOnline Stadtportal GmbH & Co. KG

diff --git a/zmsapi/src/Zmsapi/ProcessConfirmationMail.php b/zmsapi/src/Zmsapi/ProcessConfirmationMail.php
@@ -22,7 +22,7 @@ class ProcessConfirmationMail extends BaseController
 {
     /**
      * @SuppressWarnings(Param)
-     * @return String
+     * @return string
      */
     public function readResponse(
         \Psr\Http\Message\RequestInterface $request,

diff --git a/zmsapi/src/Zmsapi/ProcessDeleteMail.php b/zmsapi/src/Zmsapi/ProcessDeleteMail.php
@@ -22,7 +22,7 @@ class ProcessDeleteMail extends BaseController
 {
     /**
      * @SuppressWarnings(Param)
-     * @return String
+     * @return string
      */
     public function readResponse(
         \Psr\Http\Message\RequestInterface $request,

diff --git a/zmsapi/src/Zmsapi/ProcessPreconfirmationMail.php b/zmsapi/src/Zmsapi/ProcessPreconfirmationMail.php
@@ -22,7 +22,7 @@ class ProcessPreconfirmationMail extends BaseController
 {
     /**
      * @SuppressWarnings(Param)
-     * @return String
+     * @return string
      */
     public function readResponse(
         \Psr\Http\Message\RequestInterface $request,

diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedScope.php b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedScope.php
@@ -12,31 +12,34 @@
 class ThinnedScope extends Entity implements JsonSerializable
 {
     public static $schema = 'citizenapi/thinnedScope.json';
-/** @var int */
+    /** @var int */
     public int $id;
-/** @var ThinnedProvider|null */
+    /** @var ThinnedProvider|null */
     public ?ThinnedProvider $provider;
-/** @var string|null */
+    /** @var string|null */
     public ?string $shortName;
-/** @var bool|null */
+    /** @var string|null */
+    public ?string $emailFrom;
+    /** @var bool|null */
     public ?bool $telephoneActivated;
-/** @var bool|null */
+    /** @var bool|null */
     public ?bool $telephoneRequired;
-/** @var bool|null */
+    /** @var bool|null */
     public ?bool $customTextfieldActivated;
-/** @var bool|null */
+    /** @var bool|null */
     public ?bool $customTextfieldRequired;
-/** @var string|null */
+    /** @var string|null */
     public ?string $customTextfieldLabel;
-/** @var bool|null */
+    /** @var bool|null */
     public ?bool $captchaActivatedRequired;
-/** @var string|null */
+    /** @var string|null */
     public ?string $displayInfo;
-    public function __construct(int $id = 0, ?ThinnedProvider $provider = null, ?string $shortName = null, ?bool $telephoneActivated = null, ?bool $telephoneRequired = null, ?bool $customTextfieldActivated = null, ?bool $customTextfieldRequired = null, ?string $customTextfieldLabel = null, ?bool $captchaActivatedRequired = null, ?string $displayInfo = null)
+    public function __construct(int $id = 0, ?ThinnedProvider $provider = null, ?string $shortName = null, ?string $emailFrom = null, ?bool $telephoneActivated = null, ?bool $telephoneRequired = null, ?bool $customTextfieldActivated = null, ?bool $customTextfieldRequired = null, ?string $customTextfieldLabel = null, ?bool $captchaActivatedRequired = null, ?string $displayInfo = null)
     {
         $this->id = $id;
         $this->provider = $provider;
         $this->shortName = $shortName;
+        $this->emailFrom = $emailFrom;
         $this->telephoneActivated = $telephoneActivated;
         $this->telephoneRequired = $telephoneRequired;
         $this->customTextfieldActivated = $customTextfieldActivated;
@@ -64,6 +67,11 @@ public function getShortName(): ?string
         return $this->shortName;
     }
 
+    public function getEmailFrom(): ?string
+    {
+        return $this->emailFrom;
+    }
+
     public function getTelephoneActivated(): ?bool
     {
         return $this->telephoneActivated;
@@ -105,6 +113,7 @@ public function toArray(): array
             'id' => $this->id,
             'provider' => $this->provider,
             'shortName' => $this->shortName,
+            'emailFrom' => $this->emailFrom,
             'telephoneActivated' => $this->telephoneActivated,
             'telephoneRequired' => $this->telephoneRequired,
             'customTextfieldActivated' => $this->customTextfieldActivated,

diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentCancelService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentCancelService.php
@@ -33,7 +33,6 @@ public function processCancel(array $body): ThinnedProcess|array
             ]];
         }
 
-        // Send cancellation email before cancelling the appointment
         $this->sendCancellationEmail($process);
         return $this->cancelProcess($process);
     }
@@ -80,6 +79,6 @@ private function cancelProcess(ThinnedProcess $process): ThinnedProcess|array
     private function sendCancellationEmail(ThinnedProcess $process): void
     {
         $processEntity = MapperService::thinnedProcessToProcess($process);
-        ZmsApiFacadeService::sendCancelationEmail($processEntity);
+        ZmsApiFacadeService::sendCancellationEmail($processEntity);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ @@
      */
     class Condition
     {
         protected $collection = [];
         public function __construct(Valid ...$validList)
@@ Expand Down @@