Feat/reports stay after transfer/3584 #3829

andrea-williams · 2025-09-17T18:17:29Z

Recommended Testing Steps

sign in with your own Business BCeID, or use bc-cas-dev-secondary. Create a new operator for this user. Then log out
sign in with your IDIR. Delete the existing pending transfer for "Bangles SFO" (operator Bravo Technologies). Create a new transfer for "Bangles SFO" to transfer to the operator created in Step 1, with date of transfer effective immediately. Log out.
sign in with the bc-cas-dev Business BCeID (operator is Bravo Technologies). Confirm that "Bangles SFO" operation no longer appears in your Administration dashboard, but it should still appear in your Reporting dashboard and you should still be able to view the report that was submitted for it. Log out.
sign in again with the BCeID used in Step 1. Confirm that "Bangles SFO" operation now appears in your Administration dashboard. Then go to Reporting dashboard and confirm that the operation appears there too, but that you don't have the option to view the report submitted for it by Bravo. Click the "Start" button to try to create a new report for Bangles SFO - you should see a modal popup with an error message saying that a report already exists for that operation and reporting year. does not appear.

Brianna updates:

reporting dashboard query only returns operations relevant for the current reporting year
updated OperationDesignatedOperatorTimelineDataAccessService.get_operation_timeline_for_user to facilitate ^
pytest tweaks (use bakers, test extreme of date range)
new pytest for the endpoint
more testing instructions in the card
related bug ticket: If an operation has been transferred, the old owner cannot start a report or finish a draft report for it [4] cas-reporting#895

BCerki · 2025-09-29T15:20:10Z

bc_obps/reporting/service/reporting_dashboard_service.py

-            report_version__report__reporting_year=reporting_year,
-        ).values("operation_name")[:1]
+
+        current_operations = OperationDataAccessService.get_all_current_operations_for_user(user)


b this is more complicated than needed?

BCerki · 2025-09-29T15:20:50Z

bc_obps/reporting/tests/service/test_reporting_dashboard_service.py

+        user = baker.make(User, app_role=AppRole.objects.get(role_name="industry_user"))
+        operator = operator_baker()
+        user_operator = user_operator_baker(
+            {
+                "user": user,
+                "operator": operator,
+                "status": UserOperator.Statuses.APPROVED,
+                "role": UserOperator.Roles.ADMIN,
+            }
+        )
+        mock_get_by_guid.return_value = user_operator.user


replace with recipes

BCerki · 2025-09-29T15:26:06Z

bc_obps/reporting/tests/service/test_reporting_dashboard_service.py

+        operation_baker(_quantity=20)
+
+        # create report for operation, filed by original_operator
+        report_r1v1_id = ReportService.create_report(operation.id, reporting_year_2024.reporting_year)


better to use bakers

I still think it's better to use bakers, but I'm going to leave as-is because it does work and setting up the bakers manually requires a good understanding of reporting

BCerki · 2025-09-29T15:29:47Z

bc_obps/reporting/tests/service/test_reporting_dashboard_service.py

+        timeline1.end_date = "2025-07-01T00:00:00Z"
+        timeline1.save()
+        OperationDesignatedOperatorTimeline.objects.create(
+            operation=operation, operator=new_user_operator.operator, start_date="2025-07-01T00:00:00Z", end_date=None


use dates at end of year

BCerki · 2025-09-29T15:36:56Z

bc_obps/service/data_access_service/operation_service.py

            .only("id", "name", "submission_date", "status", "operator__legal_name", "bc_obps_regulated_operation__id")
        )
+
+    @classmethod


we already have get_previously_owned_operations_by_operator, overlap?

BCerki · 2025-09-29T15:42:06Z

bciers/apps/reporting/src/app/components/operations/cells/ActionCell.tsx

-      if (response?.error)
-        setResponseError(
-          `We couldn't create a report for operation ID '${operationId}' and reporting year '${reportingYear}': ${response?.error}.`,
+      if (response?.error) {


this was an unrelated bug?

BCerki

Comments are notes to self

… ReportDataAccessService

…revious owner-operator can now view their reports but new owner-operator can see previous owners' reports too - they shouldnt be able to

…rect operator, but new operator still sees duplicated operations and can't create a new report

…ate report for operation that already has one from old operator

…s_for_operator. Need to investigate failing tests

… Years Reports PR

… more still failing due to changed code; new pytests still needed

…eorganized one API file

…eval_after_transfer to fail

andrea-williams self-assigned this Sep 18, 2025

pbastia force-pushed the develop branch 2 times, most recently from 834bc9d to f40780b Compare September 22, 2025 17:04

andrea-williams force-pushed the feat/reports-stay-after-transfer/3584 branch from a05a54b to d23e6a5 Compare September 23, 2025 23:06

BCerki reviewed Sep 29, 2025

View reviewed changes

BCerki force-pushed the feat/reports-stay-after-transfer/3584 branch 5 times, most recently from c204948 to 4b0cafa Compare October 2, 2025 22:46

andrea-williams added 14 commits October 2, 2025 15:48

chore: in progress. Added function to get_all_reports_for_operator to…

ef794a1

… ReportDataAccessService

chore: added function to get_previous_operations_for_user_operator. P…

c90f9a9

…revious owner-operator can now view their reports but new owner-operator can see previous owners' reports too - they shouldnt be able to

chore: added filter on reports to only fetch reports submitted by cor…

f47824b

…rect operator, but new operator still sees duplicated operations and can't create a new report

chore: fixed duplication error

8d823f6

chore: rough draft of modal with error when new operator tries to cre…

98f43bc

…ate report for operation that already has one from old operator

chore: refactored some pytests and get_all_previously_owned_operation…

c2da6ee

…s_for_operator. Need to investigate failing tests

chore: updated error message in modal and removed unnecessary button

f36c4ff

chore: partially fixed failing python tests. But still have failures

dd41f63

chore: partially fixed failing python tests. But still have failures

f58bd3f

chore: removed breakpoint. All pytests passing locally

a5ab424

chore: trying to make mypy happy but thats an impossible task

91fd219

chore: coalesced some things in this PR with recently-merged Previous…

d5dfcb6

… Years Reports PR

chore: achieved desired behaviour in-app

6d0c5dc

chore: fixed 2 failing pytests (due to poor conflict resolution). One…

ef70120

… more still failing due to changed code; new pytests still needed

andrea-williams and others added 10 commits October 2, 2025 15:48

chore: cleaned up some code and fixed failing unit test

3f92175

chore: reverting previous change that still didn't make mypy happy

5e273d3

chore: fixed some mypy complaints

75d5675

chore: linting changes and making mypy happy

bd119b7

chore: fixed filtering error (unneeded filter by operator id). Also r…

9cd8a1c

…eorganized one API file

chore: fixed issues in test setup that were causing test_report_retri…

64beae1

…eval_after_transfer to fail

chore: fixed my confusion between report_id and report version ids

0efabc1

chore: remove modal

fbed1be

chore: services to fetch operations owned in the current reporting year

49cee8a

test: pytest services to retrieve operations for current reporting year

de75d53

BCerki force-pushed the feat/reports-stay-after-transfer/3584 branch from 4b0cafa to de75d53 Compare October 2, 2025 22:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Feat/reports stay after transfer/3584 #3829

Feat/reports stay after transfer/3584 #3829

Uh oh!

andrea-williams commented Sep 17, 2025 •

edited by BCerki

Loading

Uh oh!

BCerki Sep 29, 2025

Uh oh!

BCerki Sep 29, 2025

Uh oh!

BCerki Sep 29, 2025 •

edited

Loading

Uh oh!

BCerki Sep 29, 2025

Uh oh!

BCerki Sep 29, 2025

Uh oh!

BCerki Sep 29, 2025

Uh oh!

BCerki Sep 29, 2025

Uh oh!

BCerki Sep 29, 2025

Uh oh!

BCerki left a comment

Uh oh!

Uh oh!

Feat/reports stay after transfer/3584 #3829

Are you sure you want to change the base?

Feat/reports stay after transfer/3584 #3829

Uh oh!

Conversation

andrea-williams commented Sep 17, 2025 • edited by BCerki Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Recommended Testing Steps

Uh oh!

BCerki Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

BCerki Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

BCerki Sep 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BCerki Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

BCerki Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

BCerki Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

BCerki Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

BCerki Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

BCerki left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

andrea-williams commented Sep 17, 2025 •

edited by BCerki

Loading

BCerki Sep 29, 2025 •

edited

Loading