Automatically expire UserRoles

module/Application/test/BaseControllerTest.php

@@ -6,6 +6,7 @@
 
 use Company\Model\Company;
 use Company\Model\CompanyLocalisedText;
+use DateInterval;
 use DateTime;
 use Decision\Model\Enums\MembershipTypes;
 use Decision\Model\Member;
@@ -237,6 +238,7 @@ private function setUpMockIdentity(string $role): CompanyUser|User|null
         if ('user' !== $role) {
             $roleModel = new UserRole();
             $roleModel->setRole(UserRoles::from($role));
+            $roleModel->setExpiration((new DateTime('now'))->add(new DateInterval('P1D')));
 
             $roles = new ArrayCollection([$roleModel]);
         } else {

module/User/src/Model/User.php

@@ -148,7 +148,7 @@ public function getMember(): MemberModel
     }
 
     /**
-     * Get the user's role names.
+     * Get the user's active role names.
      *
      * @return string[] Role names
      */
@@ -157,6 +157,10 @@ public function getRoleNames(): array
         $names = [];
 
         foreach ($this->getRoles() as $role) {
+            if (!$role->isActive()) {
+                continue;
+            }
+
             $names[] = $role->getRole()->value;
         }
 

module/User/src/Model/UserRole.php

@@ -5,6 +5,7 @@
 namespace User\Model;
 
 use Application\Model\Traits\IdentifiableTrait;
+use DateTime;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\JoinColumn;
@@ -43,6 +44,15 @@ enumType: UserRoles::class,
     )]
     protected UserRoles $role;
 
+    /**
+     * Date after which this role has expired.
+     */
+    #[Column(
+        type: 'datetime',
+        nullable: true,
+    )]
+    protected ?DateTime $expiration = null;
+
     /**
      * Get the membership number.
      */
@@ -74,4 +84,29 @@ public function setRole(UserRoles $role): void
     {
         $this->role = $role;
     }
+
+    /**
+     * Get the expiration, `null` means invalid (and thus inactive).
+     */
+    public function getExpiration(): ?DateTime
+    {
+        return $this->expiration;
+    }
+
+    /**
+     * Set the expiration date.
+     */
+    public function setExpiration(DateTime $expiration): void
+    {
+        $this->expiration = $expiration;
+    }
+
+    /**
+     * Determine whether this role is active (i.e. has not expired).
+     */
+    public function isActive(): bool
+    {
+        return null !== $this->expiration
+            && (new DateTime('now')) < $this->expiration;
+    }
 }