Task/remove statuses from timeline tables/2750 #2872
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrea-williams
force-pushed
the
task/remove-statuses-from-timeline-tables/2750
branch
2 times, most recently
from
2f2f837 to
323bff2
Compare
BCerki
reviewed
Feb 20, 2025
There was a problem hiding this comment.
Nice work! Yay deleting code 🕺
Some notes:
- I think we should keep the test assertions as they are, and if a mock record was being assigned a status of TRANSFERRED, it gets an end date instead. We're not using statuses anymore but it's still relevant that people see/don't see transferred records. The timeline bakers assign an end_date by default so we might have to change that
- I get an error when I try to make a transfer:
django.core.exceptions.FieldError: Cannot resolve keyword 'status' into field. Choices are: archived_at, archived_by, archived_by_id, created_at, created_by, created_by_id, end_date, id, operation, operation_id, operator, operator_id, sfo_facility_id, sfo_facility_name, start_date, updated_at, updated_by, updated_by_id
| return queryset.filter(operator_id=user_operator.operator_id).exclude( | ||
| status=OperationDesignatedOperatorTimeline.Statuses.TRANSFERRED | ||
| ) | ||
| return queryset.filter(operator_id=user_operator.operator_id) |
There was a problem hiding this comment.
I wasn't able to manually check this because I couldn't do a transfer (see overall comments), but I think we'll still need the exclude filtered on end_date instead of status. Otherwise, people will be able to see things the no longer own
| @@ -21,7 +21,6 @@ def get_timeline_by_operation_id( | |||
|
|
|||
| if user.is_industry_user(): | |||
| UserOperatorService.get_current_user_approved_user_operator_or_raise(user) | |||
| base_queryset = base_queryset.exclude(status=FacilityDesignatedOperationTimeline.Statuses.TRANSFERRED) | |||
There was a problem hiding this comment.
I think we need the exclude with end_date here too
| @@ -22,25 +21,15 @@ def test_unapproved_user_exception(): | |||
| def test_get_operations_for_industry_user(): | |||
| approved_user_operator = baker.make_recipe('registration.tests.utils.approved_user_operator') | |||
|
|
|||
| # transferred operation - should not be returned | |||
There was a problem hiding this comment.
I think we should still test transferred operations aren't returned.
andrea-williams
force-pushed
the
task/remove-statuses-from-timeline-tables/2750
branch
from
323bff2 to
d8fb2fd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Card: #2750