prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

return 404s from API as warranted

Browse source
This commit is contained in:
Collin M. Barrett 2018-09-25 13:19:32 -05:00
parent 949768be50
commit d6c39f0c12
16 changed files with 45 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/FilterLists.Api/V1/Controllers/BaseController.cs
View file

@ -26,5 +26,8 @@ protected BaseController(IMemoryCache memoryCache, SeedService seedService)
MemoryCache = memoryCache;
SeedService = seedService;
}
protected IActionResult CoalesceNotFound(JsonResult result) =>
result.Value is null ? NotFound() : (IActionResult)result;
}
}

4
src/FilterLists.Api/V1/Controllers/DependentsController.cs
View file

@ -15,11 +15,11 @@ public DependentsController(IMemoryCache memoryCache, SeedService seedService) :
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("DependentsController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("DependentsController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<Dependent, DependentSeedDto>(typeof(Dependent).GetProperty("DependentFilterListId"),
typeof(Dependent).GetProperty("DependencyFilterListId"));
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/ForksController.cs
View file

@ -15,11 +15,11 @@ public ForksController(IMemoryCache memoryCache, SeedService seedService) : base
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("ForksController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("ForksController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<Fork, ForkSeedDto>(typeof(Fork).GetProperty("UpstreamFilterListId"),
typeof(Fork).GetProperty("ForkFilterListId"));
}));
})));
}
}

12
src/FilterLists.Api/V1/Controllers/LanguagesController.cs
View file

@ -17,27 +17,27 @@ public LanguagesController(IMemoryCache memoryCache, SeedService seedService, La
[HttpGet]
public async Task<IActionResult> Index() =>
Json(await MemoryCache.GetOrCreate("LanguagesController_Index", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("LanguagesController_Index", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return languageService.GetAllTargetedAsync();
}));
})));
[HttpGet]
[Route("{id}")]
public async Task<IActionResult> GetById(int id) =>
Json(await MemoryCache.GetOrCreate("LanguagesController_GetById_" + id, entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("LanguagesController_GetById_" + id, entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return languageService.GetTargetedByIdAsync(id);
}));
})));
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("LanguagesController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("LanguagesController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<Language, LanguageSeedDto>();
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/LicensesController.cs
View file

@ -15,10 +15,10 @@ public LicensesController(IMemoryCache memoryCache, SeedService seedService) : b
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("LicensesController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("LicensesController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<License, LicenseSeedDto>();
}));
})));
}
}

12
src/FilterLists.Api/V1/Controllers/ListsController.cs
View file

@ -17,27 +17,27 @@ public ListsController(IMemoryCache memoryCache, SeedService seedService, Filter
[HttpGet]
public async Task<IActionResult> Index() =>
Json(await MemoryCache.GetOrCreate("ListsController_Index", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("ListsController_Index", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return filterListService.GetAllAsync();
}));
})));
[HttpGet]
[Route("{id}")]
public async Task<IActionResult> GetById(int id) =>
Json(await MemoryCache.GetOrCreate("ListsController_GetById_" + id, entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("ListsController_GetById_" + id, entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return filterListService.GetDetailsAsync((uint)id);
}));
})));
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("ListsController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("ListsController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<FilterList, FilterListSeedDto>();
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs
View file

@ -16,12 +16,12 @@ public ListsLanguagesController(IMemoryCache memoryCache, SeedService seedServic
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("ListsLanguagesController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("ListsLanguagesController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<FilterListLanguage, FilterListLanguageSeedDto>(
typeof(FilterListLanguage).GetProperty("FilterListId"),
typeof(FilterListLanguage).GetProperty("LanguageId"));
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs
View file

@ -16,12 +16,12 @@ public ListsMaintainersController(IMemoryCache memoryCache, SeedService seedServ
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("ListsMaintainersController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("ListsMaintainersController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<FilterListMaintainer, FilterListMaintainerSeedDto>(
typeof(FilterListMaintainer).GetProperty("MaintainerId"),
typeof(FilterListMaintainer).GetProperty("FilterListId"));
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/ListsTagsController.cs
View file

@ -16,12 +16,12 @@ public ListsTagsController(IMemoryCache memoryCache, SeedService seedService)
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("ListsTagsController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("ListsTagsController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<FilterListTag, FilterListTagSeedDto>(
typeof(FilterListTag).GetProperty("FilterListId"),
typeof(FilterListTag).GetProperty("TagId"));
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/MaintainersController.cs
View file

@ -15,10 +15,10 @@ public MaintainersController(IMemoryCache memoryCache, SeedService seedService)
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("MaintainersController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("MaintainersController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<Maintainer, MaintainerSeedDto>();
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/MergesController.cs
View file

@ -15,11 +15,11 @@ public MergesController(IMemoryCache memoryCache, SeedService seedService) : bas
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("MergesController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("MergesController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<Merge, MergeSeedDto>(typeof(Merge).GetProperty("MergeFilterListId"),
typeof(Merge).GetProperty("UpstreamFilterListId"));
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/RulesController.cs
View file

@ -14,10 +14,10 @@ public RulesController(IMemoryCache memoryCache, RuleService ruleService) : base
[HttpGet]
public async Task<IActionResult> Index() =>
Json(await MemoryCache.GetOrCreate("RulesController_Index", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("RulesController_Index", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return ruleService.GetCountAll();
}));
})));
}
}

8
src/FilterLists.Api/V1/Controllers/SoftwareController.cs
View file

@ -17,18 +17,18 @@ public SoftwareController(IMemoryCache memoryCache, SeedService seedService, Sof
[HttpGet]
public async Task<IActionResult> Index() =>
Json(await MemoryCache.GetOrCreate("SoftwareController_Index", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("SoftwareController_Index", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return softwareService.GetAll();
}));
})));
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("SoftwareController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("SoftwareController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<Software, SoftwareSeedDto>();
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs
View file

@ -16,11 +16,11 @@ public SoftwareSyntaxesController(IMemoryCache memoryCache, SeedService seedServ
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("SoftwareSyntaxesController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("SoftwareSyntaxesController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<SoftwareSyntax, SoftwareSyntaxSeedDto>(
typeof(SoftwareSyntax).GetProperty("SyntaxId"), typeof(SoftwareSyntax).GetProperty("SoftwareId"));
}));
})));
}
}

4
src/FilterLists.Api/V1/Controllers/SyntaxesController.cs
View file

@ -15,10 +15,10 @@ public SyntaxesController(IMemoryCache memoryCache, SeedService seedService) : b
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("SyntaxesController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("SyntaxesController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<Syntax, SyntaxSeedDto>();
}));
})));
}
}

8
src/FilterLists.Api/V1/Controllers/TagsController.cs
View file

@ -17,18 +17,18 @@ public TagsController(IMemoryCache memoryCache, SeedService seedService, TagServ
[HttpGet]
public async Task<IActionResult> Index() =>
Json(await MemoryCache.GetOrCreate("TagsController_Index", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("TagsController_Index", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return tagService.GetAll();
}));
})));
[HttpGet("seed")]
public async Task<IActionResult> Seed() =>
Json(await MemoryCache.GetOrCreate("TagsController_Seed", entry =>
CoalesceNotFound(Json(await MemoryCache.GetOrCreate("TagsController_Seed", entry =>
{
entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
return SeedService.GetAllAsync<Tag, TagSeedDto>();
}));
})));
}
}