Merge pull request #54 from Maurice2n97/add-Delete-Meeting

Add delete meeting

Author: Maurice2n97

src/main/java/seedu/address/commons/core/Messages.java

@@ -9,5 +9,7 @@ public class Messages {
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
     public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
     public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
+    public static final String MESSAGE_INVALID_MEETING_DISPLAYED_INDEX = "The person index provided is invalid";
+
 
 }

src/main/java/seedu/address/logic/commands/meetings/DeleteMeetingCommand.java

@@ -0,0 +1,54 @@
+package seedu.address.logic.commands.meetings;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.Command;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.meeting.Meeting;
+
+
+public class DeleteMeetingCommand extends Command {
+    public static final String COMMAND_WORD = "deleteMeeting";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Deletes the meeting identified by the index number used in the displayed meeting list.\n"
+            + "Parameters: INDEX (must be a positive integer)\n"
+            + "Example: " + COMMAND_WORD + " 1";
+
+    public static final String MESSAGE_DELETE_MEETING_SUCCESS = "Deleted Meeting: %1$s";
+
+
+    private final Index targetIndex;
+
+    public DeleteMeetingCommand(Index targetIndex) {
+        this.targetIndex = targetIndex;
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+        List<Meeting> lastShownList = model.getFilteredMeetingList();
+
+        if (targetIndex.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_MEETING_DISPLAYED_INDEX);
+        }
+
+        Meeting meetingToDelete = lastShownList.get(targetIndex.getZeroBased());
+        model.deleteMeeting(meetingToDelete);
+        return new CommandResult(String.format(MESSAGE_DELETE_MEETING_SUCCESS, meetingToDelete));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof DeleteMeetingCommand // instanceof handles nulls
+                && targetIndex.equals(((DeleteMeetingCommand) other).targetIndex)); // state check
+    }
+
+}

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

@@ -18,7 +18,7 @@ public class CliSyntax {
     /* Prefix specific for meeting */
     public static final Prefix PREFIX_START_TIME = new Prefix("st/");
     public static final Prefix PREFIX_END_TIME = new Prefix("ed/");
-    public static final Prefix PREFIX_DESCRIPTION = new Prefix("des/");
+    public static final Prefix PREFIX_DESCRIPTION = new Prefix("desc/");
     public static final Prefix PREFIX_PRIORITY = new Prefix("pr/");
 
 

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

@@ -10,6 +10,7 @@
 import seedu.address.logic.commands.ExitCommand;
 import seedu.address.logic.commands.HelpCommand;
 import seedu.address.logic.commands.meetings.AddMeetingCommand;
+import seedu.address.logic.commands.meetings.DeleteMeetingCommand;
 import seedu.address.logic.commands.persons.AddPersonCommand;
 import seedu.address.logic.commands.persons.ClearPersonCommand;
 import seedu.address.logic.commands.persons.DeletePersonCommand;
@@ -19,6 +20,7 @@
 import seedu.address.logic.commands.persons.ListPersonCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.logic.parser.meetings.AddMeetingCommandParser;
+import seedu.address.logic.parser.meetings.DeleteMeetingCommandParser;
 import seedu.address.logic.parser.persons.AddPersonCommandParser;
 import seedu.address.logic.parser.persons.DeletePersonCommandParser;
 import seedu.address.logic.parser.persons.EditPersonCommandParser;
@@ -77,6 +79,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case AddMeetingCommand.COMMAND_WORD:
             return new AddMeetingCommandParser().parse(arguments);
 
+        case DeleteMeetingCommand.COMMAND_WORD:
+            return new DeleteMeetingCommandParser().parse(arguments);
+
         //============================= General ==============================
         case ExitCommand.COMMAND_WORD:
             return new ExitCommand();

src/main/java/seedu/address/logic/parser/meetings/DeleteMeetingCommandParser.java

@@ -0,0 +1,25 @@
+package seedu.address.logic.parser.meetings;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.meetings.DeleteMeetingCommand;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+
+public class DeleteMeetingCommandParser implements Parser<DeleteMeetingCommand> {
+
+
+    @Override
+    public DeleteMeetingCommand parse(String args) throws ParseException {
+        try {
+            Index index = ParserUtil.parseIndex(args);
+            return new DeleteMeetingCommand(index);
+        } catch (ParseException pe) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteMeetingCommand.MESSAGE_USAGE), pe);
+        }
+    }
+}

src/main/java/seedu/address/model/Model.java

@@ -98,7 +98,7 @@ public interface Model {
      */
     void setMeetingBook(ReadOnlyMeetingBook meetingBook);
 
-    /** Returns the AddressBook */
+    /** Returns the Book */
     ReadOnlyMeetingBook getMeetingBook();
 
     /**

src/main/java/seedu/address/model/ModelManager.java

@@ -29,23 +29,42 @@ public class ModelManager implements Model {
     private final FilteredList<Person> filteredPersons;
 
     // TODO: Modify the signature of ModelManager so that we can add meetings inside it.
-    private final MeetingBook meetingBook = new MeetingBook();
-    private final FilteredList<Meeting> filteredMeetings = new FilteredList<Meeting>(this.meetingBook.getMeetingList());
-
+    private final MeetingBook meetingBook;
+    private final FilteredList<Meeting> filteredMeetings;
     /**
-     * Initializes a ModelManager with the given addressBook and userPrefs.
+     * Initializes a ModelManager with the given addressBook and userPrefs. MeetingBook will be set to default.
      */
     public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyUserPrefs userPrefs) {
         super();
         requireAllNonNull(addressBook, userPrefs);
 
         logger.fine("Initializing with address book: " + addressBook + " and user prefs " + userPrefs);
 
+        this.meetingBook = new MeetingBook();
+        this.filteredMeetings = new FilteredList<Meeting>(this.meetingBook.getMeetingList());
         this.addressBook = new AddressBook(addressBook);
         this.userPrefs = new UserPrefs(userPrefs);
         filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
     }
 
+    /**
+     * Initializes a ModelManager with the given addressBook, meetingBOok and userPrefs
+     */
+    public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyMeetingBook meetingBook,
+                        ReadOnlyUserPrefs userPrefs) {
+        super();
+        requireAllNonNull(addressBook, userPrefs);
+
+        logger.fine("Initializing with address book: " + addressBook + " and user prefs " + userPrefs);
+
+        this.meetingBook = new MeetingBook(meetingBook);
+        this.filteredMeetings = new FilteredList<Meeting>(this.meetingBook.getMeetingList());
+        this.addressBook = new AddressBook(addressBook);
+        this.userPrefs = new UserPrefs(userPrefs);
+        filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
+    }
+
+
     public ModelManager() {
         this(new AddressBook(), new UserPrefs());
     }
@@ -153,7 +172,6 @@ public void addMeeting(Meeting meeting) {
     @Override
     public void setMeeting(Meeting target, Meeting editedMeeting) {
         requireAllNonNull(target, editedMeeting);
-
         meetingBook.setMeeting(target, editedMeeting);
     }
     //=========== Filtered Person List Accessors =============================================================

src/main/java/seedu/address/model/meeting/NameContainsKeywordsPredicate.java

@@ -0,0 +1,36 @@
+package seedu.address.model.meeting;
+
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import seedu.address.commons.util.StringUtil;
+
+/**
+ * Tests that a {@code Meeting}'s {@code MeetingName} matches any of the keywords given.
+ */
+public class NameContainsKeywordsPredicate implements Predicate<Meeting> {
+    private final List<String> keywords;
+
+    public NameContainsKeywordsPredicate(List<String> keywords) {
+        this.keywords = keywords;
+    }
+
+    @Override
+    public boolean test(Meeting meeting) {
+        return keywords.stream()
+                .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(meeting.getName().fullName, keyword));
+    }
+
+
+    @Override
+    //TODO: Do we have to include full path name to disntinguish from other NamePredicate? Feels redundant.
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof NameContainsKeywordsPredicate // instanceof handles
+                // nulls
+                && keywords.equals(((NameContainsKeywordsPredicate) other).keywords));
+        // state check
+    }
+
+}

src/main/resources/view/MainWindow.fxml

@@ -11,7 +11,8 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.stage.Stage?>
 
-<fx:root minHeight="600" minWidth="450" onCloseRequest="#handleExit" title="Address App" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root minHeight="600" minWidth="450" onCloseRequest="#handleExit" title="Address App" type="javafx.stage.Stage"
+         xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1">
 
   <scene>
     <Scene>
@@ -32,14 +33,16 @@
                   <MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
                 </Menu>
               </MenuBar>
-      
-              <StackPane fx:id="commandBoxPlaceholder" maxHeight="25.0" prefHeight="25.0" styleClass="pane-with-border" VBox.vgrow="NEVER">
+
+              <StackPane fx:id="commandBoxPlaceholder" maxHeight="25.0" prefHeight="25.0" styleClass="pane-with-border"
+                         VBox.vgrow="NEVER">
                 <padding>
                   <Insets bottom="5" left="10" right="10" top="5" />
                 </padding>
               </StackPane>
-      
-              <StackPane fx:id="resultDisplayPlaceholder" minHeight="90.0" styleClass="pane-with-border" VBox.vgrow="ALWAYS">
+
+              <StackPane fx:id="resultDisplayPlaceholder" minHeight="90.0" styleClass="pane-with-border"
+                         VBox.vgrow="ALWAYS">
                 <padding>
                   <Insets bottom="5" left="10" right="10" top="5" />
                 </padding>
@@ -68,7 +71,7 @@
           <center>
                <StackPane fx:id="meetingDashboardPlaceholder" BorderPane.alignment="CENTER" />
           </center>
-        
+
       </BorderPane>
     </Scene>
   </scene>

src/main/resources/view/PersonListCard.fxml

@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
 
-<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
     <GridPane HBox.hgrow="ALWAYS">
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />