From 20d4492f2fd49f25b889124c006ca3bcd1896a58 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 5 Jul 2020 13:42:40 -0500 Subject: [PATCH] feat(api): exclude soft-deleted FilterLists from API --- .../FilterList/FilterListService.cs | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/server/src/FilterLists.Services/FilterList/FilterListService.cs b/server/src/FilterLists.Services/FilterList/FilterListService.cs index a73a620cd..e93c70e29 100644 --- a/server/src/FilterLists.Services/FilterList/FilterListService.cs +++ b/server/src/FilterLists.Services/FilterList/FilterListService.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using AutoMapper; using AutoMapper.QueryableExtensions; @@ -15,14 +16,20 @@ public FilterListService(FilterListsDbContext dbContext, IConfigurationProvider { } - public async Task> GetAllAsync() => - await DbContext.FilterLists - .ProjectTo(MapConfig) - .ToListAsync(); + public async Task> GetAllAsync() + { + return await DbContext.FilterLists + .Where(fl => fl.IsDeleted != true) + .ProjectTo(MapConfig) + .ToListAsync(); + } - public async Task GetByIdAsync(int id) => - await DbContext.FilterLists - .ProjectTo(MapConfig) - .FirstOrDefaultAsync(l => l.Id == id); + public async Task GetByIdAsync(int id) + { + return await DbContext.FilterLists + .Where(fl => fl.IsDeleted != true) + .ProjectTo(MapConfig) + .FirstOrDefaultAsync(l => l.Id == id); + } } } \ No newline at end of file