From f82a73cbb1185f0b943036ecdebd1e45768a9241 Mon Sep 17 00:00:00 2001
From: Dmytro Kucherenko <dimakucherenko91@gmail.com>
Date: Wed, 6 Dec 2023 14:22:19 +0200
Subject: [PATCH] 'Solution'

---
 services/user.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/services/user.py b/services/user.py
index 2836f1a58..2db2a9368 100644
--- a/services/user.py
+++ b/services/user.py
@@ -1,5 +1,6 @@
 from typing import Union
 from django.contrib.auth import get_user_model
+from django.http import Http404
 from django.shortcuts import get_object_or_404
 
 from db.models import User
@@ -38,22 +39,22 @@ def update_user(
     first_name: str = None,
     last_name: str = None
 ) -> Union[User, None]:
-
-    user = get_user(user_id)
-
-    if username:
-        user.username = username
-    if password:
-        user.set_password(password)
-    if email:
-        user.email = email
-    if first_name:
-        user.first_name = first_name
-    if last_name:
-        user.last_name = last_name
+    try:
+        user = get_user(user_id)
+
+        if username:
+            user.username = username
+        if password:
+            user.set_password(password)
+        if email:
+            user.email = email
+        if first_name:
+            user.first_name = first_name
+        if last_name:
+            user.last_name = last_name
 
         user.save()
 
         return user
-
-    return None
+    except Http404:
+        return None