Merge pull request #81 from kanna-1/branch-Refactor-Code

Refactor code to combine parseMedicalHistory and parseMedical as both…

Author: WZWren

src/main/java/seedu/address/logic/parser/EditCommandParser.java

@@ -121,7 +121,7 @@ private Optional<Set<MedicalHistory>> parseMedicalHistoriesForEdit(Collection<St
         }
         Collection<String> medicalHistorySet = medicalHistories.size() == 1 && medicalHistories.contains("")
                 ? Collections.emptySet() : medicalHistories;
-        return Optional.of(ParserUtil.parseMedicalHistories(medicalHistorySet));
+        return Optional.of(ParserUtil.parseMedicals(medicalHistorySet));
     }
 
 }

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -170,41 +170,6 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
         return tagSet;
     }
 
-    /**
-     * Parses a {@code String medicalHistory} into a {@code medicalHistory}.
-     * Leading and trailing whitespaces will be trimmed.
-     *
-     * @throws ParseException if the given {@code tag} is invalid.
-     */
-    public static MedicalHistory parseMedicalHistory(String medicalHistory) throws ParseException {
-        requireNonNull(medicalHistory);
-        String trimmedMedicalHistory = medicalHistory.trim();
-        if (!MedicalHistory.isValidMedicalHistory(medicalHistory)) {
-            throw new ParseException(MedicalHistory.MESSAGE_CONSTRAINTS);
-        }
-        return new MedicalHistory(trimmedMedicalHistory);
-    }
-
-    /**
-     * Parses a collection of medical history strings and returns a Set of MedicalHistory objects.
-     * @param medicalHistoryStrings The collection of medical history strings.
-     * @return A Set of MedicalHistory.
-     * @throws ParseException if any medical history format is invalid.
-     */
-    public static Set<MedicalHistory> parseMedicalHistories(Collection<String> medicalHistoryStrings)
-            throws ParseException {
-        requireNonNull(medicalHistoryStrings);
-
-        final Set<MedicalHistory> medicalHistories = new HashSet<>();
-        for (String medicalHistoryString : medicalHistoryStrings) {
-            if (medicalHistoryString.isBlank()) {
-                throw new ParseException("Medical history cannot be empty.");
-            }
-            medicalHistories.add(new MedicalHistory(medicalHistoryString));
-        }
-        return medicalHistories;
-    }
-
     /**
      * Parses a {@code String medHistory} into a {@code MedicalHistory}.
      * Leading and trailing whitespaces will be trimmed.

src/test/java/seedu/address/logic/parser/ParserUtilTest.java

@@ -201,42 +201,6 @@ public void parseEmail_validValueWithWhitespace_returnsTrimmedEmail() throws Exc
         Email expectedEmail = new Email(VALID_EMAIL);
         assertEquals(expectedEmail, ParserUtil.parseEmail(emailWithWhitespace));
     }
-    @Test
-    public void parseMedicalHistory_null_throwsNullPointerException() {
-        assertThrows(NullPointerException.class, () -> ParserUtil.parseMedicalHistories(null));
-    }
-
-    @Test
-    public void parseMedicalHistory_validValueWithoutWhitespace_returnsTag() throws Exception {
-        MedicalHistory expectedMedicalHistory = new MedicalHistory(VALID_MEDICAL_HISTORY_1);
-        assertEquals(expectedMedicalHistory, ParserUtil.parseMedicalHistory(VALID_MEDICAL_HISTORY_1));
-    }
-
-    @Test
-    public void parseMedicalHistory_collectionWithValidTags_returnsMedicalHistorySet() throws Exception {
-        Set<MedicalHistory> actualMedicalHistorySet = ParserUtil.parseMedicalHistories(
-                Arrays.asList(VALID_MEDICAL_HISTORY_1, VALID_MEDICAL_HISTORY_2));
-        Set<MedicalHistory> expectedMedicalHistorySet = new HashSet<>(Arrays.asList(
-                new MedicalHistory(VALID_MEDICAL_HISTORY_1), new MedicalHistory(VALID_MEDICAL_HISTORY_2)));
-        assertEquals(actualMedicalHistorySet, expectedMedicalHistorySet);
-    }
-
-    @Test
-    public void parseMedicalHistory_emptyCollection_returnsEmptySet() throws Exception {
-        assertTrue(ParserUtil.parseMedicalHistories(Collections.emptyList()).isEmpty());
-    }
-
-    @Test
-    public void parseMedicalHistory_invalidValue_throwsParseException() {
-        assertThrows(ParseException.class, () -> ParserUtil.parseMedicalHistory(INVALID_MEDICAL_HISTORY));
-    }
-
-
-    @Test
-    public void parseTag_emptyValue_throwsParseException() {
-        assertThrows(NullPointerException.class, () -> ParserUtil.parseMedicalHistories(null));
-    }
-
 
     @Test
     public void parseAppointment_invalidValue_throwsParseException() {
@@ -266,7 +230,7 @@ public void parseMedicalHistories_emptyHistory_exceptionThrown() {
         // Input data with an empty medical history
         String input = "History 1, , History 3";
 
-        assertThrows(ParseException.class, () -> ParserUtil.parseMedicalHistories(Arrays.asList(input.split(","))));
+        assertThrows(ParseException.class, () -> ParserUtil.parseMedicals(Arrays.asList(input.split(","))));
     }
 
     @Test