Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

approve: handle usernames not in session #126

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −3
Open

approve: handle usernames not in session #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ocflib/account/submission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,19 +297,25 @@ def get_remove_row_by_user_name(user_name):
request_row = session.query(StoredNewAccountRequest).filter(
StoredNewAccountRequest.user_name == user_name
).first()
session.delete(request_row)
session.commit()
if request_row:
session.delete(request_row)
session.commit()
return request_row

@celery_app.task
def approve_request(user_name):
request = get_remove_row_by_user_name(user_name).to_request()
stored_request = get_remove_row_by_user_name(user_name)
if not stored_request:
raise ValueError('No pending request for user')
request = stored_request.to_request()
create_account.delay(request)
dispatch_event('ocflib.account_approved', request=request.to_dict())

@celery_app.task
def reject_request(user_name):
stored_request = get_remove_row_by_user_name(user_name)
if not stored_request:
raise ValueError('No pending request for user')
request = stored_request.to_request()
send_rejected_mail(request, stored_request.reason)
dispatch_event('ocflib.account_rejected', request=request.to_dict())
Expand Down
24 changes: 24 additions & 0 deletions tests/account/submission_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,17 @@ def test_approve_request(celery_app, fake_new_account_request, session_with_requ
]


def test_approve_request_invalid(celery_app, fake_new_account_request, session_with_requests, tasks):
assert len(session_with_requests.query(StoredNewAccountRequest).all()) == 2
with pytest.raises(ValueError):
tasks.approve_request('keur')

# invalid request, nothing changed
assert len(session_with_requests.query(StoredNewAccountRequest).all()) == 2
tasks.create_account.delay.assert_not_called()
assert celery_app._sent_messages == []


@mock.patch('ocflib.account.submission.send_rejected_mail')
def test_reject_request(send_rejected_mail, celery_app, fake_new_account_request, session_with_requests, tasks):
tasks.reject_request(fake_new_account_request.user_name)
Expand All @@ -139,6 +150,19 @@ def test_reject_request(send_rejected_mail, celery_app, fake_new_account_request
send_rejected_mail.assert_called_once_with(request, mock.ANY)


@mock.patch('ocflib.account.submission.send_rejected_mail')
def test_reject_request_invalid(send_rejected_mail, celery_app, fake_new_account_request,
session_with_requests, tasks):
assert len(session_with_requests.query(StoredNewAccountRequest).all()) == 2
with pytest.raises(ValueError):
tasks.reject_request('keur')

# invalid request, nothing changed
assert len(session_with_requests.query(StoredNewAccountRequest).all()) == 2
assert celery_app._sent_messages == []
send_rejected_mail.assert_not_called()


def test_get_pending_requests(session_with_requests, tasks, fake_new_account_request):
request = fake_new_account_request
pending_requests = tasks.get_pending_requests()
Expand Down