Django: Improve db coherence on user sync issues

MetaCell · Nov 6, 2024 · fa4c3fe · fa4c3fe
1 parent d938c97
commit fa4c3fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...mon-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/admin.py b/...mon-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/admin.py
@@ -4,7 +4,7 @@
 from django.contrib.auth.models import User, Group
 
 from admin_extra_buttons.api import ExtraButtonsMixin, button
-
+from .models import Member
 from cloudharness_django.services import get_user_service
 
 # Register your models here.
@@ -13,8 +13,14 @@
 admin.site.unregister(Group)
 
 
+class MemberAdmin(admin.StackedInline):
+    model = Member
+
+
 class CHUserAdmin(ExtraButtonsMixin, UserAdmin):
 
+    inlines = [MemberAdmin]
+
     def has_add_permission(self, request):
         return settings.DEBUG or settings.USER_CHANGE_ENABLED
 

diff --git a/...es/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py b/...es/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py
@@ -100,7 +100,9 @@ def sync_kc_user(self, kc_user, is_superuser=False, delete=False):
 
         user, created = User.objects.get_or_create(username=kc_user["username"])
 
-        Member.objects.get_or_create(user=user, kc_id=kc_user["id"])
+        member = Member.objects.get_or_create(user=user)
+        member.kc_id = kc_user["id"]
+        member.save()
         user = self._map_kc_user(user, kc_user, is_superuser, delete)
         user.save()
         return user