Cleaned code
This commit is contained in:
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="DataSourcePerFileMappings">
|
|
||||||
<file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/d39cb28a-f071-4fe6-bb03-b2350028b821/console.sql" value="d39cb28a-f071-4fe6-bb03-b2350028b821" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -8,5 +8,4 @@ public class GetUserDto
|
|||||||
public string? Username { get; set; }
|
public string? Username { get; set; }
|
||||||
public int DesignationId { get; set; }
|
public int DesignationId { get; set; }
|
||||||
public GetUserStatsDto? GetUserStatsDto { get; set; }
|
public GetUserStatsDto? GetUserStatsDto { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,8 @@ using FastEndpoints;
|
|||||||
|
|
||||||
namespace BeReadyBackend.Endpoints.Friends;
|
namespace BeReadyBackend.Endpoints.Friends;
|
||||||
|
|
||||||
public class GetAllFriendRequestsEndpoint(UserFriendsRepository userFriendsRepository, UserService userService, AutoMapper.IMapper mapper) : EndpointWithoutRequest<List<GetFriendRequestDto>>
|
public class GetAllFriendRequestsEndpoint(UserFriendsRepository userFriendsRepository, UserService userService, AutoMapper.IMapper mapper)
|
||||||
|
: EndpointWithoutRequest<List<GetFriendRequestDto>>
|
||||||
{
|
{
|
||||||
public override void Configure()
|
public override void Configure()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class SendFriendRequestEndpoint(UserFriendsRepository userFriendsReposito
|
|||||||
{
|
{
|
||||||
public override void Configure()
|
public override void Configure()
|
||||||
{
|
{
|
||||||
Post("/Friends/{@Id}/", x => new {x.FriendId});
|
Post("/Friends/{@Id}/", x => new { x.FriendId });
|
||||||
}
|
}
|
||||||
|
|
||||||
public override async Task HandleAsync(SendFriendRequest req, CancellationToken ct)
|
public override async Task HandleAsync(SendFriendRequest req, CancellationToken ct)
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ public class GetGroupRankingEndpoint(
|
|||||||
User? votedUser = await usersRepository.SingleOrDefaultAsync(new GetUserByIdSpec(member.VotedProofId.Value), ct);
|
User? votedUser = await usersRepository.SingleOrDefaultAsync(new GetUserByIdSpec(member.VotedProofId.Value), ct);
|
||||||
if (votedUser is not null) votedUser.Score++;
|
if (votedUser is not null) votedUser.Score++;
|
||||||
}
|
}
|
||||||
|
|
||||||
await usersRepository.SaveChangesAsync(ct);
|
await usersRepository.SaveChangesAsync(ct);
|
||||||
await userGroupsRepository.SaveChangesAsync(ct);
|
await userGroupsRepository.SaveChangesAsync(ct);
|
||||||
|
|
||||||
@@ -52,6 +53,7 @@ public class GetGroupRankingEndpoint(
|
|||||||
User? user = await usersRepository.SingleOrDefaultAsync(new GetUserByIdSpec(groupScore[i].UserId), ct);
|
User? user = await usersRepository.SingleOrDefaultAsync(new GetUserByIdSpec(groupScore[i].UserId), ct);
|
||||||
if (user != null) user.Score += points[i];
|
if (user != null) user.Score += points[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
await usersRepository.SaveChangesAsync(ct);
|
await usersRepository.SaveChangesAsync(ct);
|
||||||
|
|
||||||
await Send.OkAsync(groupScore, ct);
|
await Send.OkAsync(groupScore, ct);
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ public class GetUserEndpoint(UsersRepository usersRepository, UserService userSe
|
|||||||
{
|
{
|
||||||
public override void Configure()
|
public override void Configure()
|
||||||
{
|
{
|
||||||
Get("/Users/{@Id}/", x => new {x.Id});
|
Get("/Users/{@Id}/", x => new { x.Id });
|
||||||
}
|
}
|
||||||
|
|
||||||
public override async Task HandleAsync(UserRequest req, CancellationToken ct)
|
public override async Task HandleAsync(UserRequest req, CancellationToken ct)
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ public class GroupHub : Hub
|
|||||||
{
|
{
|
||||||
await Groups.AddToGroupAsync(Context.ConnectionId, $"group-{groupId}");
|
await Groups.AddToGroupAsync(Context.ConnectionId, $"group-{groupId}");
|
||||||
}
|
}
|
||||||
|
|
||||||
await base.OnConnectedAsync();
|
await base.OnConnectedAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,7 +16,7 @@ public class DtoToEntityMappings : Profile
|
|||||||
CreateMap<UpdateUserDto, User>();
|
CreateMap<UpdateUserDto, User>();
|
||||||
CreateMap<PatchUserDesignationDto, User>();
|
CreateMap<PatchUserDesignationDto, User>();
|
||||||
|
|
||||||
CreateMap<CreateGroupDto, Group>()
|
CreateMap<CreateGroupDto, Group>()
|
||||||
.ForMember(dest => dest.UserGroups, opt => opt.Ignore());
|
.ForMember(dest => dest.UserGroups, opt => opt.Ignore());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,7 @@ public class RandomChallenge
|
|||||||
{
|
{
|
||||||
[Key] public int Id { get; set; }
|
[Key] public int Id { get; set; }
|
||||||
[Required] public string? Libelle { get; set; }
|
[Required] public string? Libelle { get; set; }
|
||||||
[Required] public int Duration {get; set;}
|
[Required] public int Duration { get; set; }
|
||||||
[Required] public bool IsAlreadyPast { get; set; }
|
[Required] public bool IsAlreadyPast { get; set; }
|
||||||
|
|
||||||
public List<UserRandomChallenge>? UserRandomChallenges { get; set; }
|
public List<UserRandomChallenge>? UserRandomChallenges { get; set; }
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ public class User
|
|||||||
[Required] public DateTime CreationDate { get; set; }
|
[Required] public DateTime CreationDate { get; set; }
|
||||||
[Required, MaxLength(60)] public string? Password { get; set; }
|
[Required, MaxLength(60)] public string? Password { get; set; }
|
||||||
[Required] public string? Salt { get; set; }
|
[Required] public string? Salt { get; set; }
|
||||||
[Required, ] public int Score { get; set; }
|
[Required,] public int Score { get; set; }
|
||||||
[Required] public int TotalWin { get; set; }
|
[Required] public int TotalWin { get; set; }
|
||||||
[Required] public int TotalChallenge { get; set; }
|
[Required] public int TotalChallenge { get; set; }
|
||||||
[Required] public int TotalPodium { get; set; }
|
[Required] public int TotalPodium { get; set; }
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ public class UserService
|
|||||||
|
|
||||||
public int GetUserIdFromToken()
|
public int GetUserIdFromToken()
|
||||||
{
|
{
|
||||||
ClaimsPrincipal user = _httpContextAccessor.HttpContext!.User;
|
ClaimsPrincipal user = _httpContextAccessor.HttpContext!.User;
|
||||||
string? userId = user.Claims.FirstOrDefault(x => x.Type == "UserId")?.Value;
|
string? userId = user.Claims.FirstOrDefault(x => x.Type == "UserId")?.Value;
|
||||||
return int.Parse(userId!);
|
return int.Parse(userId!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,6 +9,5 @@ public class GetLockedAchievementsSpec : Specification<Achievement>
|
|||||||
{
|
{
|
||||||
Query
|
Query
|
||||||
.Where(x => x.UserAchievements != null && x.UserAchievements.All(y => y.UserId != userId));
|
.Where(x => x.UserAchievements != null && x.UserAchievements.All(y => y.UserId != userId));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,7 @@ namespace BeReadyBackend.Specifications.Groups;
|
|||||||
|
|
||||||
public class GetGroupsByUserIdSpec : Specification<UserGroup>
|
public class GetGroupsByUserIdSpec : Specification<UserGroup>
|
||||||
{
|
{
|
||||||
public GetGroupsByUserIdSpec(int userId)
|
public GetGroupsByUserIdSpec(int userId)
|
||||||
{
|
{
|
||||||
Query
|
Query
|
||||||
.Include(x => x.Group)
|
.Include(x => x.Group)
|
||||||
|
|||||||
Reference in New Issue
Block a user