Fix IntegrityError when syncing Keycloak organizations without descriptions (#3013)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: jkachel <[email protected]>
Co-authored-by: James Kachel <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 3 people

b2b/api.py

@@ -902,15 +902,15 @@ def reconcile_single_keycloak_org(keycloak_org: OrganizationRepresentation):
             name=keycloak_org.name,
             sso_organization_id=keycloak_org.id,
             org_key=keycloak_org.alias[:ORG_KEY_MAX_LENGTH],
-            description=keycloak_org.description,
+            description=keycloak_org.description or "",
         )
         log.info("Created organization %s from Keycloak", page)
         created_flag = True
     else:
         # Don't update the org_key, because course keys are tied to it.
         page.name = keycloak_org.name
         page.title = keycloak_org.name
-        page.description = keycloak_org.description
+        page.description = keycloak_org.description or ""
         log.info("Updated organization %s from Keycloak", page)
 
     return (page, created_flag)

b2b/api_test.py

@@ -747,6 +747,32 @@ def test_reconcile_bad_keycloak_org(mocker):
     assert "Organization with this Org key already exists." in str(exc)
 
 
+def test_reconcile_keycloak_org_without_description():
+    """Test that reconciliation works when Keycloak org has no description"""
+
+    if not OrganizationIndexPage.objects.exists():
+        factories.OrganizationIndexPageFactory.create()
+
+    # Test with None description (new org)
+    org = factories.OrganizationRepresentationFactory.create(description=None)
+    page, created = reconcile_single_keycloak_org(org)
+    assert created is True
+    assert page.description == ""
+
+    parent_org_page = OrganizationIndexPage.objects.first()
+    parent_org_page.add_child(instance=page)
+    page.save()  # Should not raise IntegrityError
+
+    # Test updating an existing org with None description
+    org_update = factories.OrganizationRepresentationFactory.create(
+        id=org.id, name="Updated Name", description=None
+    )
+    page_updated, created_update = reconcile_single_keycloak_org(org_update)
+    assert created_update is False
+    assert page_updated.description == ""
+    page_updated.save()  # Should not raise IntegrityError
+
+
 def test_user_add_b2b_org(mocked_b2b_org_attach):
     """Ensure adding a user to an organization works as expected."""