Sort search results by LastName

GH-379

Author: roman-yagodin

Diff for: R7.University.Employees/Queries/EmployeeFindQuery.cs

@@ -13,6 +13,13 @@ public EmployeeFindQuery (IModelContext modelContext): base (modelContext)
         }
 
         public IEnumerable<EmployeeInfo> FindEmployees (string search, bool teachersOnly, int divisionId)
+        {
+            return FindEmployees_Internal (search, teachersOnly, divisionId)
+                .Distinct (new EntityEqualityComparer<EmployeeInfo> (e => e.EmployeeID))
+                .OrderBy (e => e.LastName);
+        }
+
+        IEnumerable<EmployeeInfo> FindEmployees_Internal (string search, bool teachersOnly, int divisionId)
         {
             // TODO: Reduce code duplication, see also Launchpad/EmployeesTable
             if (divisionId != -1) {
@@ -29,8 +36,7 @@ public IEnumerable<EmployeeInfo> FindEmployees (string search, bool teachersOnly
                     || e.Phone.Contains (search)
                     || e.Email.Contains (search)
                     || e.SecondaryEmail.Contains (search)
-                    || e.WorkingPlace.Contains (search))
-                .Distinct (new EntityEqualityComparer<EmployeeInfo> (e => e.EmployeeID));
+                    || e.WorkingPlace.Contains (search));
             }
             return ModelContext.Query<EmployeeInfo> ()
                 .IncludePositionsWithDivision ()
@@ -48,8 +54,7 @@ public IEnumerable<EmployeeInfo> FindEmployees (string search, bool teachersOnly
                     || e.SecondaryEmail.Contains (search)
                     || e.WorkingPlace.Contains (search)
                 )
-                .ToList ()
-                .Distinct (new EntityEqualityComparer<EmployeeInfo> (e => e.EmployeeID));
+                .ToList ();
         }
     }
 }