Merge pull request #115

More bug fixes and list command modification
AY2223S2-CS2103-W17-4 · Mar 31, 2023 · 10b57fe · 10b57fe
2 parents c323a84 + 55b2740
commit 10b57fe
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 15 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/ListCommand.java b/src/main/java/seedu/address/logic/commands/ListCommand.java
@@ -1,7 +1,11 @@
 package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_APPOINTMENTS;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_CUSTOMERS;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_SERVICES;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_TECHNICIANS;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_VEHICLES;
 
 import seedu.address.model.Model;
 
@@ -12,14 +16,18 @@ public class ListCommand extends Command {
 
     public static final String COMMAND_WORD = "list";
 
-    public static final String MESSAGE_SUCCESS = "Currently listing all persons";
+    public static final String MESSAGE_SUCCESS = "Currently listing everything";
 
 
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
-        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-        return new CommandResult(MESSAGE_SUCCESS);
+        model.updateFilteredCustomerList(PREDICATE_SHOW_ALL_CUSTOMERS);
+        model.updateFilteredAppointmentList(PREDICATE_SHOW_ALL_APPOINTMENTS);
+        model.updateFilteredServiceList(PREDICATE_SHOW_ALL_SERVICES);
+        model.updateFilteredVehicleList(PREDICATE_SHOW_ALL_VEHICLES);
+        model.updateFilteredTechnicianList(PREDICATE_SHOW_ALL_TECHNICIANS);
+        return new CommandResult(MESSAGE_SUCCESS, Tab.ALL);
     }
 }
 

diff --git a/src/main/java/seedu/address/logic/commands/RemovePartFromServiceCommand.java b/src/main/java/seedu/address/logic/commands/RemovePartFromServiceCommand.java
@@ -66,6 +66,7 @@ public CommandResult executeUndoableCommand(Model model) throws CommandException
             throw new CommandException(MESSAGE_INSUFFICIENT_PART);
         }
         service.getRequiredParts().decreasePartQuantity(this.partName, this.quantity);
+        model.resetMaps();
         return new CommandResult(String.format(MESSAGE_SUCCESS_FORMAT, this.partName, this.quantity,
                 this.serviceId), Tab.SERVICES);
     }

diff --git a/src/main/java/seedu/address/logic/commands/RemoveTechnicianFromAppointmentCommand.java b/src/main/java/seedu/address/logic/commands/RemoveTechnicianFromAppointmentCommand.java
@@ -52,6 +52,7 @@ public CommandResult executeUndoableCommand(Model model) throws CommandException
             throw new CommandException(MESSAGE_TECHNICIAN_NOT_FOUND);
         }
         appointment.removeTechnician(this.techId);
+        model.resetMaps();
         return new CommandResult(String.format(MESSAGE_SUCCESS_FORMAT, this.techId, this.appointmentId),
                 Tab.APPOINTMENTS);
     }

diff --git a/src/main/java/seedu/address/logic/commands/RemoveTechnicianFromServiceCommand.java b/src/main/java/seedu/address/logic/commands/RemoveTechnicianFromServiceCommand.java
@@ -57,6 +57,7 @@ public CommandResult executeUndoableCommand(Model model) throws CommandException
             .findFirst()
             .orElseThrow();
         service.removeTechnician(technician);
+        model.resetMaps();
         return new CommandResult(String.format(MESSAGE_SUCCESS_FORMAT, this.techId, this.serviceId),
                 Tab.SERVICES);
     }

diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -38,6 +38,7 @@
 import seedu.address.logic.commands.ListCustomersCommand;
 import seedu.address.logic.commands.ListPartsCommand;
 import seedu.address.logic.commands.ListServicesCommand;
+import seedu.address.logic.commands.ListTechniciansCommand;
 import seedu.address.logic.commands.ListVehiclesCommand;
 import seedu.address.logic.commands.RedoCommand;
 import seedu.address.logic.commands.RemovePartFromServiceCommand;
@@ -157,6 +158,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case ListServicesCommand.COMMAND_WORD:
             return new ListServicesCommand();
 
+        case ListTechniciansCommand.COMMAND_WORD:
+            return new ListTechniciansCommand();
+
         case ListAppointmentsCommand.COMMAND_WORD:
             return new ListAppointmentsCommand();
 

diff --git a/src/main/java/seedu/address/logic/parser/RemoveTechnicianFromAppointmentCommandParser.java b/src/main/java/seedu/address/logic/parser/RemoveTechnicianFromAppointmentCommandParser.java
@@ -2,7 +2,6 @@
 
 import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_APPOINTMENT_ID;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_SERVICE_ID;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TECHNICIAN_ID;
 
 import java.util.stream.Stream;
@@ -31,9 +30,9 @@ public RemoveTechnicianFromAppointmentCommand parse(String args) throws ParseExc
         }
 
         int techId = ParserUtil.parseInt(argMultimap.getValue(PREFIX_TECHNICIAN_ID).get());
-        int serviceId = ParserUtil.parseInt(argMultimap.getValue(PREFIX_SERVICE_ID).get());
+        int appointmentId = ParserUtil.parseInt(argMultimap.getValue(PREFIX_APPOINTMENT_ID).get());
 
-        return new RemoveTechnicianFromAppointmentCommand(techId, serviceId);
+        return new RemoveTechnicianFromAppointmentCommand(techId, appointmentId);
     }
 
     /**

diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
@@ -400,4 +400,9 @@ public interface Model {
      * @param cmp Technician comparator
      */
     void updateTechnicianComparator(Comparator<? super Technician> cmp);
+
+    /**
+     * Update mappings
+     */
+    void resetMaps();
 }
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
@@ -132,7 +132,8 @@ public ModelManager() {
         this(new AddressBook(), new UserPrefs(), new Shop());
     }
 
-    private void resetMaps() {
+    @Override
+    public void resetMaps() {
         this.customerVehicleMap.reset(this.shop.getCustomerList(), this.shop.getVehicleList(),
                 this.shop.getAppointmentList());
         this.vehicleDataMap.reset(this.shop.getVehicleList(), this.shop.getCustomerList(),

diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
@@ -446,6 +446,11 @@ public void updateTechnicianComparator(Comparator<? super Technician> cmp) {
             throw new AssertionError("This method should not be called.");
         }
 
+        @Override
+        public void resetMaps() {
+            throw new AssertionError("This method should not be called.");
+        }
+
 
         @Override
         public ReadOnlyShop getShop() {

diff --git a/src/test/java/seedu/address/logic/commands/ListCommandTest.java b/src/test/java/seedu/address/logic/commands/ListCommandTest.java
@@ -1,8 +1,6 @@
 package seedu.address.logic.commands;
 
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
 import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -32,9 +30,4 @@ public void execute_listIsNotFiltered_showsSameList() {
         assertCommandSuccess(new ListCommand(), model, ListCommand.MESSAGE_SUCCESS, expectedModel);
     }
 
-    @Test
-    public void execute_listIsFiltered_showsEverything() {
-        showPersonAtIndex(model, INDEX_FIRST_PERSON);
-        assertCommandSuccess(new ListCommand(), model, ListCommand.MESSAGE_SUCCESS, expectedModel);
-    }
 }