diff --git a/FoodTracker.Api/Filters/AuthorizationFilter.cs b/FoodTracker.Api/Filters/AuthorizationFilter.cs index 4b1fa981510699650bf024e14e7f1926cd1de115..b94a5699f2028d5e92c81a8905a38facde5901de 100644 --- a/FoodTracker.Api/Filters/AuthorizationFilter.cs +++ b/FoodTracker.Api/Filters/AuthorizationFilter.cs @@ -19,14 +19,9 @@ public class AuthorizationFilter : ActionFilterAttribute { Role = role; _httpContextAccessor = httpContextAccessor; - UserId = int.Parse(_httpContextAccessor.HttpContext.Session.GetString("UserId")); - Username = _httpContextAccessor.HttpContext.Session.GetString("Username"); - UserRole = _httpContextAccessor.HttpContext.Session.GetString("Role"); - - } @@ -52,6 +47,4 @@ public class AuthorizationFilter : ActionFilterAttribute context.Result = new ObjectResult(userAuthResponse); } } - - } diff --git a/FoodTracker.Services/DTO/ResponseDTO/UserReportDTO.cs b/FoodTracker.Services/DTO/ResponseDTO/UserReportResponseDTO.cs similarity index 94% rename from FoodTracker.Services/DTO/ResponseDTO/UserReportDTO.cs rename to FoodTracker.Services/DTO/ResponseDTO/UserReportResponseDTO.cs index 2e15608ff34a0cf7fddf366efc01e101754589a2..cfb1c692932a309355e0ee7062e240bccc0e5f9f 100644 --- a/FoodTracker.Services/DTO/ResponseDTO/UserReportDTO.cs +++ b/FoodTracker.Services/DTO/ResponseDTO/UserReportResponseDTO.cs @@ -2,7 +2,7 @@ using System; namespace FoodTracker.Services.DTO.ResponseDTO; -public class UserReportDTO +public class UserReportResponseDTO { public DateTime? Timestamp { get; set; } // Date and time of the log entry public string? Level { get; set; } // Log level (e.g., Information, Warning, Error)' diff --git a/FoodTracker.Services/Implementation/GroupChallengeServices.cs b/FoodTracker.Services/Implementation/GroupChallengeServices.cs index 9d7985ae38ff7fe7fded711e672b54ede5dbb3d3..4b9d24c0a1538c532a4b6d8296ec5152213bf235 100644 --- a/FoodTracker.Services/Implementation/GroupChallengeServices.cs +++ b/FoodTracker.Services/Implementation/GroupChallengeServices.cs @@ -15,17 +15,12 @@ public class GroupChallengeServices : IGroupChallenge private readonly IChallengeRepository _challenge; private readonly ICustomLogger _logger; private readonly IHttpContextAccessor _httpContextAccessor; - public string Username { get; set; } - public int UserId { get; set; } public GroupChallengeServices(IMapper mapper, IChallengeRepository challenge, ICustomLogger logger,IHttpContextAccessor httpContextAccessor) { _mapper = mapper; _challenge = challenge; _logger = logger; _httpContextAccessor = httpContextAccessor; - Username = _httpContextAccessor.HttpContext.Session.GetString("Username"); - UserId = int.Parse(_httpContextAccessor.HttpContext.Session.GetString("Username")); - } public async Task<string> CreateGroupChallenege(ChallengeDetailsDTO challengeDetails) { @@ -69,10 +64,8 @@ public class GroupChallengeServices : IGroupChallenge public async Task<string> JoinChallenge(int ChallengeId) { - await _logger.LogInformationAsync($"User Joined in Groupchallenge:{ChallengeId}", Username, null); - - return await _challenge.JoinChallengeAsync(UserId, challengeId: ChallengeId); - - + await _logger.LogInformationAsync($"User Joined in Groupchallenge:{ChallengeId}", _httpContextAccessor.HttpContext.Session.GetString("Username"), null); + int userId = int.Parse(_httpContextAccessor.HttpContext.Session.GetString("UserId")); + return await _challenge.JoinChallengeAsync(userId, challengeId: ChallengeId); } } diff --git a/FoodTracker.Services/Implementation/MappingProfile.cs b/FoodTracker.Services/Implementation/MappingProfile.cs index d1c94c0c7c87a9b501d0e101275572779239c0f9..c8e4c31b349325a3ff3fc9cb20c8a0ce47e76a1e 100644 --- a/FoodTracker.Services/Implementation/MappingProfile.cs +++ b/FoodTracker.Services/Implementation/MappingProfile.cs @@ -21,6 +21,6 @@ public class MappingProfile : Profile CreateMap<ActivityLogResponseDto, ActivityDTO>().ReverseMap(); CreateMap<GroupChallenge, ChallengesResponseDTO>().ReverseMap(); CreateMap<ApplicationUser, UserListResponseDTO>().ReverseMap(); - CreateMap<Logs, UserReportDTO>().ReverseMap(); + CreateMap<Logs, UserReportResponseDTO>().ReverseMap(); } } diff --git a/FoodTracker.Services/Implementation/UserService.cs b/FoodTracker.Services/Implementation/UserService.cs index 83ff167c078cc5a894709b2d724e154418957e93..52b07b5cea8b0c07dee18bbe752fe872890661d7 100644 --- a/FoodTracker.Services/Implementation/UserService.cs +++ b/FoodTracker.Services/Implementation/UserService.cs @@ -6,7 +6,6 @@ using FoodTracker.Database.Interface; using FoodTracker.Services.DTO; using FoodTracker.Services.DTO.ResponseDTO; using FoodTracker.Services.Interface; -using FoodTracker.Utilites; using Microsoft.AspNetCore.Http; namespace FoodTracker.Services.Implementation; @@ -94,10 +93,10 @@ public class UserServices : IUserService List<UserListResponseDTO> userData = _mapper.Map<List<UserListResponseDTO>>(usersList); return userData; } - public List<UserReportDTO> GetUserReports(string userName) + public List<UserReportResponseDTO> GetUserReports(string userName) { var userLogs = _userRepo.GetUserLogs(userName); - var userReport = _mapper.Map<List<UserReportDTO>>(userLogs); + var userReport = _mapper.Map<List<UserReportResponseDTO>>(userLogs); return userReport; } diff --git a/FoodTracker.Services/Interface/IUserService.cs b/FoodTracker.Services/Interface/IUserService.cs index 2fb2b8a8e27370b46480ff92fa19874e24ef3eeb..f519a10f95b4016ba8f5645f70582106e317f0b9 100644 --- a/FoodTracker.Services/Interface/IUserService.cs +++ b/FoodTracker.Services/Interface/IUserService.cs @@ -10,7 +10,7 @@ public interface IUserService public Task<UserAuthResponseDTO> AuthenticateUser(UserLoginDTO userLogin); public Task<bool> Logout(); public Task<List<UserListResponseDTO>> ReadAllUsers(); - public List<UserReportDTO> GetUserReports(string userName); + public List<UserReportResponseDTO> GetUserReports(string userName); public Task<string> UpdateUserAccess(int userId, bool flag);