feat: propagate original error

internxt · Jan 16, 2025 · baac9a0 · baac9a0
1 parent 6e91418
commit baac9a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 30 deletions.
diff --git a/src/modules/user/user.usecase.spec.ts b/src/modules/user/user.usecase.spec.ts
@@ -1275,24 +1275,24 @@ describe('User use cases', () => {
       expect(result).toMatchObject({ avatar: newAvatarURL });
     });
 
-    it('When deleting the old avatar fails then throw InternalServerErrorException', async () => {
+    it('When deleting the old avatar fails then throw', async () => {
       jest
         .spyOn(avatarService, 'deleteAvatar')
         .mockRejectedValue(new Error('Delete failed'));
 
       await expect(
         userUseCases.upsertAvatar(user, newAvatarKey),
-      ).rejects.toThrow(InternalServerErrorException);
+      ).rejects.toThrow();
     });
 
-    it('When updating the user avatar fails then throw InternalServerErrorException', async () => {
+    it('When updating the user avatar fails then throw', async () => {
       jest
         .spyOn(userRepository, 'updateById')
         .mockRejectedValue(new Error('Update failed'));
 
       await expect(
         userUseCases.upsertAvatar(user, newAvatarKey),
-      ).rejects.toThrow(InternalServerErrorException);
+      ).rejects.toThrow();
     });
 
     it('When user has no avatar already, then previous avatar is not deleted', async () => {
@@ -1338,9 +1338,7 @@ describe('User use cases', () => {
         .spyOn(avatarService, 'deleteAvatar')
         .mockRejectedValue(new Error('Delete failed'));
 
-      await expect(userUseCases.deleteAvatar(user)).rejects.toThrow(
-        InternalServerErrorException,
-      );
+      await expect(userUseCases.deleteAvatar(user)).rejects.toThrow();
       expect(userRepository.updateById).not.toHaveBeenCalled();
     });
   });

diff --git a/src/modules/user/user.usecase.ts b/src/modules/user/user.usecase.ts
@@ -1384,34 +1384,21 @@ export class UserUseCases {
     avatarKey: string,
   ): Promise<Error | { avatar: string }> {
     if (user.avatar) {
-      try {
-        await this.avatarService.deleteAvatar(user.avatar);
-      } catch (err) {
-        throw new InternalServerErrorException('Failed to delete old avatar');
-      }
-    }
-
-    try {
-      await this.userRepository.updateById(user.id, {
-        avatar: avatarKey,
-      });
-      const avatarUrl = await this.getAvatarUrl(avatarKey);
-      return { avatar: avatarUrl };
-    } catch (err) {
-      throw new InternalServerErrorException('Failed to add new avatar');
+      await this.avatarService.deleteAvatar(user.avatar);
     }
+    await this.userRepository.updateById(user.id, {
+      avatar: avatarKey,
+    });
+    const avatarUrl = await this.getAvatarUrl(avatarKey);
+    return { avatar: avatarUrl };
   }
 
   async deleteAvatar(user: User): Promise<Error | void> {
     if (user.avatar) {
-      try {
-        await this.avatarService.deleteAvatar(user.avatar);
-        await this.userRepository.updateById(user.id, {
-          avatar: null,
-        });
-      } catch (err) {
-        throw new InternalServerErrorException('Failed to delete avatar');
-      }
+      await this.avatarService.deleteAvatar(user.avatar);
+      await this.userRepository.updateById(user.id, {
+        avatar: null,
+      });
     }
   }