ui updates, use services

This commit is contained in:
2022-10-04 22:23:14 -04:00
parent d1da303805
commit 43aa0aaa6e
13 changed files with 139 additions and 34 deletions

View File

@ -6,9 +6,9 @@ namespace BinaryDad.AacpsBusAlert.Web.Controllers
[Route("api")]
public class ApiController : Controller
{
private readonly BusRouteService busRouteService;
private readonly IBusRouteService busRouteService;
public ApiController(BusRouteService busRouteService)
public ApiController(IBusRouteService busRouteService)
{
this.busRouteService = busRouteService;
}

View File

@ -9,24 +9,33 @@ namespace BinaryDad.AacpsBusAlert.Web.Controllers
public class HomeController : Controller
{
private readonly ILogger<HomeController> logger;
private readonly BusRouteService busRouteService;
private readonly IBusRouteService busRouteService;
private readonly IUserService userService;
public HomeController(ILogger<HomeController> logger, BusRouteService busRouteService)
public HomeController(ILogger<HomeController> logger, IBusRouteService busRouteService, IUserService userService)
{
this.logger = logger;
this.busRouteService = busRouteService;
this.userService = userService;
}
public async Task<IActionResult> Index()
{
var userRoutes = new[] { 203, 365, 277, 269, 274 };
var user = userService.GetUser(Guid.Parse("b43f4f45-0f7b-4976-849d-8ad4b271199c"));
//var busRoutes = await CacheHelper.GetAsync("BusRoutes", () => busRouteService.GetBusRoutesAsync());
var busRoutes = await busRouteService.GetBusRoutesAsync();
var userRouteIds = user.Routes.Select(r => r.BusNumber).ToList();
var matchedBusRoutes = busRoutes.Join(userRoutes, r => r.BusNumber, u => u, (r, u) => r).ToList();
var matchedBusRoutes = busRoutes.Join(userRouteIds, r => r.BusNumber, u => u, (r, u) => r).ToList();
return View(matchedBusRoutes);
var summary = new SummaryViewModel
{
User = user,
Routes = matchedBusRoutes
};
return View(summary);
}
public IActionResult Privacy()