Merge pull request #483 from dotkernel/issue-482

account delete - avatar

Author: arhimede

src/User/src/ConfigProvider.php

@@ -16,6 +16,7 @@
 use Frontend\User\Factory\AuthenticationAdapterFactory;
 use Frontend\User\Factory\AuthenticationServiceFactory;
 use Frontend\User\Form\LoginForm;
+use Frontend\User\Repository\UserAvatarRepository;
 use Frontend\User\Repository\UserRepository;
 use Frontend\User\Repository\UserRoleRepository;
 use Frontend\User\Service\UserRoleService;
@@ -54,6 +55,7 @@ public function getDependencies(): array
                 UserService::class             => AttributedServiceFactory::class,
                 UserRoleService::class         => AttributedServiceFactory::class,
                 UserRepository::class          => AttributedRepositoryFactory::class,
+                UserAvatarRepository::class    => AttributedRepositoryFactory::class,
                 UserRoleRepository::class      => AttributedRepositoryFactory::class,
                 UserAvatarEventListener::class => AttributedServiceFactory::class,
             ],

src/User/src/Controller/AccountController.php

@@ -427,6 +427,7 @@ public function deleteAccountAction(): ResponseInterface
                 $userData = $form->getData();
                 try {
                     $this->userService->updateUser($user, $userData);
+                    $this->userService->deleteAvatar($user);
                 } catch (Exception $e) {
                     $this->messenger->addData('shouldRebind', true);
                     $this->forms->saveState($form);

src/User/src/Repository/UserAvatarRepository.php

@@ -5,10 +5,18 @@
 namespace Frontend\User\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use Dot\DependencyInjection\Attribute\Entity;
+use Frontend\User\Entity\UserAvatar;
 
 /**
  * @extends EntityRepository<object>
  */
+#[Entity(name: UserAvatar::class)]
 class UserAvatarRepository extends EntityRepository
 {
+    public function deleteAvatar(UserAvatar $avatar): void
+    {
+        $this->getEntityManager()->remove($avatar);
+        $this->getEntityManager()->flush();
+    }
 }

src/User/src/Service/UserService.php

@@ -19,6 +19,7 @@
 use Frontend\User\Entity\UserInterface;
 use Frontend\User\Entity\UserRememberMe;
 use Frontend\User\Entity\UserRole;
+use Frontend\User\Repository\UserAvatarRepository;
 use Frontend\User\Repository\UserRepository;
 use Frontend\User\Repository\UserRoleRepository;
 use Laminas\Diactoros\UploadedFile;
@@ -30,6 +31,7 @@
 use function is_readable;
 use function mkdir;
 use function password_hash;
+use function rmdir;
 use function sprintf;
 use function time;
 use function unlink;
@@ -50,6 +52,7 @@ class UserService implements UserServiceInterface
         UserRoleServiceInterface::class,
         TemplateRendererInterface::class,
         UserRepository::class,
+        UserAvatarRepository::class,
         UserRoleRepository::class,
         "config",
     )]
@@ -59,6 +62,7 @@ public function __construct(
         protected UserRoleServiceInterface $userRoleService,
         protected TemplateRendererInterface $templateRenderer,
         protected UserRepository $userRepository,
+        protected UserAvatarRepository $userAvatarRepository,
         protected UserRoleRepository $userRoleRepository,
         protected array $config = []
     ) {
@@ -217,6 +221,20 @@ protected function createAvatar(User $user, UploadedFile $uploadedFile): UserAva
         return $avatar;
     }
 
+    public function deleteAvatar(User $user): void
+    {
+        $avatar = $user->getAvatar();
+        if (! $avatar instanceof UserAvatar) {
+            return;
+        }
+
+        $path = sprintf('%s/%s/', $this->config['uploads']['user']['path'], $user->getUuid()->toString());
+        $this->deleteAvatarFile($path . $avatar->getName());
+        rmdir($path);
+
+        $this->userAvatarRepository->deleteAvatar($avatar);
+    }
+
     public function deleteAvatarFile(string $path): bool
     {
         if (empty($path)) {

src/User/src/Service/UserServiceInterface.php

@@ -34,6 +34,8 @@ public function deleteExpiredRememberMeTokens(): void;
 
     public function updateUser(User $user, array $data = []): UserInterface;
 
+    public function deleteAvatar(User $user): void;
+
     public function deleteAvatarFile(string $path): bool;
 
     public function exists(string $email = '', ?string $uuid = ''): bool;

test/Unit/User/Service/UserServiceTest.php

@@ -9,6 +9,7 @@
 use Frontend\App\Common\Message;
 use Frontend\App\Service\CookieServiceInterface;
 use Frontend\User\Entity\User;
+use Frontend\User\Repository\UserAvatarRepository;
 use Frontend\User\Repository\UserRepository;
 use Frontend\User\Repository\UserRoleRepository;
 use Frontend\User\Service\UserRoleServiceInterface;
@@ -30,6 +31,7 @@ public function testWillInstantiate(): void
             $this->createMock(UserRoleServiceInterface::class),
             $this->createMock(TemplateRendererInterface::class),
             $this->createMock(UserRepository::class),
+            $this->createMock(UserAvatarRepository::class),
             $this->createMock(UserRoleRepository::class),
             []
         );
@@ -42,12 +44,13 @@ public function testWillInstantiate(): void
      */
     public function testCreateUserThrowsDuplicateException(): void
     {
-        $cookieService      = $this->createMock(CookieServiceInterface::class);
-        $mailService        = $this->createMock(MailService::class);
-        $userRoleService    = $this->createMock(UserRoleServiceInterface::class);
-        $template           = $this->createMock(TemplateRendererInterface::class);
-        $userRepository     = $this->createMock(UserRepository::class);
-        $userRoleRepository = $this->createMock(UserRoleRepository::class);
+        $cookieService        = $this->createMock(CookieServiceInterface::class);
+        $mailService          = $this->createMock(MailService::class);
+        $userRoleService      = $this->createMock(UserRoleServiceInterface::class);
+        $template             = $this->createMock(TemplateRendererInterface::class);
+        $userRepository       = $this->createMock(UserRepository::class);
+        $userAvatarRepository = $this->createMock(UserAvatarRepository::class);
+        $userRoleRepository   = $this->createMock(UserRoleRepository::class);
 
         $userRepository->expects($this->once())->method('exists')->willReturn(new User());
         $this->expectException(Exception::class);
@@ -59,6 +62,7 @@ public function testCreateUserThrowsDuplicateException(): void
             $userRoleService,
             $template,
             $userRepository,
+            $userAvatarRepository,
             $userRoleRepository,
             []
         );
@@ -71,12 +75,13 @@ public function testCreateUserThrowsDuplicateException(): void
      */
     public function testCreateUserThrowsRestrictionRolesException(): void
     {
-        $cookieService      = $this->createMock(CookieServiceInterface::class);
-        $mailService        = $this->createMock(MailService::class);
-        $userRoleService    = $this->createMock(UserRoleServiceInterface::class);
-        $template           = $this->createMock(TemplateRendererInterface::class);
-        $userRepository     = $this->createMock(UserRepository::class);
-        $userRoleRepository = $this->createMock(UserRoleRepository::class);
+        $cookieService        = $this->createMock(CookieServiceInterface::class);
+        $mailService          = $this->createMock(MailService::class);
+        $userRoleService      = $this->createMock(UserRoleServiceInterface::class);
+        $template             = $this->createMock(TemplateRendererInterface::class);
+        $userRepository       = $this->createMock(UserRepository::class);
+        $userAvatarRepository = $this->createMock(UserAvatarRepository::class);
+        $userRoleRepository   = $this->createMock(UserRoleRepository::class);
 
         $userRepository->expects($this->once())->method('exists')->willReturn(null);
         $this->expectException(Exception::class);
@@ -88,6 +93,7 @@ public function testCreateUserThrowsRestrictionRolesException(): void
             $userRoleService,
             $template,
             $userRepository,
+            $userAvatarRepository,
             $userRoleRepository,
             []
         );