From 2179109116a1501f63c5201b37061fb21d854f1c Mon Sep 17 00:00:00 2001 From: Jonas Anker Rasmussen Date: Wed, 2 Oct 2019 16:14:36 +0200 Subject: [PATCH 1/2] Order by Shift start --- API/Data.MSSQL/Repositories/ShiftRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/API/Data.MSSQL/Repositories/ShiftRepository.cs b/API/Data.MSSQL/Repositories/ShiftRepository.cs index f1cc936..e8dbc41 100644 --- a/API/Data.MSSQL/Repositories/ShiftRepository.cs +++ b/API/Data.MSSQL/Repositories/ShiftRepository.cs @@ -51,7 +51,7 @@ public void Delete(int id, int organizationId) public IEnumerable ReadFromOrganization(string organizationShortKey) { var shifts = _context.Shifts - .Where(x => x.Organization.ShortKey == organizationShortKey).ToList(); + .Where(x => x.Organization.ShortKey == organizationShortKey).OrderBy(s => s.Start); return shifts; } @@ -64,7 +64,7 @@ public IEnumerable ReadFromOrganization(int organizationId) { return _context.Shifts .Where(x => x.Organization.Id == organizationId) - .Include(x => x.Employees.Select(e => e.Roles)); + .Include(x => x.Employees.Select(e => e.Roles)).OrderBy(s => s.Start); } public int Update(Shift shift) From d3627ab7b4898e4f9494e68fc4c9a68a788f7719 Mon Sep 17 00:00:00 2001 From: Jonas Anker Rasmussen Date: Thu, 3 Oct 2019 10:48:44 +0200 Subject: [PATCH 2/2] Minor syntax change --- API/Data.MSSQL/Repositories/ShiftRepository.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/API/Data.MSSQL/Repositories/ShiftRepository.cs b/API/Data.MSSQL/Repositories/ShiftRepository.cs index e8dbc41..1c63f58 100644 --- a/API/Data.MSSQL/Repositories/ShiftRepository.cs +++ b/API/Data.MSSQL/Repositories/ShiftRepository.cs @@ -50,21 +50,23 @@ public void Delete(int id, int organizationId) public IEnumerable ReadFromOrganization(string organizationShortKey) { - var shifts = _context.Shifts - .Where(x => x.Organization.ShortKey == organizationShortKey).OrderBy(s => s.Start); - return shifts; + return _context.Shifts + .Where(x => x.Organization.ShortKey == organizationShortKey) + .OrderBy(s => s.Start); } public Shift Read(int id, int organizationId) { - return _context.Shifts.FirstOrDefault(x => x.Id == id && x.Organization.Id == organizationId); + return _context.Shifts + .FirstOrDefault(x => x.Id == id && x.Organization.Id == organizationId); } public IEnumerable ReadFromOrganization(int organizationId) { return _context.Shifts .Where(x => x.Organization.Id == organizationId) - .Include(x => x.Employees.Select(e => e.Roles)).OrderBy(s => s.Start); + .Include(x => x.Employees.Select(e => e.Roles)) + .OrderBy(s => s.Start); } public int Update(Shift shift)