Fix relevant classes for updating fields

alex-setyawan · Mar 26, 2024 · faf94c4 · faf94c4
1 parent ab3acd2
commit faf94c4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/UpdateCommand.java b/src/main/java/seedu/address/logic/commands/UpdateCommand.java
@@ -84,13 +84,12 @@ public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
         List<Person> lastShownList = model.getFilteredPersonList();
 
-        Person personToUpdate = null;
         if (!model.hasPerson(Person.createPersonWithNric(nric))) {
             throw new CommandException(Messages.MESSAGE_PERSON_NOT_FOUND);
         }
-        personToUpdate = lastShownList.stream().filter(new NricContainsKeywordsPredicate(nric.toString()))
-                .findFirst().get();
 
+        Person personToUpdate = lastShownList.stream().filter(
+                new NricContainsKeywordsPredicate(nric.toString())).findFirst().get();
         Person updatedPerson = createUpdatedPerson(personToUpdate, updatePersonDescriptor);
 
         if (!personToUpdate.isSamePerson(updatedPerson) && model.hasPerson(updatedPerson)) {
@@ -200,7 +199,16 @@ public UpdatePersonDescriptor(UpdatePersonDescriptor toCopy) {
             setDateOfBirth(toCopy.dateOfBirth);
             setSex(toCopy.sex);
             setStatus(toCopy.status);
-            setTags(toCopy.tags);
+
+            setEmail(toCopy.email);
+            setCountry(toCopy.country);
+
+            setAllergies(toCopy.allergies);
+            setBloodType(toCopy.bloodType);
+            setCondition(toCopy.condition);
+            setDateOfAdmission(toCopy.dateOfAdmission);
+            setDiagnosis(toCopy.diagnosis);
+            setSymptom(toCopy.symptom);
         }
 
         /**

diff --git a/src/main/java/seedu/address/logic/parser/UpdateCommandParser.java b/src/main/java/seedu/address/logic/parser/UpdateCommandParser.java
@@ -112,7 +112,8 @@ public UpdateCommand parse(String args) throws ParseException {
         if (argMultimap.getValue(PREFIX_SYMPTOM).isPresent()) {
             updatePersonDescriptor.setSymptom(ParserUtil.parseSymptom(argMultimap.getValue(PREFIX_SYMPTOM).get()));
         }
-        parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(updatePersonDescriptor::setTags);
+
+        // parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(updatePersonDescriptor::setTags);
 
         if (!updatePersonDescriptor.isAnyFieldUpdated()) {
             throw new ParseException(UpdateCommand.MESSAGE_NOT_UPDATED);