feat: Added validation for max dosage and corresponding test cases #2383 #2531
+51
−0
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
- Added validation to ensure max dosage is greater than or equal to base dosage in PrescriptionSerializer. - Added test cases to validate the new dosage constraints. - Updated test_prescriptions_api.py to include tests for valid, equal, and invalid dosage scenarios. Resolves issue with incorrect dosage validation.
rithviknishad
requested changes
Oct 13, 2024
Comment on lines
102
to
108
| def extract_numeric_value(dosage): | ||
|
|
||
| match = re.match(r"(\d+(\.\d+)?)", dosage) # Matches digits and optional decimal part | ||
| if match: | ||
| return float(match.group(1)) | ||
| raise serializers.ValidationError({"dosage": "Invalid dosage format."}) | ||
|
|
There was a problem hiding this comment.
This validation is not required as it's already handled by DenominationValidator which is used by dosage-like fields.
There was a problem hiding this comment.
So should I only remove the validation error part?
There was a problem hiding this comment.
Keep only validations mentioned in the issue.
There was a problem hiding this comment.
Done that, please review it again.Thanks
… into validate_prn
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #2531 +/- ##
===========================================
+ Coverage 65.59% 65.62% +0.02%
===========================================
Files 223 223
Lines 13383 13395 +12
Branches 1855 1858 +3
===========================================
+ Hits 8779 8790 +11
Misses 4218 4218
- Partials 386 387 +1 ☔ View full report in Codecov by Sentry. |
|
What is the issue here? @rithviknishad @sainak please help |
sainak
requested changes
Oct 14, 2024
Comment on lines
+143
to
+150
| base_dosage_value = extract_numeric_value(base_dosage) | ||
| max_dosage_value = extract_numeric_value(max_dosage) | ||
|
|
||
| # Raise error if max_dosage is less than base_dosage | ||
| if max_dosage_value < base_dosage_value: | ||
| raise serializers.ValidationError( | ||
| {"max_dosage": "Max dosage in 24 hours should be greater than or equal to base dosage."} | ||
| ) |
There was a problem hiding this comment.
Suggested change
| base_dosage_value = extract_numeric_value(base_dosage) | |
| max_dosage_value = extract_numeric_value(max_dosage) | |
| # Raise error if max_dosage is less than base_dosage | |
| if max_dosage_value < base_dosage_value: | |
| raise serializers.ValidationError( | |
| {"max_dosage": "Max dosage in 24 hours should be greater than or equal to base dosage."} | |
| ) | |
| with contextlib.suppress(ValueError): | |
| base_dosage_value = float(base_dosage.split(" ", maxsplit=1)[0]) | |
| max_dosage_value = float(max_dosage.split(" ", maxsplit=1)[0]) | |
| if max_dosage_value < base_dosage_value: | |
| raise serializers.ValidationError( | |
| {"max_dosage": "Max dosage in 24 hours should be greater than or equal to base dosage."} | |
| ) |
| max_dosage = attrs.get("max_dosage") | ||
|
|
||
| if base_dosage and max_dosage: | ||
| # Extract numeric values from dosage strings |
There was a problem hiding this comment.
Suggested change
| # Extract numeric values from dosage strings |
| @@ -127,6 +134,21 @@ def validate(self, attrs): | |||
| {"base_dosage": "Base dosage is required."} | |||
| ) | |||
|
|
|||
| # Validate max_dosage is greater than or equal to base_dosage | |||
There was a problem hiding this comment.
Suggested change
| # Validate max_dosage is greater than or equal to base_dosage |
| @@ -9,6 +9,7 @@ | |||
| PrescriptionDosageType, | |||
| ) | |||
| from care.users.api.serializers.user import UserBaseMinimumSerializer | |||
| import re | |||
There was a problem hiding this comment.
Suggested change
| import re | |
| import contextlib |
Comment on lines
+102
to
+107
| def extract_numeric_value(dosage): | ||
|
|
||
| match = re.match(r"(\d+(\.\d+)?)", dosage) # Matches digits and optional decimal part | ||
| if match: | ||
| return float(match.group(1)) | ||
|
|
There was a problem hiding this comment.
Suggested change
| def extract_numeric_value(dosage): | |
| match = re.match(r"(\d+(\.\d+)?)", dosage) # Matches digits and optional decimal part | |
| if match: | |
| return float(match.group(1)) |
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.
Fixes: #2383
Resolves issue with incorrect dosage validation.
Merge Checklist
/docsOnly PR's with test cases included and passing lint and test pipelines will be reviewed
@ohcnetwork/care-backend-maintainers @ohcnetwork/care-backend-admins