Merge pull request #1972 from tomudding/fix/admin-signup-and-signoff-…

…possible-outside-sign-up-list-being-open

fix(signup): admin (un)subscribe possible before sign-up list opens

module/Activity/src/Controller/ActivityController.php

@@ -251,7 +251,7 @@ public function signupAction(): Response|ViewModel
 
             // Ensure that the action is within the subscription window
             if (
-                !$this->signupService->isInSubscriptionWindow($signupList->getOpenDate(), $signupList->getCloseDate())
+                !$signupList->isOpen()
                 || ActivityModel::STATUS_APPROVED !== $signupList->getActivity()->getStatus()
             ) {
                 $error = $this->translator->translate('You cannot subscribe to this activity at this moment in time');
@@ -356,7 +356,7 @@ public function externalSignupAction(): Response|ViewModel
 
             // Ensure that the action is within the subscription window
             if (
-                !$this->signupService->isInSubscriptionWindow($signupList->getOpenDate(), $signupList->getCloseDate())
+                !$signupList->isOpen()
                 || ActivityModel::STATUS_APPROVED !== $signupList->getActivity()->getStatus()
             ) {
                 $error = $this->translator->translate('You cannot subscribe to this activity at this moment in time');
@@ -417,7 +417,7 @@ public function signoffAction(): Response|ViewModel
 
             // Ensure that the action is within the subscription window
             if (
-                !$this->signupService->isInSubscriptionWindow($signupList->getOpenDate(), $signupList->getCloseDate())
+                !$signupList->isOpen()
                 || ActivityModel::STATUS_APPROVED !== $signupList->getActivity()->getStatus()
             ) {
                 $error = $this->translator->translate(

module/Activity/src/Controller/AdminController.php

@@ -305,6 +305,18 @@ public function externalSignupAction(): Response|ViewModel
             throw new NotAllowedException($this->translator->translate('You are not allowed to use this form'));
         }
 
+        if (
+            !$signupList->isOpen()
+            || ActivityModel::STATUS_APPROVED !== $signupList->getActivity()->getStatus()
+        ) {
+            return $this->redirectActivityAdminRequest(
+                $activityId,
+                $signupListId,
+                false,
+                $this->translator->translate('Cannot subscribe external participant at this point in time'),
+            );
+        }
+
         /** @var Request $request */
         $request = $this->getRequest();
         $activityAdminSession = new SessionContainer('activityAdminRequest');
@@ -400,6 +412,18 @@ public function externalSignoffAction(): Response|ViewModel
             throw new NotAllowedException($this->translator->translate('You are not allowed to use this form'));
         }
 
+        if (
+            !$signupList->isOpen()
+            || ActivityModel::STATUS_APPROVED !== $signupList->getActivity()->getStatus()
+        ) {
+            return $this->redirectActivityAdminRequest(
+                $signupList->getActivity()->getId(),
+                $signupList->getId(),
+                false,
+                $this->translator->translate('Cannot unsubscribe external participant at this point in time'),
+            );
+        }
+
         /** @var Request $request */
         $request = $this->getRequest();
 

module/Activity/src/Service/Signup.php

@@ -14,7 +14,6 @@
 use Activity\Model\SignupList as SignupListModel;
 use Activity\Model\SignupOption as SignupOptionModel;
 use Activity\Model\UserSignup as UserSignupModel;
-use DateTime;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Exception\ORMException;
 use Doctrine\ORM\OptimisticLockException;
@@ -370,15 +369,6 @@ public function deleteOldSignups(): void
         }
     }
 
-    public static function isInSubscriptionWindow(
-        DateTime $openDate,
-        DateTime $closeDate,
-    ): bool {
-        $currentTime = new DateTime();
-
-        return $openDate < $currentTime && $currentTime < $closeDate;
-    }
-
     /**
      * Is the currently logged-in user allowed to signup.
      */