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

Add storage of meetings

Author: Maurice2n97

src/main/java/seedu/address/MainApp.java

@@ -19,12 +19,16 @@
 import seedu.address.model.ModelManager;
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.UserPrefs;
+import seedu.address.model.meeting.MeetingBook;
+import seedu.address.model.meeting.ReadOnlyMeetingBook;
 import seedu.address.model.person.AddressBook;
 import seedu.address.model.person.ReadOnlyAddressBook;
 import seedu.address.model.util.SampleDataUtil;
 import seedu.address.storage.AddressBookStorage;
 import seedu.address.storage.JsonAddressBookStorage;
+import seedu.address.storage.JsonMeetingBookStorage;
 import seedu.address.storage.JsonUserPrefsStorage;
+import seedu.address.storage.MeetingBookStorage;
 import seedu.address.storage.Storage;
 import seedu.address.storage.StorageManager;
 import seedu.address.storage.UserPrefsStorage;
@@ -57,7 +61,8 @@ public void init() throws Exception {
         UserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(config.getUserPrefsFilePath());
         UserPrefs userPrefs = initPrefs(userPrefsStorage);
         AddressBookStorage addressBookStorage = new JsonAddressBookStorage(userPrefs.getAddressBookFilePath());
-        storage = new StorageManager(addressBookStorage, userPrefsStorage);
+        MeetingBookStorage meetingBookStorage = new JsonMeetingBookStorage(userPrefs.getMeetingBookFilePath());
+        storage = new StorageManager(addressBookStorage, meetingBookStorage, userPrefsStorage);
 
         initLogging(config);
 
@@ -75,22 +80,42 @@ public void init() throws Exception {
      */
     private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) {
         Optional<ReadOnlyAddressBook> addressBookOptional;
-        ReadOnlyAddressBook initialData;
+        Optional<ReadOnlyMeetingBook> meetingBookOptional;
+        ReadOnlyAddressBook initialDataAddressBook;
+        ReadOnlyMeetingBook initialDataMeetingBook;
+
         try {
             addressBookOptional = storage.readAddressBook();
             if (!addressBookOptional.isPresent()) {
                 logger.info("Data file not found. Will be starting with a sample AddressBook");
             }
-            initialData = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
+            initialDataAddressBook = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
         } catch (DataConversionException e) {
             logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook");
-            initialData = new AddressBook();
+            initialDataAddressBook = new AddressBook();
         } catch (IOException e) {
             logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
-            initialData = new AddressBook();
+            initialDataAddressBook = new AddressBook();
         }
 
-        return new ModelManager(initialData, userPrefs);
+        //--============= MEETING ==================================================================================
+
+        try {
+            meetingBookOptional = storage.readMeetingBook();
+            if (!meetingBookOptional.isPresent()) {
+                logger.info("Data file not found. Will be starting with a sample MeetingBook");
+            }
+            initialDataMeetingBook = meetingBookOptional.orElseGet(SampleDataUtil::getSampleMeetingBook);
+        } catch (DataConversionException e) {
+            logger.warning("Data file not in the correct format. Will be starting with an empty MeetingBook");
+            initialDataMeetingBook = new MeetingBook();
+        } catch (IOException e) {
+            logger.warning("Problem while reading from the file. Will be starting with an empty MeetingBook");
+            initialDataMeetingBook = new MeetingBook();
+        }
+
+
+        return new ModelManager(initialDataAddressBook, initialDataMeetingBook, userPrefs);
     }
 
     private void initLogging(Config config) {

src/main/java/seedu/address/logic/LogicManager.java

@@ -49,6 +49,7 @@ public CommandResult execute(String commandText) throws CommandException, ParseE
 
         try {
             storage.saveAddressBook(model.getAddressBook());
+            storage.saveMeetingBook(model.getMeetingBook());
         } catch (IOException ioe) {
             throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
         }

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

@@ -66,7 +66,7 @@ public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyMeetingBook meeting
 
 
     public ModelManager() {
-        this(new AddressBook(), new UserPrefs());
+        this(new AddressBook(), new MeetingBook(), new UserPrefs());
     }
 
     //=========== UserPrefs ==================================================================================
@@ -174,6 +174,8 @@ public void setMeeting(Meeting target, Meeting editedMeeting) {
         requireAllNonNull(target, editedMeeting);
         meetingBook.setMeeting(target, editedMeeting);
     }
+    //TODO: Set MeetingBook file path in userPrefs? low priority feature(nice to have)
+
     //=========== Filtered Person List Accessors =============================================================
 
     /**

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

@@ -13,4 +13,6 @@ public interface ReadOnlyUserPrefs {
 
     Path getAddressBookFilePath();
 
+    Path getMeetingBookFilePath();
+
 }

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

@@ -15,6 +15,7 @@ public class UserPrefs implements ReadOnlyUserPrefs {
 
     private GuiSettings guiSettings = new GuiSettings();
     private Path addressBookFilePath = Paths.get("data" , "addressbook.json");
+    private Path meetingBookFilePath = Paths.get("data", "meetingbook.json");
 
     /**
      * Creates a {@code UserPrefs} with default values.
@@ -51,10 +52,18 @@ public Path getAddressBookFilePath() {
         return addressBookFilePath;
     }
 
+    public Path getMeetingBookFilePath() {
+        return meetingBookFilePath;
+    }
+
     public void setAddressBookFilePath(Path addressBookFilePath) {
         requireNonNull(addressBookFilePath);
         this.addressBookFilePath = addressBookFilePath;
     }
+    public void setMeetingBookFilePath(Path meetingBookFilePath) {
+        requireNonNull(meetingBookFilePath);
+        this.meetingBookFilePath = meetingBookFilePath;
+    }
 
     @Override
     public boolean equals(Object other) {

src/main/java/seedu/address/model/util/SampleDataUtil.java

@@ -5,6 +5,8 @@
 import java.util.stream.Collectors;
 
 import seedu.address.model.group.Group;
+import seedu.address.model.meeting.MeetingBook;
+import seedu.address.model.meeting.ReadOnlyMeetingBook;
 import seedu.address.model.person.Address;
 import seedu.address.model.person.AddressBook;
 import seedu.address.model.person.Email;
@@ -57,4 +59,10 @@ public static Set<Group> getGroupSet(String... strings) {
                 .collect(Collectors.toSet());
     }
 
+    // Change this to get sample meeting Data to be displayed.
+    public static ReadOnlyMeetingBook getSampleMeetingBook() {
+        MeetingBook sampleMb = new MeetingBook();
+        return sampleMb;
+    }
+
 }

src/main/java/seedu/address/storage/JsonMeetingBookStorage.java

@@ -0,0 +1,82 @@
+package seedu.address.storage;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.commons.exceptions.DataConversionException;
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.commons.util.FileUtil;
+import seedu.address.commons.util.JsonUtil;
+import seedu.address.model.meeting.MeetingBook;
+import seedu.address.model.meeting.ReadOnlyMeetingBook;
+
+
+/**
+ * Represents a storage for {@link MeetingBook}.
+ */
+
+public class JsonMeetingBookStorage implements MeetingBookStorage {
+
+    private static final Logger logger = LogsCenter.getLogger(JsonMeetingBookStorage.class);
+
+    private Path filePath;
+
+    public JsonMeetingBookStorage(Path filePath) {
+        this.filePath = filePath;
+    }
+
+    public Path getMeetingBookFilePath() {
+        return filePath;
+    }
+
+    @Override
+    public Optional<ReadOnlyMeetingBook> readMeetingBook() throws DataConversionException {
+        return readMeetingBook(filePath);
+    }
+
+    /**
+     * Similar to {@link #readMeetingBook()}.
+     *
+     * @param filePath location of the data. Cannot be null.
+     * @throws DataConversionException if the file is not in the correct format.
+     */
+    public Optional<ReadOnlyMeetingBook> readMeetingBook(Path filePath) throws DataConversionException {
+        requireNonNull(filePath);
+        Optional<JsonSerializableMeetingBook> jsonMeetingBook = JsonUtil.readJsonFile(
+                filePath, JsonSerializableMeetingBook.class);
+        if (!jsonMeetingBook.isPresent()) {
+            return Optional.empty();
+        }
+
+        try {
+            return Optional.of(jsonMeetingBook.get().toModelType());
+        } catch (IllegalValueException ive) {
+            logger.info("Illegal values found for Meeting Book in " + filePath + ": " + ive.getMessage());
+            throw new DataConversionException(ive);
+        }
+    }
+
+    @Override
+    public void saveMeetingBook(ReadOnlyMeetingBook meetingBook) throws IOException {
+        saveMeetingBook(meetingBook, filePath);
+    }
+
+    /**
+     * Similar to {@link #saveMeetingBook(ReadOnlyMeetingBook)}.
+     *
+     * @param filePath location of the data. Cannot be null.
+     */
+    public void saveMeetingBook(ReadOnlyMeetingBook meetingBook, Path filePath) throws IOException {
+        requireNonNull(meetingBook);
+        requireNonNull(filePath);
+
+        FileUtil.createIfMissing(filePath);
+        JsonUtil.saveJsonFile(new JsonSerializableMeetingBook(meetingBook), filePath);
+    }
+}
+

src/main/java/seedu/address/storage/JsonSerializableMeetingBook.java

@@ -0,0 +1,60 @@
+package seedu.address.storage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.meeting.Meeting;
+import seedu.address.model.meeting.MeetingBook;
+import seedu.address.model.meeting.ReadOnlyMeetingBook;
+
+/**
+ * An Immutable MeetingBook that is serializable to JSON format.
+ */
+@JsonRootName(value = "meetingbook")
+class JsonSerializableMeetingBook {
+
+    public static final String MESSAGE_DUPLICATE_PERSON = "Meetings List contains duplicate meeting(s).";
+
+    private final List<JsonAdaptedMeeting> meetings = new ArrayList<>();
+
+    /**
+     * Constructs a {@code JsonSerializableMeetingBook} with the given persons.
+     */
+    @JsonCreator
+    public JsonSerializableMeetingBook(@JsonProperty("meetings") List<JsonAdaptedMeeting> meeting) {
+        this.meetings.addAll(meeting);
+    }
+
+    /**
+     * Converts a given {@code ReadOnlyMeetingBook} into this class for Jackson use.
+     *
+     * @param source future changes to this will not affect the created {@code JsonSerializableMeetingBook}.
+     */
+    public JsonSerializableMeetingBook(ReadOnlyMeetingBook source) {
+        meetings.addAll(source.getMeetingList().stream().map(JsonAdaptedMeeting::new).collect(Collectors.toList()));
+    }
+
+    /**
+     * Converts this address book into the model's {@code MeetingBook} object.
+     *
+     * @throws IllegalValueException if there were any data constraints violated.
+     */
+    public MeetingBook toModelType() throws IllegalValueException {
+        MeetingBook meetingBook = new MeetingBook();
+        for (JsonAdaptedMeeting jsonAdaptedMeeting : meetings) {
+            Meeting meeting = jsonAdaptedMeeting.toModelType();
+            if (meetingBook.hasMeeting(meeting)) {
+                throw new IllegalValueException(MESSAGE_DUPLICATE_PERSON);
+            }
+            meetingBook.addMeeting(meeting);
+        }
+        return meetingBook;
+    }
+
+}

src/main/java/seedu/address/storage/MeetingBookStorage.java

@@ -0,0 +1,47 @@
+
+package seedu.address.storage;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import seedu.address.commons.exceptions.DataConversionException;
+import seedu.address.model.meeting.MeetingBook;
+import seedu.address.model.meeting.ReadOnlyMeetingBook;
+
+
+/**
+ * Represents a storage for {@link MeetingBook}.
+ */
+
+public interface MeetingBookStorage {
+    /**
+     * Returns the file path of the data file.
+     */
+    Path getMeetingBookFilePath();
+
+    /**
+     * Returns AddressBook data as a {@link ReadOnlyMeetingBook}.
+     *   Returns {@code Optional.empty()} if storage file is not found.
+     * @throws DataConversionException if the data in storage is not in the expected format.
+     * @throws IOException if there was any problem when reading from the storage.
+     */
+    Optional<ReadOnlyMeetingBook> readMeetingBook() throws DataConversionException, IOException;
+
+    /**
+     * @see #getMeetingBookFilePath()
+     */
+    Optional<ReadOnlyMeetingBook> readMeetingBook(Path filePath) throws DataConversionException, IOException;
+
+    /**
+     * Saves the given {@link ReadOnlyMeetingBook} to the storage.
+     * @param meetingBook cannot be null.
+     * @throws IOException if there was any problem writing to the file.
+     */
+    void saveMeetingBook(ReadOnlyMeetingBook meetingBook) throws IOException;
+
+    /**
+     * @see #saveMeetingBook(ReadOnlyMeetingBook)
+     */
+    void saveMeetingBook(ReadOnlyMeetingBook meetingBook, Path filePath) throws IOException;
+}

src/main/java/seedu/address/storage/Storage.java

@@ -7,12 +7,13 @@
 import seedu.address.commons.exceptions.DataConversionException;
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.UserPrefs;
+import seedu.address.model.meeting.ReadOnlyMeetingBook;
 import seedu.address.model.person.ReadOnlyAddressBook;
 
 /**
  * API of the Storage component
  */
-public interface Storage extends AddressBookStorage, UserPrefsStorage {
+public interface Storage extends AddressBookStorage, UserPrefsStorage, MeetingBookStorage {
 
     @Override
     Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException;
@@ -29,4 +30,21 @@ public interface Storage extends AddressBookStorage, UserPrefsStorage {
     @Override
     void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException;
 
+    @Override
+    Path getMeetingBookFilePath();
+
+    @Override
+    Optional<ReadOnlyMeetingBook> readMeetingBook() throws DataConversionException, IOException;
+
+    @Override
+    void saveMeetingBook(ReadOnlyMeetingBook meetingBook) throws IOException;
+
+
+
+
+
+
+
+
+
 }