Minor refactore of update profile picture use case

Author: Julien Neuhart

src/api/src/UseCase/User/CreateUser.php

@@ -86,6 +86,7 @@ public function create(
 
         if ($profilePicture === null) {
             $this->userDao->save($user);
+            $this->resetPassword->resetPassword($email);
 
             return $user;
         }
@@ -97,7 +98,6 @@ public function create(
                 $user,
                 $profilePicture
             );
-
         $this->resetPassword->resetPassword($email);
 
         return $user;

src/api/src/UseCase/User/UpdateProfilePicture.php

@@ -38,12 +38,9 @@ public function __construct(
      */
     public function updateProfilePicture(
         User $user,
-        ?UploadedFileInterface $profilePicture = null
+        UploadedFileInterface $profilePicture
     ): User {
-        $storable = null;
-        if ($profilePicture !== null) {
-            $storable = ProfilePicture::createFromUploadedFile($profilePicture);
-        }
+        $storable = ProfilePicture::createFromUploadedFile($profilePicture);
 
         return $this->update($user, $storable);
     }
@@ -54,15 +51,8 @@ public function updateProfilePicture(
      */
     public function update(
         User $user,
-        ?ProfilePicture $profilePicture = null
+        ProfilePicture $profilePicture
     ): User {
-        if ($profilePicture === null) {
-            $user->setProfilePicture(null);
-            $this->userDao->save($user);
-
-            return $user;
-        }
-
         // We validate the new profile picture before
         // doing anything else.
         $this->profilePictureStorage->validate($profilePicture);

src/api/tests/UseCase/User/CreateUserTest.php

@@ -4,11 +4,13 @@
 
 use App\Domain\Enum\Locale;
 use App\Domain\Enum\Role;
+use App\Domain\Model\Storable\ProfilePicture;
 use App\Domain\Throwable\InvalidModel;
 use App\Tests\UseCase\DummyValues;
 use App\UseCase\User\CreateUser;
 
 use function PHPUnit\Framework\assertEquals;
+use function PHPUnit\Framework\assertNotNull;
 use function PHPUnit\Framework\assertNull;
 
 it(
@@ -18,17 +20,26 @@ function (
         string $lastName,
         string $email,
         Locale $locale,
-        Role $role
+        Role $role,
+        ?string $filename
     ): void {
         $createUser = self::$container->get(CreateUser::class);
         assert($createUser instanceof CreateUser);
 
-        $user = $createUser->createUser(
+        $storable = null;
+        if ($filename !== null) {
+            $storable = ProfilePicture::createFromPath(
+                dirname(__FILE__) . '/' . $filename
+            );
+        }
+
+        $user = $createUser->create(
             $firstName,
             $lastName,
             $email,
             $locale,
-            $role
+            $role,
+            $storable
         );
 
         assertEquals($firstName, $user->getFirstName());
@@ -37,11 +48,17 @@ function (
         assertNull($user->getPassword());
         assertEquals($locale, $user->getLocale());
         assertEquals($role, $user->getRole());
+
+        if ($filename !== null) {
+            assertNotNull($user->getProfilePicture());
+        } else {
+            assertNull($user->getProfilePicture());
+        }
     }
 )
     ->with([
-        ['foo', 'bar', 'foo.bar@baz.com', Locale::EN(), Role::ADMINISTRATOR()],
-        ['foo', 'bar', 'foo.bar@baz.com', Locale::EN(), Role::USER()],
+        ['foo', 'bar', 'foo.bar@baz.com', Locale::EN(), Role::ADMINISTRATOR(), null],
+        ['foo', 'bar', 'foo.bar@baz.com', Locale::EN(), Role::USER(), 'foo.png'],
     ])
     ->group('user');
 

src/api/tests/UseCase/User/UpdateProfilePictureTest.php

@@ -13,7 +13,6 @@
 
 use function PHPUnit\Framework\assertFalse;
 use function PHPUnit\Framework\assertNotNull;
-use function PHPUnit\Framework\assertNull;
 use function PHPUnit\Framework\assertTrue;
 
 beforeEach(function (): void {
@@ -32,28 +31,22 @@
 });
 
 it('updates a profile picture', function (?string $filename): void {
-        $userDao = self::$container->get(UserDao::class);
-        assert($userDao instanceof UserDao);
-        $updateProfilePicture = self::$container->get(UpdateProfilePicture::class);
-        assert($updateProfilePicture instanceof UpdateProfilePicture);
-        $profilePictureStorage = self::$container->get(ProfilePictureStorage::class);
-        assert($profilePictureStorage instanceof ProfilePictureStorage);
-
-        $user = $userDao->getById('1');
+    $userDao = self::$container->get(UserDao::class);
+    assert($userDao instanceof UserDao);
+    $updateProfilePicture = self::$container->get(UpdateProfilePicture::class);
+    assert($updateProfilePicture instanceof UpdateProfilePicture);
+    $profilePictureStorage = self::$container->get(ProfilePictureStorage::class);
+    assert($profilePictureStorage instanceof ProfilePictureStorage);
+
+    $user     = $userDao->getById('1');
+    $storable = ProfilePicture::createFromPath(
+        dirname(__FILE__) . '/' . $filename
+    );
+    $user     = $updateProfilePicture->update($user, $storable);
 
-    if ($filename !== null) {
-        $storable = ProfilePicture::createFromPath(
-            dirname(__FILE__) . '/' . $filename
-        );
-        $user     = $updateProfilePicture->update($user, $storable);
-        assertTrue($profilePictureStorage->fileExists($user->getProfilePicture()));
-    } else {
-        $user = $updateProfilePicture->update($user, null);
-        assertNull($user->getProfilePicture());
-    }
+    assertTrue($profilePictureStorage->fileExists($user->getProfilePicture()));
 })
     ->with([
-        null,
         'foo.png',
         'foo.jpg',
     ])

src/api/tests/UseCase/User/UpdateUserTest.php

@@ -71,7 +71,7 @@ function (
         assertEquals($role, $user->getRole());
 
         if ($filename !== null) {
-            assertNotNull($filename);
+            assertNotNull($user->getProfilePicture());
         } else {
             assertNull($user->getProfilePicture());
         }
@@ -110,7 +110,7 @@ function (
             Role::USER()
         );
 
-        $updateUser->update(
+        $updateUser->updateUser(
             $userDao->getById('1'),
             $firstName,
             $lastName,

src/webapp/graphql/users/update_profile_picture.mutation.js

@@ -1,7 +1,7 @@
 import { gql } from 'graphql-request'
 
 export const UpdateProfilePictureMutation = gql`
-  mutation updateProfilePicture($profilePicture: Upload) {
+  mutation updateProfilePicture($profilePicture: Upload!) {
     updateProfilePicture(profilePicture: $profilePicture) {
       profilePicture
     }