Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(User) : fix some bugs #103

Merged
merged 1 commit into from
Sep 8, 2024
Merged

fix(User) : fix some bugs #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ...ta/AnalysisData/Services/GraphService/GraphServices/AllNodesData/NodePaginationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ private async Task<IEnumerable<EntityNode>> GetEntityNodesForPaginationAsync(Cla
}
else if (category != null && role == "dataanalyst")
{
valueNodes = await _graphNodeRepository.GetEntityNodeForUserWithCategoryIdAsync(usernameGuid, category.Value);
valueNodes =
await _graphNodeRepository.GetEntityNodeForUserWithCategoryIdAsync(usernameGuid, category.Value);
}
else if (category == null && role == "dataanalyst")
{
Expand All @@ -78,11 +79,6 @@ private async Task<IEnumerable<EntityNode>> GetEntityNodesForPaginationAsync(Cla
throw new CategoryResultNotFoundException();
}

if (!valueNodes.Any())
{
throw new NodeNotFoundException();
}

return valueNodes;
}
}
2 changes: 0 additions & 2 deletions AnalysisData/AnalysisData/Services/UserService/AdminService/AdminService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ public async Task UpdateUserInformationByAdminAsync(Guid id, UpdateAdminDto upda
_validationService.EmailCheck(updateAdminDto.Email);
_validationService.PhoneNumberCheck(updateAdminDto.PhoneNumber);
await CheckExistenceOfRole(user,updateAdminDto);

await SetUpdatedInformation(user, updateAdminDto);
await _jwtService.UpdateUserCookie(user.Username, false);
}

private async Task ValidateUserInformation(User user,UpdateAdminDto updateAdminDto)
Expand Down
Loading