Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CompleteCommand to only accept either Index or LocalDate #206

Merged
merged 2 commits into from
Nov 5, 2023
Merged

Update CompleteCommand to only accept either Index or LocalDate #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b74309
Update CompleteCommand to only accept either Index or LocalDate
Kb-Tay Nov 5, 2023
10f6d71
Add testing for invalid complete command when both index and date is …
Kb-Tay Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions src/main/java/seedu/address/logic/commands/CompleteCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Consumer;

import seedu.address.commons.core.index.Index;
import seedu.address.commons.util.CollectionUtil;
Expand Down Expand Up @@ -48,31 +47,29 @@ public CommandResult execute(Model model) throws CommandException {
requireNonNull(model);
List<Person> lastShownList = model.getFilteredPersonList();

Consumer<Index> editByIndex = index -> {
Person personToEdit = lastShownList.get(index.getZeroBased());
Person edittedPerson = createPersonWithoutAppointment(personToEdit);

model.setPerson(personToEdit, edittedPerson);
};

Optional<Index> index = completeDescriptor.getIndex();

// if Index present, edit Model by index
if (index.isPresent()) {
if (index.get().getZeroBased() >= lastShownList.size()) {
throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}

Person person = lastShownList.get(index.get().getZeroBased());
if (person.hasNullAppointment()) {
Person personToEdit = lastShownList.get(index.get().getZeroBased());
if (personToEdit.hasNullAppointment()) {
throw new CommandException(MESSAGE_PERSON_NO_APPOINTMENT);
}

Person edittedPerson = createPersonWithoutAppointment(personToEdit);

model.setPerson(personToEdit, edittedPerson);
}

// if Index present, edit Model by Person Index
completeDescriptor.getIndex().ifPresent(editByIndex);
Optional<LocalDate> date = completeDescriptor.getDate();

// if Date present, edit Model by Date;
if (completeDescriptor.getDate().isPresent()) {
if (!model.clearAppointments(completeDescriptor.getDate().orElse(null))) {
if (date.isPresent()) {
if (!model.clearAppointments(date.orElse(null))) {
throw new CommandException(MESSAGE_DATE_NO_APPOINTMENT);
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/seedu/address/logic/parser/CompleteCommandParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ public CompleteCommand parse(String args) throws ParseException {

argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_APPOINTMENT_DATE);

if (!completeDescriptor.getIndex().isEmpty() & argMultimap.getValue(PREFIX_APPOINTMENT_DATE).isPresent()) {
throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
CompleteCommand.MESSAGE_USAGE));
}

if (argMultimap.getValue(PREFIX_APPOINTMENT_DATE).isPresent()) {
LocalDate date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_APPOINTMENT_DATE).get());
completeDescriptor.setDate(date);
Expand Down
16 changes: 10 additions & 6 deletions src/test/java/seedu/address/logic/parser/CompleteCommandParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ class CompleteCommandParserTest {
private static final String MESSAGE_INVALID_FORMAT =
String.format(MESSAGE_INVALID_COMMAND_FORMAT, CompleteCommand.MESSAGE_USAGE);
private CompleteCommandParser parser = new CompleteCommandParser();
@Test
public void parse_missingParts_failure() {
//no index or date specified
assertParseFailure(parser, " ", MESSAGE_INVALID_FORMAT);
}

@Test
public void parse_invalidPreamble_failure() {
Expand All @@ -44,7 +39,7 @@ public void parse_invalidPreamble_failure() {
}

@Test
public void parse_invalidValue_failure() {
public void parse_invalidDate_failure() {
//Invalid date format
assertParseFailure(parser, DATE_DESC + "01 May 2023", MESSAGE_INVALID_DATE_FORMAT);
assertParseFailure(parser, DATE_DESC + "01-05", MESSAGE_INVALID_DATE_FORMAT);
Expand All @@ -55,6 +50,15 @@ public void parse_invalidValue_failure() {
assertParseFailure(parser, DATE_DESC + "01-13-2023", MESSAGE_INVALID_DATE);
}

@Test
public void parse_invalidArgs_failure() {
//no index or date specified
assertParseFailure(parser, " ", MESSAGE_INVALID_FORMAT);

//both index and date specified
assertParseFailure(parser, INDEX_FIRST_PERSON.getOneBased() + DATE_DESC + "01-05-2023",
MESSAGE_INVALID_FORMAT);
}
@Test
public void parse_duplicateFields_failure() {
String userInput = DATE_DESC + "01-05-2023" + DATE_DESC + "02-10-2023";
Expand Down