Refractor refresh

src/main/java/seedu/sudohr/logic/commands/department/AddEmployeeToDepartmentCommand.java

@@ -72,6 +72,7 @@ public CommandResult execute(Model model) throws CommandException {
         // show the employees within this department
         model.updateFilteredEmployeeList(e -> department.hasEmployee(e));
 
+        model.refresh(); // defensive coding
 
         return new CommandResult(String.format(MESSAGE_ADD_EMPLOYEE_TO_DEPARTMENT_SUCCESS, employee, department));
     }

src/main/java/seedu/sudohr/logic/commands/department/EditDepartmentCommand.java

@@ -66,6 +66,8 @@ public CommandResult execute(Model model) throws CommandException {
 
         model.setDepartment(departmentToEdit, editedDepartment);
         model.updateFilteredDepartmentList(Model.PREDICATE_SHOW_ALL_DEPARTMENTS);
+        model.refresh(); //defensive coding
+
         return new CommandResult(String.format(MESSAGE_EDIT_DEPARTMENT_SUCCESS, editedDepartment));
     }
 

src/main/java/seedu/sudohr/logic/commands/department/RemoveEmployeeFromDepartmentCommand.java

@@ -73,6 +73,8 @@ public CommandResult execute(Model model) throws CommandException {
         // show the employees within this department
         model.updateFilteredEmployeeList(e -> department.hasEmployee(e));
 
+        model.refresh(); // defensive coding
+
         return new CommandResult(String.format(MESSAGE_REMOVE_EMPLOYEE_FROM_DEPARTMENT_SUCCESS, employee, department));
     }
 

src/main/java/seedu/sudohr/logic/commands/employee/DeleteCommand.java

@@ -48,7 +48,7 @@ public CommandResult execute(Model model) throws CommandException {
         model.deleteEmployee(employeeToDelete);
         model.updateFilteredDepartmentList(Model.PREDICATE_SHOW_ALL_DEPARTMENTS);
         model.updateFilteredLeaveList(Model.PREDICATE_SHOW_ALL_NON_EMPTY_LEAVES);
-
+        model.refresh();
         return new CommandResult(String.format(MESSAGE_DELETE_EMPLOYEE_SUCCESS, employeeToDelete));
     }
 

src/main/java/seedu/sudohr/logic/commands/employee/EditCommand.java

@@ -99,6 +99,7 @@ public CommandResult execute(Model model) throws CommandException {
         model.setEmployee(employeeToEdit, editedEmployee);
         model.updateFilteredEmployeeList(PREDICATE_SHOW_ALL_EMPLOYEES);
         model.updateFilteredLeaveList(Model.PREDICATE_SHOW_ALL_NON_EMPTY_LEAVES); // not req but defensive programming
+        model.refresh();
         return new CommandResult(String.format(MESSAGE_EDIT_EMPLOYEE_SUCCESS, editedEmployee.toStringAllFields()));
     }
 

src/main/java/seedu/sudohr/logic/commands/leave/AddEmployeeToLeaveCommand.java

@@ -77,6 +77,7 @@ public CommandResult execute(Model model) throws CommandException {
         model.updateFilteredEmployeeList(predicate);
         final Leave leaveToFilter = leaveToAdd;
         model.updateFilteredLeaveList(l -> l.equals(leaveToFilter));
+        model.refresh(); // defensive coding
 
         return new CommandResult(String.format(MESSAGE_ADD_LEAVE_SUCCESS, employeeToAdd, leaveToAdd));
     }

src/main/java/seedu/sudohr/logic/commands/leave/AddEmployeeToLeaveFromToCommand.java

@@ -92,7 +92,7 @@ public CommandResult execute(Model model) throws CommandException {
         final List<Leave> leavesToFilter = leavesToAdd;
 
         model.updateFilteredLeaveList(l -> leavesToFilter.contains(l));
-
+        model.refresh(); // defensive coding
         return new CommandResult(builder.toString());
     }
 

src/main/java/seedu/sudohr/logic/commands/leave/DeleteEmployeeFromLeaveCommand.java

@@ -74,6 +74,7 @@ public CommandResult execute(Model model) throws CommandException {
         final Leave leaveToFilter = leaveToDelete;
         model.updateFilteredLeaveList(l -> l.equals(leaveToFilter));
 
+        model.refresh(); // defensive coding
         return new CommandResult(String.format(MESSAGE_SUCCESS, employeeToDelete, leaveToDelete));
     }
 

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

@@ -286,4 +286,10 @@ public interface Model {
      * Deletes an employee {@code employee} from all leaves in SudoHR.
      */
     void cascadeDeleteUserInLeaves(Employee employeeToDelete);
+
+
+    /**
+     * Refreshes filteredLists in SudoHr
+     */
+    void refresh();
 }

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

@@ -32,6 +32,9 @@ public class ModelManager implements Model {
     private final FilteredList<Employee> filteredEmployees;
     private final FilteredList<Department> filteredDepartments;
     private final FilteredList<Leave> filteredLeaves;
+    private final FilteredList<Employee> refreshedEmployees;
+    private final FilteredList<Department> refreshedDepartments;
+    private final FilteredList<Leave> refreshedLeaves;
     private final SortedList<Leave> sortedLeaves;
 
     /**
@@ -45,16 +48,20 @@ public ModelManager(ReadOnlySudoHr sudoHr, ReadOnlyUserPrefs userPrefs) {
         this.sudoHr = new SudoHr(sudoHr);
         this.userPrefs = new UserPrefs(userPrefs);
 
-        filteredEmployees = new FilteredList<>(this.sudoHr.getEmployeeList());
-        filteredDepartments = new FilteredList<>(this.sudoHr.getDepartmentList());
-        filteredLeaves = new FilteredList<>(this.sudoHr.getLeavesList(), PREDICATE_SHOW_ALL_NON_EMPTY_LEAVES);
+        refreshedEmployees = new FilteredList<>(this.sudoHr.getEmployeeList(), (l) -> true);
+        refreshedDepartments = new FilteredList<>(this.sudoHr.getDepartmentList(), (l) -> true);
+        refreshedLeaves = new FilteredList<>(this.sudoHr.getLeavesList(), (l) -> true);
+        filteredEmployees = new FilteredList<>(refreshedEmployees);
+        filteredDepartments = new FilteredList<>(refreshedDepartments);
+        filteredLeaves = new FilteredList<>(refreshedLeaves, PREDICATE_SHOW_ALL_NON_EMPTY_LEAVES);
         sortedLeaves = new SortedList<>(this.filteredLeaves, new LeaveSortedByDateComparator());
     }
 
     public ModelManager() {
         this(new SudoHr(), new UserPrefs());
     }
 
+
     // =========== UserPrefs
     // ==================================================================================
 
@@ -91,6 +98,16 @@ public void setSudoHrFilePath(Path sudoHrFilePath) {
         userPrefs.setSudoHrFilePath(sudoHrFilePath);
     }
 
+    @Override
+    public void refresh() {
+        refreshedEmployees.setPredicate((e) -> false);
+        refreshedDepartments.setPredicate((d) -> false);
+        refreshedLeaves.setPredicate((l) -> false);
+        refreshedEmployees.setPredicate((e)->true);
+        refreshedDepartments.setPredicate((d)->true);
+        refreshedLeaves.setPredicate((l)->true);
+    }
+
     // =========== SudoHr
     // ================================================================================
 

src/main/java/seedu/sudohr/model/SudoHr.java

@@ -190,8 +190,6 @@ public void addEmployee(Employee employee) {
     public void setEmployee(Employee target, Employee editedEmployee) {
         requireNonNull(editedEmployee);
         employees.setEmployee(target, editedEmployee);
-        refreshDepartments();
-        refreshLeaves();
     }
 
     /**
@@ -200,8 +198,6 @@ public void setEmployee(Employee target, Employee editedEmployee) {
      */
     public void removeEmployee(Employee key) {
         employees.remove(key);
-        refreshDepartments();
-        refreshLeaves();
     }
 
     // =========== Department-Level Operations
@@ -262,7 +258,6 @@ public void removeDepartment(Department key) {
     public void addEmployeeToDepartment(Employee p, Department d) {
         requireAllNonNull(p, d);
         d.addEmployee(p);
-        refreshDepartments();
     }
 
     /**
@@ -274,20 +269,8 @@ public void addEmployeeToDepartment(Employee p, Department d) {
     public void removeEmployeeFromDepartment(Employee p, Department d) {
         requireAllNonNull(p, d);
         d.removeEmployee(p);
-        refreshDepartments();
     }
 
-    /**
-     * Refreshes the department list.
-     */
-    public void refreshDepartments() {
-        UniqueDepartmentList currList = new UniqueDepartmentList();
-        for (Department d : departments) {
-            currList.add(d);
-        }
-        departments.setDepartments(new UniqueDepartmentList());
-        departments.setDepartments(currList);
-    }
 
     /**
      * Gets the number of employees in the specified department.
@@ -312,8 +295,6 @@ public void cascadeDeleteEmployeeToDepartments(Employee employeeToDelete) {
                 dept.removeEmployee(employeeToDelete);
             }
         }
-        refreshDepartments(); // defensive programming
-        refreshLeaves(); // defensive programming
     }
 
     /**
@@ -329,8 +310,6 @@ public void cascadeEditEmployeeToDepartments(Employee employeeToEdit, Employee e
                 dept.setEmployee(employeeToEdit, editedEmployee);
             }
         }
-        refreshDepartments(); // defensive programming
-        refreshLeaves(); // defensive programming
     }
 
     // =========== Leave-Level Operations
@@ -377,8 +356,6 @@ public void addLeave(Leave leave) {
      */
     public void deleteLeave(Leave leave) {
         leaves.remove(leave);
-        refreshDepartments();
-        refreshLeaves();
     }
 
     /**
@@ -412,7 +389,7 @@ public boolean hasEmployeeOnLeave(LeaveDate date, Employee employee) {
     public void addEmployeeToLeave(Leave leave, Employee employee) {
         requireAllNonNull(leave, employee);
         leave.addEmployee(employee);
-        refreshLeaves();
+
     }
 
     /**
@@ -421,19 +398,6 @@ public void addEmployeeToLeave(Leave leave, Employee employee) {
     public void deleteEmployeeFromLeave(Leave leave, Employee employee) {
         requireAllNonNull(leave, employee);
         leave.deleteEmployee(employee);
-        refreshLeaves();
-    }
-
-    /**
-     * Refreshes the leave list
-     */
-    public void refreshLeaves() {
-        UniqueLeaveList currList = new UniqueLeaveList();
-        for (Leave l : leaves) {
-            currList.addLeave(l);
-        }
-        leaves.setLeaves(new UniqueLeaveList());
-        leaves.setLeaves(currList);
     }
 
     /**
@@ -457,8 +421,6 @@ public void cascadeUpdateUserInLeaves(Employee employeeToEdit, Employee editedEm
                 leave.setEmployee(employeeToEdit, editedEmployee);
             }
         }
-        refreshDepartments();
-        refreshLeaves();
     }
 
     /**
@@ -471,8 +433,6 @@ public void cascadeDeleteUserInLeaves(Employee employeeToDelete) {
                 leave.deleteEmployee(employeeToDelete);
             }
         }
-        refreshDepartments();
-        refreshLeaves();
     }
 
     /**

src/test/java/seedu/sudohr/logic/commands/department/AddDepartmentCommandTest.java

@@ -327,6 +327,11 @@ public void cascadeUpdateUserInLeaves(Employee employeeToEdit, Employee editedEm
         public void cascadeDeleteUserInLeaves(Employee employeeToDelete) {
             throw new AssertionError("This method should not be called.");
         }
+
+        @Override
+        public void refresh() {
+            throw new AssertionError("This method should not be called.");
+        }
     }
 
     /**

src/test/java/seedu/sudohr/logic/commands/department/AddEmployeeToDepartmentCommandTest.java

@@ -350,6 +350,11 @@ public void cascadeUpdateUserInLeaves(Employee employeeToEdit, Employee editedEm
         public void cascadeDeleteUserInLeaves(Employee employeeToDelete) {
             throw new AssertionError("This method should not be called.");
         }
+
+        @Override
+        public void refresh() {
+            throw new AssertionError("This method should not be called.");
+        }
     }
 
     /**
@@ -404,5 +409,9 @@ public void updateFilteredEmployeeList(Predicate<Employee> predicate) {
         public void updateFilteredDepartmentList(Predicate<Department> predicate) {
 
         }
+
+        @Override
+        public void refresh() {
+        }
     }
 }

src/test/java/seedu/sudohr/logic/commands/department/RemoveEmployeeFromDepartmentCommandTest.java

@@ -348,6 +348,12 @@ public void cascadeUpdateUserInLeaves(Employee employeeToEdit, Employee editedEm
         public void cascadeDeleteUserInLeaves(Employee employeeToDelete) {
             throw new AssertionError("This method should not be called.");
         }
+
+        @Override
+        public void refresh() {
+            throw new AssertionError("This method should not be called.");
+
+        }
     }
 
     /**
@@ -409,5 +415,9 @@ public void removeEmployeeFromDepartment(Employee p, Department d) {
 
         }
 
+        @Override
+        public void refresh() {
+        }
+
     }
 }

src/test/java/seedu/sudohr/logic/commands/employee/AddCommandTest.java

@@ -387,6 +387,11 @@ public void cascadeUpdateUserInLeaves(Employee employeeToEdit, Employee editedEm
         public void cascadeDeleteUserInLeaves(Employee employeeToDelete) {
             throw new AssertionError("This method should not be called.");
         }
+
+        @Override
+        public void refresh() {
+            throw new AssertionError("This method should not be called.");
+        }
     }
 
     /**

src/test/java/seedu/sudohr/logic/commands/leave/AddEmployeeToLeaveCommandTest.java

@@ -373,6 +373,11 @@ public boolean checkEmployeeExists(Id id) {
             throw new AssertionError("This method should not be called.");
         }
 
+        @Override
+        public void refresh() {
+            throw new AssertionError("This method should not be called.");
+        }
+
     }
 
     /**
@@ -471,5 +476,9 @@ public boolean checkEmployeeExists(Id id) {
             return sudoHr.checkEmployeeExists(id);
         }
 
+        @Override
+        public void refresh() {
+        }
+
     }
 }

src/test/java/seedu/sudohr/logic/commands/leave/AddEmployeeToLeaveFromToCommandTest.java

@@ -400,6 +400,11 @@ public void cascadeEditEmployeeToDepartments(Employee employeeToEdit, Employee e
         public Leave getLeave(LeaveDate date) {
             throw new AssertionError("This method should not be called.");
         }
+
+        @Override
+        public void refresh() {
+            throw new AssertionError("This method should not be called.");
+        }
     }
 
     /**
@@ -492,6 +497,10 @@ public void updateFilteredEmployeeList(Predicate<Employee> predicate) {
         public void updateFilteredLeaveList(Predicate<Leave> predicateShowAllLeave) {
         }
 
+        @Override
+        public void refresh() {
+        }
+
         @Override
         public boolean checkEmployeeExists(Id id) {
             requireNonNull(id);

src/test/java/seedu/sudohr/logic/commands/leave/DeleteEmployeeFromLeaveCommandTest.java

@@ -338,6 +338,11 @@ public void cascadeDeleteUserInLeaves(Employee employeeToDelete) {
         public boolean checkEmployeeExists(Id id) {
             throw new AssertionError("This method should not be called.");
         }
+
+        @Override
+        public void refresh() {
+            throw new AssertionError("This method should not be called.");
+        }
     }
 
     /**
@@ -437,5 +442,9 @@ public boolean checkEmployeeExists(Id id) {
             return sudoHr.checkEmployeeExists(id);
         }
 
+        @Override
+        public void refresh() {
+        }
+
     }
 }