Merge pull request #117 from dimagi/sk/cc-username

format commcare username from xform

commcare_connect/form_receiver/processor.py

@@ -161,7 +161,15 @@ def get_app(domain, app_id):
 
 
 def get_user(xform: XForm):
-    user = User.objects.filter(connectiduserlink__commcare_username=xform.metadata.username).first()
+    cc_username = _get_commcare_username(xform)
+    user = User.objects.filter(connectiduserlink__commcare_username=cc_username).first()
     if not user:
-        raise ProcessingError(f"Commcare User {xform.metadata.username} not found")
+        raise ProcessingError(f"Commcare User {cc_username} not found")
     return user
+
+
+def _get_commcare_username(xform: XForm):
+    username = xform.metadata.username
+    if "@" in username:
+        return username
+    return f"{username}@{xform.domain}.commcarehq.org"

commcare_connect/form_receiver/tests/test_receiver_integration.py

@@ -5,14 +5,27 @@
 from commcare_connect.form_receiver.tests.xforms import AssessmentStubFactory, LearnModuleJsonFactory, get_form_json
 from commcare_connect.opportunity.models import Assessment, CompletedModule, LearnModule, Opportunity, UserVisit
 from commcare_connect.opportunity.tests.factories import LearnModuleFactory, OpportunityFactory
-from commcare_connect.users.models import User
+from commcare_connect.users.models import ConnectIDUserLink, User
+from commcare_connect.users.tests.factories import MobileUserFactory
 
 
 @pytest.fixture()
 def opportunity():
     return OpportunityFactory()
 
 
+@pytest.fixture
+def mobile_user_with_connect_link(db, opportunity: Opportunity) -> User:
+    user = MobileUserFactory()
+    links = [ConnectIDUserLink(user=user, commcare_username=f"test@{opportunity.learn_app.cc_domain}.commcarehq.org")]
+    if opportunity.learn_app.cc_domain != opportunity.deliver_app.cc_domain:
+        links.append(
+            ConnectIDUserLink(user=user, commcare_username=f"test@{opportunity.deliver_app.cc_domain}.commcarehq.org")
+        )
+    ConnectIDUserLink.objects.bulk_create(links)
+    return user
+
+
 @pytest.mark.django_db
 def test_form_receiver_learn_module(
     mobile_user_with_connect_link: User, api_client: APIClient, opportunity: Opportunity

commcare_connect/users/tests/factories.py

@@ -53,7 +53,9 @@ class Meta:
 
 
 class MobileUserWithConnectIDLink(MobileUserFactory):
-    connectiduserlink = RelatedFactory(ConnectIdUserLinkFactory, "user", commcare_username="test")
+    connectiduserlink = RelatedFactory(
+        ConnectIdUserLinkFactory, "user", commcare_username="[email protected]"
+    )
 
 
 class OrganizationFactory(DjangoModelFactory):