GH-446 review

module/Database/migrations/Version20241124183711.php

@@ -28,7 +28,6 @@ public function up(Schema $schema): void
     public function down(Schema $schema): void
     {
         // phpcs:disable SlevomatCodingStandard.Functions.RequireMultiLineCall.RequiredMultiLineCall
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('CREATE SEQUENCE installationfunction_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE installationfunction (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id))');
         // phpcs:enable SlevomatCodingStandard.Functions.RequireMultiLineCall.RequiredMultiLineCall

module/Database/src/Mapper/ProspectiveMember.php

@@ -178,6 +178,29 @@ public function findWithFullyExpiredOrFailedCheckout(): array
         return $qb->getQuery()->getResult();
     }
 
+    /**
+     * Find all prospective members wihout any checkout session (should not happen)
+     *
+     * @return ProspectiveMemberModel[]
+     */
+    public function findWithoutCheckout(): array
+    {
+        // Get all checkout sessions
+        $checkoutSessions = $this->em->createQueryBuilder();
+        $checkoutSessions->select('pmwithcs.lidnr')
+            ->from(CheckoutSessionModel::class, 'cs')
+            ->innerJoin('cs.prospectiveMember', 'pmwithcs');
+
+        // Get all prospective members without a checkout session that are there for more than 30 days
+        $qb = $this->getRepository()->createQueryBuilder('m');
+        $qb->where($qb->expr()->notIn('m.lidnr', $checkoutSessions->getDQL()))
+            ->andWhere('m.changedOn <= :fullyExpired');
+
+        $qb->setParameter('fullyExpired', (new DateTime())->sub(new DateInterval('P31D')));
+
+        return $qb->getQuery()->getResult();
+    }
+
     /**
      * Persist a member model.
      */

module/Database/src/Model/Meeting.php

@@ -4,6 +4,7 @@
 
 namespace Database\Model;
 
+use Application\Model\Enums\AppLanguages;
 use Application\Model\Enums\MeetingTypes;
 use Database\Model\SubDecision\Minutes;
 use DateTime;
@@ -194,11 +195,13 @@ public function toArray(): array
      */
     public function getNumberAsOrdinal(?string $locale): string
     {
+
+
         if (null === $locale) {
-            $locale = 'nl_NL';
+            $locale = AppLanguages::Dutch->getLocale();
         }
 
-        if ('en_GB' === $locale) {
+        if (AppLanguages::English->getLocale() === $locale) {
             return (new NumberFormatter($locale, NumberFormatter::ORDINAL))->format($this->getNumber());
         }
 

module/Database/src/Model/SubDecision.php

@@ -265,16 +265,6 @@ protected function replaceContentPlaceholders(
         return str_replace(array_keys($replacements), $replacements, $template);
     }
 
-    /**
-     * Get the statutory content of the subdecision
-     */
-    // final public function getContent(): string
-    // {
-    //     $translator = new DummyTranslator();
-
-    //     return $this->getTranslatedContent($translator, AppLanguages::Dutch);
-    // }
-
     /**
      * Get the content in the current language (requires real translator)
      */

module/Database/src/Service/Member.php

@@ -629,11 +629,14 @@ public function removeProspective(ProspectiveMemberModel $member): void
 
     /**
      * Remove all prospective members whose last Checkout Session has fully expired (1 + 30 + 1 day ago) or failed 31
-     * days ago.
+     * days ago or who don't have a checkout session.
      */
     public function removeExpiredProspectiveMembers(): void
     {
-        $prospectiveMembers = $this->getProspectiveMemberMapper()->findWithFullyExpiredOrFailedCheckout();
+        $prospectiveMembers = array_merge(
+            $this->getProspectiveMemberMapper()->findWithFullyExpiredOrFailedCheckout(),
+            $this->getProspectiveMemberMapper()->findWithoutCheckout(),
+        );
 
         foreach ($prospectiveMembers as $prospectiveMember) {
             $this->removeProspective($prospectiveMember);

module/Database/view/database/meeting/decisionform.phtml

@@ -9,6 +9,7 @@ use Database\Model\Meeting;
 use Laminas\View\Renderer\PhpRenderer;
 
 /** @var PhpRenderer|HelperTrait $this */
+$translator = $this->plugin('translate')->getTranslator();
 ?>
 <?php if (isset($form)): ?>
 <?php
@@ -79,15 +80,15 @@ case 'other':
 ?>
 <h1><?= $this->translate('Decision') ?> <?= $decision->getHash() ?> <?= $this->translate('reads as follows:') ?></h1>
 <?php foreach ($decision->getSubdecisions() as $subdecision): ?>
-    <?= $this->escapeHtml($subdecision->getContent($this->plugin('translate')->getTranslator())) ?>
+    <?= $this->escapeHtml($subdecision->getContent($translator)) ?>
 <?php endforeach; ?>
 
 <br>
 <span class="hidden" id="decision-contents">
     <?= sprintf(
         '\decision[%s]{%s}',
-        $this->escapeHtml($decision->getTranslatedContent($this->plugin('translate')->getTranslator(), AppLanguages::English, true)),
-        $this->escapeHtml($decision->getTranslatedContent($this->plugin('translate')->getTranslator(), AppLanguages::Dutch, true)),
+        $this->escapeHtml($decision->getTranslatedContent($translator, AppLanguages::English, true)),
+        $this->escapeHtml($decision->getTranslatedContent($translator, AppLanguages::Dutch, true)),
 ) ?>
 </span>
 

module/Database/view/database/meeting/view.phtml

@@ -11,7 +11,7 @@ use Laminas\View\Renderer\PhpRenderer;
  * @var PhpRenderer|HelperTrait $this
  * @var MeetingModel $meeting
  */
-
+$translator = $this->plugin('translate')->getTranslator();
 // determine last decision of each point
 $map = array();
 foreach ($meeting->getDecisions() as $decision) {
@@ -98,14 +98,14 @@ $(document).ready(function () {
         </button>
         <ul>
         <?php foreach ($decision->getSubdecisions() as $subdecision): ?>
-            <li><?= $this->escapeHtml($subdecision->getContent($this->plugin('translate')->getTranslator())) ?></li>
+            <li><?= $this->escapeHtml($subdecision->getContent($translator)) ?></li>
         <?php endforeach; ?>
         </ul>
         <span class="hidden" id="<?= $decision->getHash() ?>">
             <?= sprintf(
                 '\decision[%s]{%s}',
-                $this->escapeHtmlAttr($decision->getTranslatedContent($this->plugin('translate')->getTranslator(), AppLanguages::English, true)),
-                $this->escapeHtmlAttr($decision->getTranslatedContent($this->plugin('translate')->getTranslator(), AppLanguages::Dutch, true)),
+                $this->escapeHtmlAttr($decision->getTranslatedContent($translator, AppLanguages::English, true)),
+                $this->escapeHtmlAttr($decision->getTranslatedContent($translator, AppLanguages::Dutch, true)),
             ) ?>
         </span>
     </li>

module/Report/migrations/Version20241124183712.php

@@ -20,17 +20,16 @@ public function getDescription(): string
     public function up(Schema $schema): void
     {
         // phpcs:disable SlevomatCodingStandard.Functions.RequireMultiLineCall.RequiredMultiLineCall
-        $this->addSql('ALTER TABLE decision ADD contentEN TEXT NOT NULL');
-        $this->addSql('ALTER TABLE decision RENAME COLUMN content TO contentNL');
-        $this->addSql('ALTER TABLE subdecision ADD contentEN TEXT NOT NULL');
-        $this->addSql('ALTER TABLE subdecision RENAME COLUMN content TO contentNL');
+        $this->addSql('ALTER TABLE Decision ADD contentEN TEXT NOT NULL');
+        $this->addSql('ALTER TABLE Decision RENAME COLUMN content TO contentNL');
+        $this->addSql('ALTER TABLE SubDecision ADD contentEN TEXT NOT NULL');
+        $this->addSql('ALTER TABLE SubDecision RENAME COLUMN content TO contentNL');
         // phpcs:enable SlevomatCodingStandard.Functions.RequireMultiLineCall.RequiredMultiLineCall
     }
 
     public function down(Schema $schema): void
     {
         // phpcs:disable SlevomatCodingStandard.Functions.RequireMultiLineCall.RequiredMultiLineCall
-        $this->addSql('CREATE SCHEMA public');
         $this->addSql('ALTER TABLE Decision ADD content TEXT NOT NULL');
         $this->addSql('ALTER TABLE Decision DROP contentNL');
         $this->addSql('ALTER TABLE Decision DROP contentEN');