Fix bug to prevent /ec when editing doctor #225
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #225 +/- ##
============================================
+ Coverage 75.37% 75.41% +0.03%
- Complexity 756 758 +2
============================================
Files 112 112
Lines 2530 2538 +8
Branches 272 271 -1
============================================
+ Hits 1907 1914 +7
Misses 530 530
- Partials 93 94 +1
📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today! |
cmHuang777
approved these changes
Nov 12, 2023
chonguschonguschongus
approved these changes
Nov 12, 2023
Comment on lines
-138
to
+161
| throw new CommandException("Doctors cannot have Condition or BloodType fields."); | ||
| } | ||
| if (editPersonDescriptor.getTags().isPresent() | ||
| && !editPersonDescriptor.isValidDoctorTagList(editPersonDescriptor.getTags().get())) { | ||
| logger.warning(editPersonDescriptor.getTags().toString()); | ||
| throw new CommandException("Please enter valid Doctor tags."); | ||
| } | ||
| editedPerson = createEditedDoctor((Doctor) personToEdit, editPersonDescriptor); | ||
| Doctor doctorToEdit = (Doctor) personToEdit; | ||
| validateDoctor(); | ||
| editedPerson = createEditedDoctor(doctorToEdit, editPersonDescriptor); | ||
| } | ||
| if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) { | ||
| logger.warning("Edited Person and orignal person are the same"); | ||
| throw new CommandException(MESSAGE_DUPLICATE_PERSON); | ||
| } | ||
| return editedPerson; | ||
| } | ||
| private void validatePatient() throws CommandException { | ||
| if (editPersonDescriptor.getTags().isPresent() | ||
| && !editPersonDescriptor.isValidPatientTagList(editPersonDescriptor.getTags().get())) { | ||
| logger.warning("Invalid tag for patient"); | ||
| throw new CommandException("Please enter a valid patient tag."); | ||
| } | ||
| } | ||
| private void validateDoctor() throws CommandException { | ||
| if (editPersonDescriptor.getCondition().isPresent() || editPersonDescriptor.getBloodType().isPresent() | ||
| || editPersonDescriptor.getEmergencyContact().isPresent()) { | ||
| logger.warning("Error thrown - tried to edit condition/blood type/emergency contact of doctor"); | ||
| throw new CommandException("Doctors cannot have Condition, BloodType or Emergency Contact fields."); | ||
| } | ||
| if (editPersonDescriptor.getTags().isPresent() | ||
| && !editPersonDescriptor.isValidDoctorTagList(editPersonDescriptor.getTags().get())) { | ||
| logger.warning(editPersonDescriptor.getTags().toString()); | ||
| throw new CommandException("Please enter valid Doctor tags."); | ||
| } | ||
| } |
There was a problem hiding this comment.
gotta write new test cases for all these!
kohkaijie
merged commit ec3d7ef
into
AY2324S1-CS2103T-T09-3:master
4 of 5 checks passed
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 #221