Support free flow text for assigned_facility in Shifting form #1246
Conversation
| elif validated_data.get("assigned_facility"): | ||
| validated_data["assigned_facility_external"] = None | ||
|
|
||
| if validated_data.get("assigned_facility"): |
There was a problem hiding this comment.
This condition is just above it as well right?
There was a problem hiding this comment.
The above one is for the update method, this one is in the create method.
There was a problem hiding this comment.
Line 262 and 259 are the same condition right ?
There was a problem hiding this comment.
Yep those two are the same.. I had separated those code blocks as they served different purposes. The purpose of the initial if else block was to clear out the "other" facility source, so that both external and care facilities could not be set together.
The second if block was to set the value of assigned_facility_id (old code, already present).
I can proceed with merging those two conditions. So, it'll look like: (Basically merge those two if blocks)
if validated_data.get("assigned_facility_external"):
validated_data["assigned_facility"] = None
elif validated_data.get("assigned_facility"):
validated_data["assigned_facility_external"] = None
assigned_facility_external_id = validated_data.pop("assigned_facility")[
"external_id"
]
if assigned_facility_external_id:
validated_data["assigned_facility_id"] = Facility.objects.get(
external_id=assigned_facility_external_id
).id
Should I go ahead with this change?
| if assigned_facility_external_id: | ||
| validated_data["assigned_facility_id"] = Facility.objects.get( | ||
| external_id=assigned_facility_external_id | ||
| ).id | ||
| assigned = True | ||
| if validated_data.get("assigned_facility_external"): |
There was a problem hiding this comment.
Not sure what is happening in this block
There was a problem hiding this comment.
Since we are assigning an external facility, there's is no data about it in the care platform, hence assigned_facility_id and assigned_facility_object cannot be set in this case. So, this block removes those. The only information we have about this external facility is its name. No id or facility_object is available to set. So they are set to None
|
Kudos, SonarCloud Quality Gate passed!
|
Codecov ReportPatch coverage:
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more Additional details and impacted files@@ Coverage Diff @@
## master #1246 +/- ##
==========================================
- Coverage 56.33% 56.28% -0.05%
==========================================
Files 195 195
Lines 9554 9565 +11
Branches 1603 1606 +3
==========================================
+ Hits 5382 5384 +2
- Misses 4117 4126 +9
Partials 55 55
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report in Codecov by Sentry. |
Required for: ohcnetwork/care_fe#5323
Proposed Changes
assigned_facility_externalto store the raw name of facility which are not in CARE. This is used to support free flow input in theShifting form for Assigned facility.preferred_vehicle_choiceis made optional, because it is being hid from the frontend.PR is split into two commits,
changesandformatting@coronasafe/code-reviewers