Add OrderBook Integration

AY1920S1-CS2103T-T09-4 · Oct 16, 2019 · b7debba · b7debba
1 parent b7cdb2a
commit b7debba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java
@@ -18,6 +18,7 @@
 import seedu.address.model.CustomerBook;
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
+import seedu.address.model.OrderBook;
 import seedu.address.model.PhoneBook;
 import seedu.address.model.ReadOnlyDataBook;
 import seedu.address.model.ReadOnlyUserPrefs;
@@ -96,36 +97,48 @@ public void init() throws Exception {
     private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) {
         Optional<ReadOnlyDataBook<Customer>> customerBookOptional;
         Optional<ReadOnlyDataBook<Phone>> phoneBookOptional;
+        Optional<ReadOnlyDataBook<Order>> orderBookOptional;
 
         ReadOnlyDataBook<Customer> initialCustomerData;
         ReadOnlyDataBook<Phone> initialPhoneData;
+        ReadOnlyDataBook<Order> initialOrderData;
         try {
             customerBookOptional = storage.readCustomerBook();
             phoneBookOptional = storage.readPhoneBook();
+            orderBookOptional = storage.readOrderBook();
 
             if (!customerBookOptional.isPresent()) {
                 logger.info("Data file not found. Will be starting with a sample CustomerBook");
             }
             if (!phoneBookOptional.isPresent()) {
                 logger.info("Data file not found. Will be starting with a sample PhoneBook");
             }
+            if (!orderBookOptional.isPresent()) {
+                logger.info("Data file not found. Will be starting with a sample PhoneBook");
+            }
+
             initialCustomerData = customerBookOptional.orElseGet(SampleDataUtil::getSampleCustomerBook);
             initialPhoneData = phoneBookOptional.orElseGet(SampleDataUtil::getSamplePhoneBook);
+            initialOrderData = orderBookOptional.orElseGet(SampleDataUtil::getSampleOrderBook);
+
         } catch (DataConversionException e) {
             logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook");
             initialPhoneData = new PhoneBook();
             initialCustomerData = new CustomerBook();
+            initialOrderData = new OrderBook();
+
         } catch (IOException e) {
             logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
             initialPhoneData = new PhoneBook();
             initialCustomerData = new CustomerBook();
+            initialOrderData = new OrderBook();
         }
 
         ReadOnlyDataBook<Customer> customerBook = SampleDataUtil.getSampleCustomerBook();
         ReadOnlyDataBook<Phone> phoneBook = SampleDataUtil.getSamplePhoneBook();
         ReadOnlyDataBook<Order> orderBook = SampleDataUtil.getSampleOrderBook();
 
-        return new ModelManager(initialCustomerData, initialPhoneData, orderBook, new ScheduleBook(), userPrefs);
+        return new ModelManager(initialCustomerData, initialPhoneData, initialOrderData, new ScheduleBook(), userPrefs);
 
     }
 

diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
@@ -54,25 +54,6 @@ public CommandResult execute(String commandText) throws CommandException, ParseE
         try {
             storage.saveCustomerBook(model.getCustomerBook());
             storage.savePhoneBook(model.getPhoneBook());
-        } catch (IOException ioe) {
-            throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
-        }
-        try {
-            storage.saveCustomerBook(model.getCustomerBook());
-        } catch (IOException ioe) {
-            throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
-        }
-        try {
-            storage.savePhoneBook(model.getPhoneBook());
-        } catch (IOException ioe) {
-            throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
-        }
-        try {
-            storage.saveScheduleBook(model.getScheduleBook());
-        } catch (IOException ioe) {
-            throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
-        }
-        try {
             storage.saveOrderBook(model.getOrderBook());
         } catch (IOException ioe) {
             throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);