From b4bfbe9430634efa8e3842b2b0159e1634f67493 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Mon, 29 Jan 2024 10:53:48 +0300
Subject: [PATCH] Changes before merge

---
 backend/src/modules/user/user.service.ts | 34 +++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/backend/src/modules/user/user.service.ts b/backend/src/modules/user/user.service.ts
index 2c2ad57..4d68fb4 100644
--- a/backend/src/modules/user/user.service.ts
+++ b/backend/src/modules/user/user.service.ts
@@ -21,42 +21,46 @@ export class UserService {
             }
             return user;
         } catch (error) {
-            this.logger.log(`[user.getUser] ${JSON.stringify({ error })}`);
+            this.logger.debug(`[user.getUser] ${JSON.stringify({ error })}`);
         }
     }
-     async banUser(id: string){
+    async banUser(id: string) {
         try {
             this.logger.debug(`[user.banUser] id: ${JSON.stringify(id)}`);
             let user = await this.userRepository.findOne({
                 where: { id: id },
             });
-            if(user){
+            if (user) {
                 user.banned = true;
                 await this.userRepository.save(user);
                 return user;
             }
-            
-            user = await this.userRepository.save({ id: id, banned: true  });
+
+            user = await this.userRepository.save({ id: id, banned: true });
             return user;
         } catch (error) {
-            this.logger.log(`[user.banUser] ${JSON.stringify({ error })}`);
+            this.logger.debug(`[user.banUser] ${JSON.stringify({ error })}`);
         }
-     }
+    }
 
-     async unBanUser(id: string){
+    async unBanUser(id: string) {
         try {
-            this.logger.debug(`[user.deBanUser] id: ${JSON.stringify(id)}`);
+            this.logger.debug(`[user.unBanUser] id: ${JSON.stringify(id)}`);
             let user = await this.userRepository.findOne({
                 where: { id: id },
             });
-            if (!user){
-                throw new HttpException('No user with this id', 404);    
+            if (!user) {
+                throw new HttpException('No user with this id', HttpStatus.NOT_FOUND);
             }
-            user = await this.userRepository.save({ id: id, banned: false  });
+            user = await this.userRepository.save({ id: user.id, banned: false });
             return user;
         } catch (error) {
-            this.logger.log(`[user.deBanUser] ${JSON.stringify({ error })}`);
-            throw error;
+            if (error instanceof HttpException) {
+                this.logger.debug(`[user.unBanUser] User with id: ${id} not found`);
+                throw error;
+            }
+            this.logger.debug(`[user.deBanUser] ${JSON.stringify({ error })}`);
+            throw new HttpException(`[user.unBanUser] Error: ${JSON.stringify(error)}`, HttpStatus.BAD_GATEWAY);
         }
-     }
+    }
 }