Chore: facility review fixes #2223
Open
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
dleard
force-pushed
the
chore/facility-review-fixes
branch
from
1aa8b9d
to
f6237f4
Compare
pbastia
reviewed
Sep 20, 2024
|
|
||
|
|
||
| @router.get( | ||
| "/report-version/{version_id}/facility-report/{facility_id}", |
pbastia
approved these changes
Sep 20, 2024
| request: HttpRequest, version_id: int, facility_id: UUID | ||
| ) -> Tuple[Literal[200], Optional[FacilityReportOut]]: | ||
| facility_report = FacilityReportService.get_facility_report_by_version_and_id(version_id, facility_id) | ||
| activity_ids = FacilityReportService.get_activity_ids_for_facility(version_id, facility_id) or [] |
There was a problem hiding this comment.
The service already returns an empty list if none are found
Suggested change
| activity_ids = FacilityReportService.get_activity_ids_for_facility(version_id, facility_id) or [] | |
| activity_ids = FacilityReportService.get_activity_ids_for_facility(version_id, facility_id) |
| facility_type=facility_report.facility_type, | ||
| facility_bcghgid=facility_report.facility_bcghgid, | ||
| activities=list(facility_report.activities.values_list('id', flat=True)), | ||
| products=list(facility_report.products.values_list('id', flat=True)) or [], |
There was a problem hiding this comment.
Suggested change
| products=list(facility_report.products.values_list('id', flat=True)) or [], | |
| products=list(facility_report.products.values_list('id', flat=True)), |
Comment on lines
+37
to
+47
| def facility_report_baker(**props) -> FacilityReport: | ||
| if "report_version" not in props and "report_version_id" not in props: | ||
| props["report_version"] = report_version_baker() | ||
|
|
||
| if "facility" not in props and "facility_id" not in props: | ||
| props["facility"] = facility_baker() | ||
|
|
||
| fr = baker.make(FacilityReport, **props) | ||
|
|
||
| return fr | ||
|
|
There was a problem hiding this comment.
This should be a recipe now :D
| return list(facility_report.activities.values_list('id', flat=True)) | ||
|
|
||
| @classmethod | ||
| def get_facility_report_form_data( |
There was a problem hiding this comment.
I think this method is not a service method, it's just something to build API response data within the API layer. I'd put it in the api/facility_report.py file directly
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.
There were some errors in how facility_id was being applied.
It was being treated as a numeric where it is a UUID value, which had some cascading effects.
This PR should fix that up.
Also cleaned up the API a little bit by splitting out
facility-reportAPI/service stuff into its own directory & added some tests.Easiest way to test this: