From 827acc20235e0f4a47a6e4024b5b8720163a8d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Sun, 22 Mar 2020 16:05:02 +0100 Subject: [PATCH] Fix in Stats : add the connectedUser --- .../Interface/IStatsService.cs | 20 ++++---- Back/skydiveLogs-api.Business/StatsService.cs | 46 +++++++++---------- .../Controllers/StatsController.cs | 20 ++++---- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Back/skydiveLogs-api.Business/Interface/IStatsService.cs b/Back/skydiveLogs-api.Business/Interface/IStatsService.cs index 2b20d23..3d12596 100644 --- a/Back/skydiveLogs-api.Business/Interface/IStatsService.cs +++ b/Back/skydiveLogs-api.Business/Interface/IStatsService.cs @@ -5,24 +5,24 @@ namespace skydiveLogs_api.Business.Interface { public interface IStatsService { - IEnumerable GetStatsByDz(); + IEnumerable GetStatsByDz(User connectedUser); - IEnumerable GetStatsByAircraft(); + IEnumerable GetStatsByAircraft(User connectedUser); - IEnumerable GetStatsByJumpType(); + IEnumerable GetStatsByJumpType(User connectedUser); - IEnumerable GetStatsByGear(); + IEnumerable GetStatsByGear(User connectedUser); - IEnumerable GetStatsByYear(); + IEnumerable GetStatsByYear(User connectedUser); - IEnumerable GetStatsForLastYearByDz(); + IEnumerable GetStatsForLastYearByDz(User connectedUser); - IEnumerable GetStatsForLastYearByJumpType(); + IEnumerable GetStatsForLastYearByJumpType(User connectedUser); - IEnumerable GetStatsForLastMonthByDz(); + IEnumerable GetStatsForLastMonthByDz(User connectedUser); - IEnumerable GetStatsForLastMonthByJumpType(); + IEnumerable GetStatsForLastMonthByJumpType(User connectedUser); - SimpleSummary GetSimpleSummary(); + SimpleSummary GetSimpleSummary(User connectedUser); } } diff --git a/Back/skydiveLogs-api.Business/StatsService.cs b/Back/skydiveLogs-api.Business/StatsService.cs index af6e597..f55acfb 100644 --- a/Back/skydiveLogs-api.Business/StatsService.cs +++ b/Back/skydiveLogs-api.Business/StatsService.cs @@ -10,14 +10,14 @@ namespace skydiveLogs_api.Business { public class StatsService : IStatsService { - public StatsService(IJumpRepository jumpRepository) + public StatsService(IJumpService jumpService) { - _jumpRepository = jumpRepository; + _jumpService = jumpService; } - public IEnumerable GetStatsByAircraft() + public IEnumerable GetStatsByAircraft(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); return allJumps.GroupBy(j => j.Aircraft.Name, j => j, @@ -29,9 +29,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public IEnumerable GetStatsByDz() + public IEnumerable GetStatsByDz(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); return allJumps.GroupBy(j => j.DropZone.Name, j => j, @@ -43,9 +43,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public IEnumerable GetStatsByJumpType() + public IEnumerable GetStatsByJumpType(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); return allJumps.GroupBy(j => j.JumpType.Name, j => j, @@ -57,9 +57,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public IEnumerable GetStatsByGear() + public IEnumerable GetStatsByGear(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); return allJumps.GroupBy(j => j.Gear.Name, j => j, @@ -71,9 +71,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public IEnumerable GetStatsByYear() + public IEnumerable GetStatsByYear(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); return allJumps.GroupBy(j => j.JumpDate.Year, j => j, @@ -85,9 +85,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public IEnumerable GetStatsForLastYearByDz() + public IEnumerable GetStatsForLastYearByDz(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault(); var yearOfLastJump = lastJump.JumpDate.Year; @@ -103,9 +103,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public IEnumerable GetStatsForLastYearByJumpType() + public IEnumerable GetStatsForLastYearByJumpType(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault(); var yearOfLastJump = lastJump.JumpDate.Year; @@ -121,9 +121,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public IEnumerable GetStatsForLastMonthByDz() + public IEnumerable GetStatsForLastMonthByDz(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault(); var yearOfLastJump = lastJump.JumpDate.Year; @@ -140,9 +140,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public IEnumerable GetStatsForLastMonthByJumpType() + public IEnumerable GetStatsForLastMonthByJumpType(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault(); var yearOfLastJump = lastJump.JumpDate.Year; @@ -159,9 +159,9 @@ namespace skydiveLogs_api.Business .ToList(); } - public SimpleSummary GetSimpleSummary() + public SimpleSummary GetSimpleSummary(User connectedUser) { - var allJumps = _jumpRepository.GetAll(); + var allJumps = _jumpService.GetAllJumps(connectedUser); var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault(); @@ -173,6 +173,6 @@ namespace skydiveLogs_api.Business }; } - private readonly IJumpRepository _jumpRepository; + private readonly IJumpService _jumpService; } } diff --git a/Back/skydiveLogs-api/Controllers/StatsController.cs b/Back/skydiveLogs-api/Controllers/StatsController.cs index 22a532d..5b92f91 100644 --- a/Back/skydiveLogs-api/Controllers/StatsController.cs +++ b/Back/skydiveLogs-api/Controllers/StatsController.cs @@ -23,7 +23,7 @@ namespace skydiveLogs_api.Controllers [EnableCors] public SimpleSummaryResp Simple() { - var result = _statsService.GetSimpleSummary(); + var result = _statsService.GetSimpleSummary(ConnectedUser); return _mapper.Map(result); } @@ -32,7 +32,7 @@ namespace skydiveLogs_api.Controllers [EnableCors] public IEnumerable ByDz() { - var result = _statsService.GetStatsByDz(); + var result = _statsService.GetStatsByDz(ConnectedUser); return _mapper.Map>(result); } @@ -41,7 +41,7 @@ namespace skydiveLogs_api.Controllers [EnableCors] public IEnumerable ByAircraft() { - var result = _statsService.GetStatsByAircraft(); + var result = _statsService.GetStatsByAircraft(ConnectedUser); return _mapper.Map>(result); } @@ -50,7 +50,7 @@ namespace skydiveLogs_api.Controllers [EnableCors] public IEnumerable ByJumpType() { - var result = _statsService.GetStatsByJumpType(); + var result = _statsService.GetStatsByJumpType(ConnectedUser); return _mapper.Map>(result); } @@ -59,7 +59,7 @@ namespace skydiveLogs_api.Controllers [EnableCors] public IEnumerable ByGear() { - var result = _statsService.GetStatsByGear(); + var result = _statsService.GetStatsByGear(ConnectedUser); return _mapper.Map>(result); } @@ -68,7 +68,7 @@ namespace skydiveLogs_api.Controllers [EnableCors] public IEnumerable ByYear() { - var result = _statsService.GetStatsByYear(); + var result = _statsService.GetStatsByYear(ConnectedUser); return _mapper.Map>(result); } @@ -77,8 +77,8 @@ namespace skydiveLogs_api.Controllers [EnableCors] public StatisticForLastYearResp ForLastYear() { - var resultByDz = _statsService.GetStatsForLastYearByDz(); - var resultByJumpType = _statsService.GetStatsForLastYearByJumpType(); + var resultByDz = _statsService.GetStatsForLastYearByDz(ConnectedUser); + var resultByJumpType = _statsService.GetStatsForLastYearByJumpType(ConnectedUser); var result = new StatisticForLastYearResp(); result.ByDz = _mapper.Map>(resultByDz); @@ -91,8 +91,8 @@ namespace skydiveLogs_api.Controllers [EnableCors] public StatisticForLastMonthResp ForLastMonth() { - var resultByDz = _statsService.GetStatsForLastMonthByDz(); - var resultByJumpType = _statsService.GetStatsForLastMonthByJumpType(); + var resultByDz = _statsService.GetStatsForLastMonthByDz(ConnectedUser); + var resultByJumpType = _statsService.GetStatsForLastMonthByJumpType(ConnectedUser); var result = new StatisticForLastMonthResp(); result.ByDz = _mapper.Map>(resultByDz);