Skip to content

Commit fe1146f

Browse files
committed
Address code review comments
1 parent 5d80f24 commit fe1146f

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

openedx/api.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,14 @@ def create_edx_user(user):
101101
if not created and open_edx_user.has_been_synced:
102102
# Here we should check with edx that the user exists on that end.
103103
try:
104-
get_edx_api_client(user)
104+
client = get_edx_api_client(user)
105+
client.user_info.get_user_info()
105106
except:
106107
pass
107108
else:
108109
open_edx_user.has_been_synced = True
109110
open_edx_user.save()
110-
return created
111+
return False
111112

112113
# a non-200 status here will ensure we rollback creation of the OpenEdxUser and try again
113114
req_session = requests.Session()
@@ -135,7 +136,7 @@ def create_edx_user(user):
135136
)
136137
open_edx_user.has_been_synced = True
137138
open_edx_user.save()
138-
return created
139+
return True
139140

140141

141142
@transaction.atomic

openedx/api_test.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -205,17 +205,18 @@ def test_create_edx_user_for_user_not_synced_with_edx(
205205
OpenEdxUserFactory.create(
206206
user=user, has_been_synced=open_edx_user_record_has_been_synced
207207
)
208-
mocker.patch(
209-
"openedx.api.get_edx_api_client",
210-
side_effect=ValueError("Unexpected error")
211-
if not open_edx_user_record_exists
212-
else None,
208+
mock_client = mocker.MagicMock()
209+
mock_client.user_info.get_user_info = mocker.Mock(
210+
side_effect=Exception if not open_edx_user_record_exists else None,
213211
)
212+
mocker.patch("openedx.api.get_edx_api_client", return_value=mock_client)
214213

215214
user_created_in_edx = create_edx_user(user)
216215

217216
assert OpenEdxUser.objects.get(user=user).has_been_synced is True
218-
assert user_created_in_edx is False if open_edx_user_record_exists else True
217+
assert user_created_in_edx is not (
218+
open_edx_user_record_exists and open_edx_user_record_has_been_synced
219+
)
219220

220221

221222
@responses.activate

0 commit comments

Comments
 (0)