refactor: cr调整

TencentBlueKing · Sep 23, 2023 · b544c37 · b544c37
1 parent aab16ea
commit b544c37
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/api/bkuser_core/api/web/profile/views.py b/src/api/bkuser_core/api/web/profile/views.py
@@ -199,7 +199,8 @@ def _update(self, request, partial):
         try:
             instance.save()
         except Exception as e:  # pylint: disable=broad-except
-            logger.exception("failed to update profile, exception: %s", e)
+            username = f"{instance.username}@{instance.domain}"
+            logger.exception(f"failed to update profile<{username}>")
             raise error_codes.SAVE_USER_INFO_FAILED.f(exception_message=e)
 
         post_profile_update.send(

diff --git a/src/api/bkuser_core/profiles/v2/views.py b/src/api/bkuser_core/profiles/v2/views.py
@@ -374,9 +374,10 @@ def _update(self, request, partial):
 
         try:
             instance.save()
-        except Exception:  # pylint: disable=broad-except
-            logger.exception("failed to update profile")
-            return error_codes.SAVE_USER_INFO_FAILED
+        except Exception as e:  # pylint: disable=broad-except
+            username = f"{instance.username}@{instance.domain}"
+            logger.exception(f"failed to update profile<{username}>")
+            raise error_codes.SAVE_USER_INFO_FAILED.f(exception_message=e)
 
         post_profile_update.send(
             sender=self,

diff --git a/src/api/bkuser_core/profiles/validators.py b/src/api/bkuser_core/profiles/validators.py
@@ -64,6 +64,14 @@ def validate_extras_value_unique(value: dict, category_id: int, profile_id: int
         ):
             # 防御: 可能存在部分旧数据并未添加所有 extra key
             if f.name not in s.extras:
+                logging.info(
+                    "profile<%s@%s> has the same value<%s> of field<%s-%s>",
+                    s.username,
+                    s.domain,
+                    target_value,
+                    f.name,
+                    f.display_name,
+                )
                 continue
 
             if s.extras[f.name] == target_value: