(django) Improve user and orgs sync with replica databases

Author: filippomc

infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py

@@ -111,12 +111,13 @@ def sync_kc_user(self, kc_user: ch_models.User, is_superuser=False, delete=False
             if not username:
                 raise ValueError(f"Keycloak user {kc_user.id} has no username or email")
 
-            # Create user and member atomically
-            user, user_created = User.objects.get_or_create(username=username)
+            # Create user and member atomically. Pin to the primary DB so lookups
+            # see our own uncommitted writes when a read replica is configured.
+            user, user_created = User.objects.using("default").get_or_create(username=username)
 
             # CRITICAL: Ensure Member exists before proceeding
             try:
-                member = Member.objects.get(user=user)
+                member = Member.objects.using("default").get(user=user)
                 # Member exists but might have wrong kc_id
                 if member.kc_id != kc_user.id:
                     member.kc_id = kc_user.id
@@ -133,8 +134,8 @@ def sync_kc_user(self, kc_user: ch_models.User, is_superuser=False, delete=False
         # FINAL SAFETY CHECK: Verify Member exists before returning
         # This ensures we never return a user without a Member
         try:
-            _ = user.member  # Access member to trigger DoesNotExist if missing
-        except:
+            _ = Member.objects.using("default").get(user=user)
+        except Member.DoesNotExist:
             # This should never happen, but if it does, create Member immediately
             Member.objects.create(kc_id=kc_user.id, user=user)
 
@@ -159,9 +160,10 @@ def sync_kc_user_groups(self, kc_user: ch_models.User, user: User = None):
         # Sync organization memberships separately
         self.sync_kc_user_organizations(kc_user, user=user)
 
-        # Ensure the member relationship exists and is correct
+        # Ensure the member relationship exists and is correct. Use the primary
+        # DB so we see our own uncommitted writes when a read replica is configured.
         try:
-            member = user.member
+            member = Member.objects.using("default").get(user=user)
             if member.kc_id != kc_user.id:
                 member.kc_id = kc_user.id
                 member.save()
@@ -180,17 +182,18 @@ def sync_kc_organization(self, kc_org: ch_models.Organization) -> Organization:
         """
         org = None
 
-        # First try to find by kc_id
+        # First try to find by kc_id. Pin to the primary DB so lookups see our
+        # own uncommitted writes when a read replica is configured.
         try:
-            org = Organization.objects.get(kc_id=kc_org.id)
+            org = Organization.objects.using("default").get(kc_id=kc_org.id)
             # Update name if changed
             if org.name != kc_org.name:
                 org.name = kc_org.name
                 org.save()
         except Organization.DoesNotExist:
             # Try to find by name (for organizations created without kc_id)
             try:
-                org = Organization.objects.get(name=kc_org.name, kc_id__isnull=True)
+                org = Organization.objects.using("default").get(name=kc_org.name, kc_id__isnull=True)
                 # Update with kc_id from Keycloak
                 org.kc_id = kc_org.id
                 org.save()
@@ -224,14 +227,15 @@ def sync_kc_user_organizations(self, kc_user: ch_models.User, user: User = None)
             org = self.sync_kc_organization(kc_org)
             current_org_ids.add(org.id)
 
-            # Create membership if it doesn't exist
-            OrganizationMember.objects.get_or_create(
-                user=user,
-                organization=org
-            )
+            # Create membership if it doesn't exist. Pin to primary so the
+            # existence check sees writes from earlier in this transaction.
+            try:
+                OrganizationMember.objects.using("default").get(user=user, organization=org)
+            except OrganizationMember.DoesNotExist:
+                OrganizationMember.objects.create(user=user, organization=org)
 
         # Remove memberships that no longer exist in Keycloak
-        OrganizationMember.objects.filter(user=user).exclude(
+        OrganizationMember.objects.using("default").filter(user=user).exclude(
             organization_id__in=current_org_ids
         ).delete()