resolved comments

Signed-off-by: bidi <[email protected]>

Author: bidi47

data/doctrine/migrations/Version20241030082958.php

@@ -30,7 +30,7 @@ public function up(Schema $schema): void
         $this->addSql('CREATE TABLE oauth_clients (id INT UNSIGNED AUTO_INCREMENT NOT NULL, name VARCHAR(40) NOT NULL, secret VARCHAR(100) DEFAULT NULL, redirect VARCHAR(191) NOT NULL, revoked TINYINT(1) DEFAULT 0 NOT NULL, isConfidential TINYINT(1) DEFAULT 0 NOT NULL, user_id BINARY(16) DEFAULT NULL, INDEX IDX_13CE8101A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4');
         $this->addSql('CREATE TABLE oauth_refresh_tokens (id INT UNSIGNED AUTO_INCREMENT NOT NULL, revoked TINYINT(1) DEFAULT 0 NOT NULL, expires_at DATETIME NOT NULL, access_token_id INT UNSIGNED DEFAULT NULL, INDEX IDX_5AB6872CCB2688 (access_token_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4');
         $this->addSql('CREATE TABLE oauth_scopes (id INT UNSIGNED AUTO_INCREMENT NOT NULL, scope VARCHAR(191) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4');
-        $this->addSql('CREATE TABLE user (uuid BINARY(16) NOT NULL, identity VARCHAR(191) NOT NULL, password VARCHAR(191) NOT NULL, status ENUM(\'active\', \'pending\') DEFAULT \'pending\' NOT NULL, hash VARCHAR(64) NOT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_8D93D6496A95E9C4 (identity), UNIQUE INDEX UNIQ_8D93D649D1B862B8 (hash), PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
+        $this->addSql('CREATE TABLE user (uuid BINARY(16) NOT NULL, identity VARCHAR(191) NOT NULL, password VARCHAR(191) NOT NULL, status ENUM(\'active\', \'pending\', \'deleted\') DEFAULT \'pending\' NOT NULL, hash VARCHAR(64) NOT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_8D93D6496A95E9C4 (identity), UNIQUE INDEX UNIQ_8D93D649D1B862B8 (hash), PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
         $this->addSql('CREATE TABLE user_roles (userUuid BINARY(16) NOT NULL, roleUuid BINARY(16) NOT NULL, INDEX IDX_54FCD59FD73087E9 (userUuid), INDEX IDX_54FCD59F88446210 (roleUuid), PRIMARY KEY(userUuid, roleUuid)) DEFAULT CHARACTER SET utf8mb4');
         $this->addSql('CREATE TABLE user_avatar (uuid BINARY(16) NOT NULL, name VARCHAR(191) NOT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, userUuid BINARY(16) DEFAULT NULL, UNIQUE INDEX UNIQ_73256912D73087E9 (userUuid), PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');
         $this->addSql('CREATE TABLE user_detail (uuid BINARY(16) NOT NULL, firstName VARCHAR(191) DEFAULT NULL, lastName VARCHAR(191) DEFAULT NULL, email VARCHAR(191) NOT NULL, created DATETIME NOT NULL, updated DATETIME DEFAULT NULL, userUuid BINARY(16) DEFAULT NULL, UNIQUE INDEX UNIQ_4B5464AED73087E9 (userUuid), PRIMARY KEY(uuid)) DEFAULT CHARACTER SET utf8mb4');

src/App/src/Middleware/AuthorizationMiddleware.php

@@ -61,7 +61,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 break;
             case 'frontend':
                 $user = $this->userRepository->findOneBy(['identity' => $defaultUser->getIdentity()]);
-                if (! $user instanceof User || $user->getStatus() === UserStatusEnum::Deleted) {
+                if (! $user instanceof User || $user->isDeleted()) {
                     return $this->unauthorizedResponse(sprintf(
                         Message::USER_NOT_FOUND_BY_IDENTITY,
                         $defaultUser->getIdentity()

src/User/src/Entity/User.php

@@ -258,6 +258,11 @@ public function isPending(): bool
         return $this->status === UserStatusEnum::Pending;
     }
 
+    public function isDeleted(): bool
+    {
+        return $this->status === UserStatusEnum::Deleted;
+    }
+
     public function renewHash(): self
     {
         $this->hash = self::generateHash();

src/User/src/Repository/UserRepository.php

@@ -50,6 +50,8 @@ public function getUsers(array $filters = []): UserCollection
 
         if (! empty($filters['status'])) {
             $qb->andWhere('user.status = :status')->setParameter('status', $filters['status']);
+        } else {
+            $qb->andWhere('user.status != :status')->setParameter('status', UserStatusEnum::Deleted);
         }
 
         if (! empty($filters['search'])) {

test/Functional/AdminTest.php

@@ -461,7 +461,7 @@ public function testAdminCanDeleteUserAccount(): void
         $userRepository = $this->getEntityManager()->getRepository(User::class);
         $user           = $userRepository->find($user->getUuid()->toString());
 
-        $this->assertTrue($user?->getStatus() === UserStatusEnum::Deleted);
+        $this->assertTrue($user?->isDeleted());
     }
 
     /**

test/Functional/UserTest.php

@@ -296,7 +296,7 @@ public function testDeleteMyAccount(): void
 
         $userRepository = $this->getEntityManager()->getRepository(User::class);
         $deletedUser    = $userRepository->find($user->getUuid()->toString());
-        $this->assertTrue($deletedUser?->getStatus() === UserStatusEnum::Deleted);
+        $this->assertTrue($deletedUser?->isDeleted());
     }
 
     public function testRequestResetPasswordInvalidHash(): void