Skip to content

Commit f972928

Browse files
committed
Change message for grant reimbursements in review session
1 parent a94411d commit f972928

2 files changed

Lines changed: 18 additions & 13 deletions

File tree

backend/reviews/admin.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def _review_grants_recap_view(self, request, review_session):
318318
create_deletion_admin_log_entry(
319319
request.user,
320320
grant,
321-
change_message=f"Reimbursement removed: {reimbursement.category.name}",
321+
change_message=f"[Review Session] Reimbursement removed: {reimbursement.category.name}",
322322
)
323323
reimbursement.delete()
324324
else:
@@ -331,7 +331,7 @@ def _review_grants_recap_view(self, request, review_session):
331331
create_deletion_admin_log_entry(
332332
request.user,
333333
grant,
334-
change_message=f"Reimbursement removed: {reimbursement.category.name}",
334+
change_message=f"[Review Session] Reimbursement removed: {reimbursement.category.name}",
335335
)
336336
to_delete.delete()
337337

@@ -346,7 +346,7 @@ def _review_grants_recap_view(self, request, review_session):
346346
create_change_admin_log_entry(
347347
request.user,
348348
grant,
349-
change_message=f"Grant pending_status changed from '{grant.status}' to '{grant.pending_status}'.",
349+
change_message=f"[Review Session] Grant status updated: pending_status changed from '{grant.status}' to '{grant.pending_status}'.",
350350
)
351351

352352
approved_reimbursement_categories = (
@@ -373,13 +373,13 @@ def _review_grants_recap_view(self, request, review_session):
373373
create_addition_admin_log_entry(
374374
request.user,
375375
grant,
376-
change_message=f"Reimbursement {reimbursement.category.name} added.",
376+
change_message=f"[Review Session] Reimbursement {reimbursement.category.name} added.",
377377
)
378378
else:
379379
create_change_admin_log_entry(
380380
request.user,
381381
grant,
382-
change_message=f"Reimbursement {reimbursement.category.name} updated.",
382+
change_message=f"[Review Session] Reimbursement {reimbursement.category.name} updated.",
383383
)
384384

385385
messages.success(

backend/reviews/tests/test_admin.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -375,22 +375,22 @@ def test_save_review_grants_updates_grant_and_creates_reimbursements(rf, mocker)
375375
assert LogEntry.objects.filter(
376376
user=user,
377377
object_id__in=[str(grant_1.id), str(grant_2.id)],
378-
change_message=f"Grant pending_status changed from '{Grant.Status.pending}' to '{Grant.Status.approved}'.",
378+
change_message=f"[Review Session] Grant status updated: pending_status changed from '{Grant.Status.pending}' to '{Grant.Status.approved}'.",
379379
).exists()
380380
assert LogEntry.objects.filter(
381381
user=user,
382382
object_id__in=[str(grant_1.id), str(grant_2.id)],
383-
change_message=f"Reimbursement {ticket_category.name} added.",
383+
change_message=f"[Review Session] Reimbursement {ticket_category.name} added.",
384384
).exists()
385385
assert LogEntry.objects.filter(
386386
user=user,
387387
object_id__in=[str(grant_1.id), str(grant_2.id)],
388-
change_message=f"Reimbursement {travel_category.name} added.",
388+
change_message=f"[Review Session] Reimbursement {travel_category.name} added.",
389389
).exists()
390390
assert LogEntry.objects.filter(
391391
user=user,
392392
object_id=str(grant_2.id),
393-
change_message=f"Reimbursement {accommodation_category.name} added.",
393+
change_message=f"[Review Session] Reimbursement {accommodation_category.name} added.",
394394
).exists()
395395

396396
mock_messages.success.assert_called_once()
@@ -477,7 +477,7 @@ def test_save_review_grants_update_grants_status_to_rejected_removes_reimburseme
477477
assert LogEntry.objects.filter(
478478
user=user,
479479
object_id=str(reimbursement.id),
480-
change_message=f"Reimbursement removed: {reimbursement.category.name}",
480+
change_message=f"[Review Session] Reimbursement removed: {reimbursement.category.name}",
481481
).exists()
482482

483483

@@ -557,14 +557,19 @@ def test_save_review_grants_modify_reimbursements(rf, mocker):
557557
reimbursement.category for reimbursement in grant_1.reimbursements.all()
558558
} == {ticket_category}
559559

560-
assert LogEntry.objects.count() == 2
560+
assert LogEntry.objects.count() == 4
561+
assert LogEntry.objects.filter(
562+
user=user,
563+
object_id__in=[str(grant_1.id)],
564+
change_message=f"[Review Session] Grant status updated: pending_status changed from '{Grant.Status.pending}' to '{Grant.Status.approved}'.",
565+
).exists()
561566
assert LogEntry.objects.filter(
562567
user=user,
563568
object_id=str(travel_category.id),
564-
change_message=f"Reimbursement removed: {travel_category.name}",
569+
change_message=f"[Review Session] Reimbursement removed: {travel_category.name}",
565570
).exists()
566571
assert LogEntry.objects.filter(
567572
user=user,
568573
object_id=str(accommodation_category.id),
569-
change_message=f"Reimbursement {accommodation_category.name} removed.",
574+
change_message=f"[Review Session] Reimbursement removed: {accommodation_category.name}",
570575
).exists()

0 commit comments

Comments
 (0)