feedback + deps error fix

Author: arslanashraf7

openedx/api.py

@@ -265,7 +265,7 @@ def _set_edx_error(open_edx_user, data):
     open_edx_user.save()
 
 
-def _create_edx_user_request(open_edx_user, user, access_token):  # noqa: C901
+def _create_edx_user_request(open_edx_user, user, access_token):  # noqa: C901, PLR0915
     """
     Handle the actual user creation request to Open edX with retry logic for duplicate usernames.
 
@@ -314,7 +314,7 @@ def _create_edx_user_request(open_edx_user, user, access_token):  # noqa: C901
     try:
         resp = None
         data = None
-
+        tried_duplicate_email_fix = False
         while attempt < max_attempts:
             attempt += 1
 
@@ -335,6 +335,16 @@ def _create_edx_user_request(open_edx_user, user, access_token):  # noqa: C901
 
             data = _parse_openedx_response(resp)
 
+            # Only try for LTI user duplicate email error fix if the response error was duplicate-email
+            if _is_duplicate_email_error(resp, data) and not tried_duplicate_email_fix:
+                tried_duplicate_email_fix = True
+                client = get_edx_api_lti_dup_email_client()
+                dup_email_fix_resp = client.fix_lti_user(email=user.email)
+                # If the LTI API fixed the duplicate email issue, Retry account creation
+                if dup_email_fix_resp.status_code == status.HTTP_200_OK:
+                    continue
+                break
+
             new_username, should_continue, should_reset_attempts = (
                 _handle_username_collision(
                     resp,
@@ -351,17 +361,6 @@ def _create_edx_user_request(open_edx_user, user, access_token):  # noqa: C901
                 if should_reset_attempts:
                     attempt = 0
                 continue
-
-            # Only try for LTI user duplicate email error fix if the response error was duplicate-email
-            if _is_duplicate_email_error(resp, data):
-                client = get_edx_api_lti_dup_email_client()
-                dup_email_fix_resp = client.fix_lti_user(
-                    email=user.email, username=current_username
-                )
-                # If the LTI API fixed the duplicate email issue, Retry account creation
-                if dup_email_fix_resp.status_code == status.HTTP_200_OK:
-                    continue
-                break
             break
 
         if _is_bad_request(resp):

openedx/api_test.py

@@ -287,14 +287,12 @@ def test_create_edx_user_409_errors(settings, error_data, lti_fix_response_statu
 
     assert resp1.call_count == 0
     if is_duplicate_email:
-        if lti_fix_response_status == status.HTTP_200_OK:
-            # The registration will be retried again after the LTI fix and since the loops
-            # runs 4 times it will run 4 times
-            assert resp2.call_count == 4
-            assert resp3.call_count == 4
-        else:
-            assert resp2.call_count == 1
-            assert resp3.call_count == 1
+        assert (
+            resp2.call_count == 2
+            if lti_fix_response_status == status.HTTP_200_OK
+            else 1
+        )
+        assert resp3.call_count == 1
     else:
         assert resp2.call_count == 1
         assert resp3.call_count == 0